@mlightcad/libredwg-web 0.7.4 → 0.7.5

package/dist/libredwg-web.umd.cjs

@@ -1168,6 +1168,45 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     Dwg_Color_Method2[Dwg_Color_Method2["None"] = 200] = "None";
     return Dwg_Color_Method2;
   })(Dwg_Color_Method || {});
+  const RAW_COLOR_TYPE_BY_LAYER = 192;
+  const RAW_COLOR_TYPE_BY_BLOCK = 193;
+  const RAW_COLOR_TYPE_RGB = 194;
+  const RAW_COLOR_TYPE_ACI = 195;
+  const RAW_COLOR_TYPE_WINDOW_BG = 200;
+  function dwgColorToMLeaderRawColor(color) {
+    if (color == null) return void 0;
+    const methodNum = color.method;
+    const method = color.method != null && methodNum !== 0 ? methodNum : color.rgb >>> 24 & 255;
+    const index = color.index;
+    if (color.rgb != null && method >= RAW_COLOR_TYPE_BY_LAYER && method <= RAW_COLOR_TYPE_WINDOW_BG && (color.rgb >>> 24 & 255) === method) {
+      return color.rgb >> 0;
+    }
+    if (method === Dwg_Color_Method.ByLayer || index === 256) {
+      return RAW_COLOR_TYPE_BY_LAYER << 24 >> 0;
+    }
+    if (method === Dwg_Color_Method.ByBlock || index === 0) {
+      return RAW_COLOR_TYPE_BY_BLOCK << 24 >> 0;
+    }
+    if (method === Dwg_Color_Method.None) {
+      return RAW_COLOR_TYPE_WINDOW_BG << 24 >> 0;
+    }
+    if (method === Dwg_Color_Method.TrueColor) {
+      const rgb = color.rgb != null ? color.rgb & 16777215 : void 0;
+      if (rgb != null) {
+        return (RAW_COLOR_TYPE_RGB << 24 | rgb) >> 0;
+      }
+    }
+    if (method === Dwg_Color_Method.ForegroundColor) {
+      return (RAW_COLOR_TYPE_ACI << 24 | 7) >> 0;
+    }
+    if (method === Dwg_Color_Method.Entities && index > 0 && index < 256) {
+      return (RAW_COLOR_TYPE_ACI << 24 | index & 255) >> 0;
+    }
+    if (index > 0 && index < 256) {
+      return (RAW_COLOR_TYPE_ACI << 24 | index & 255) >> 0;
+    }
+    return RAW_COLOR_TYPE_BY_BLOCK << 24 >> 0;
+  }
   const MODEL_SPACE = "*MODEL_SPACE";
   const MODEL_SPACE_PREFIX = "*PAPER_SPACE";
   const isModelSpace = (name) => {
@@ -1262,6 +1301,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
           return this.convertLWPolyline(entity_tio, commonAttrs);
         } else if (fixedtype == Dwg_Object_Type.DWG_TYPE_MLINE) {
           return this.convertMLine(entity_tio, commonAttrs);
+        } else if (fixedtype == Dwg_Object_Type.DWG_TYPE_MULTILEADER) {
+          return this.convertMultiLeader(entity_tio, commonAttrs);
         } else if (fixedtype == Dwg_Object_Type.DWG_TYPE_MTEXT) {
           return this.convertMText(entity_tio, commonAttrs);
         } else if (fixedtype == Dwg_Object_Type.DWG_TYPE_OLE2FRAME) {
@@ -1280,6 +1321,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
           return this.convertRay(entity_tio, commonAttrs);
         } else if (fixedtype == Dwg_Object_Type.DWG_TYPE_SECTIONOBJECT) {
           return this.convertSection(entity_tio, commonAttrs);
+        } else if (fixedtype == Dwg_Object_Type.DWG_TYPE_SHAPE) {
+          return this.convertShape(entity_tio, commonAttrs);
         } else if (fixedtype == Dwg_Object_Type.DWG_TYPE_SOLID) {
           return this.convertSolid(entity_tio, commonAttrs);
         } else if (fixedtype == Dwg_Object_Type.DWG_TYPE_SPLINE) {
@@ -1304,11 +1347,11 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convert3dFace(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const corner1 = libredwg.dwg_dynapi_entity_value(entity, "corner1").data;
-      const corner2 = libredwg.dwg_dynapi_entity_value(entity, "corner2").data;
-      const corner3 = libredwg.dwg_dynapi_entity_value(entity, "corner3").data;
-      const corner4 = libredwg.dwg_dynapi_entity_value(entity, "corner4").data;
-      const flag = libredwg.dwg_dynapi_entity_value(entity, "invis_flags").data;
+      const corner1 = libredwg.dwg_dynapi_entity_data(entity, "corner1");
+      const corner2 = libredwg.dwg_dynapi_entity_data(entity, "corner2");
+      const corner3 = libredwg.dwg_dynapi_entity_data(entity, "corner3");
+      const corner4 = libredwg.dwg_dynapi_entity_data(entity, "corner4");
+      const flag = libredwg.dwg_dynapi_entity_data(entity, "invis_flags");
       return {
         type: "3DFACE",
         ...commonAttrs,
@@ -1321,15 +1364,12 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertArc(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const center = libredwg.dwg_dynapi_entity_value(entity, "center").data;
-      const radius = libredwg.dwg_dynapi_entity_value(entity, "radius").data;
-      const thickness = libredwg.dwg_dynapi_entity_value(entity, "thickness").data;
-      const extrusionDirection = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "extrusion"
-      ).data;
-      const startAngle = libredwg.dwg_dynapi_entity_value(entity, "start_angle").data;
-      const endAngle = libredwg.dwg_dynapi_entity_value(entity, "end_angle").data;
+      const center = libredwg.dwg_dynapi_entity_data(entity, "center");
+      const radius = libredwg.dwg_dynapi_entity_data(entity, "radius");
+      const thickness = libredwg.dwg_dynapi_entity_data(entity, "thickness");
+      const extrusionDirection = libredwg.dwg_dynapi_entity_data(entity, "extrusion");
+      const startAngle = libredwg.dwg_dynapi_entity_data(entity, "start_angle");
+      const endAngle = libredwg.dwg_dynapi_entity_data(entity, "end_angle");
       return {
         type: "ARC",
         ...commonAttrs,
@@ -1343,41 +1383,13 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertEmbeddedMText(entity, subclassName) {
       const libredwg = this.libredwg;
-      const attachmentPoint = libredwg.dwg_dynapi_subclass_value(
-        entity,
-        subclassName,
-        "attachment"
-      ).data;
-      const insertionPoint = libredwg.dwg_dynapi_subclass_value(
-        entity,
-        subclassName,
-        "ins_pt"
-      ).data;
-      const direction = libredwg.dwg_dynapi_subclass_value(
-        entity,
-        subclassName,
-        "x_axis_dir"
-      ).data;
-      const rectHeight = libredwg.dwg_dynapi_subclass_value(
-        entity,
-        subclassName,
-        "rect_height"
-      ).data;
-      const rectWidth = libredwg.dwg_dynapi_subclass_value(
-        entity,
-        subclassName,
-        "rect_width"
-      ).data;
-      const extentsHeight = libredwg.dwg_dynapi_subclass_value(
-        entity,
-        subclassName,
-        "extents_height"
-      ).data;
-      const extentsWidth = libredwg.dwg_dynapi_subclass_value(
-        entity,
-        subclassName,
-        "extents_width"
-      ).data;
+      const attachmentPoint = libredwg.dwg_dynapi_subclass_data(entity, subclassName, "attachment");
+      const insertionPoint = libredwg.dwg_dynapi_subclass_data(entity, subclassName, "ins_pt");
+      const direction = libredwg.dwg_dynapi_subclass_data(entity, subclassName, "x_axis_dir");
+      const rectHeight = libredwg.dwg_dynapi_subclass_data(entity, subclassName, "rect_height");
+      const rectWidth = libredwg.dwg_dynapi_subclass_data(entity, subclassName, "rect_width");
+      const extentsHeight = libredwg.dwg_dynapi_subclass_data(entity, subclassName, "extents_height");
+      const extentsWidth = libredwg.dwg_dynapi_subclass_data(entity, subclassName, "extents_width");
       return {
         insertionPoint,
         rectHeight,
@@ -1397,30 +1409,18 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertAttdef(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const textValue = libredwg.dwg_dynapi_entity_value(entity, "default_value").data;
+      const textValue = libredwg.dwg_dynapi_entity_data(entity, "default_value");
       const text = this.convertTextBase(entity);
       text.text = textValue;
-      const prompt = libredwg.dwg_dynapi_entity_value(entity, "prompt").data;
-      const tag = libredwg.dwg_dynapi_entity_value(entity, "tag").data;
-      const flags = libredwg.dwg_dynapi_entity_value(entity, "flags").data;
-      const fieldLength = libredwg.dwg_dynapi_entity_value(entity, "field_length").data;
-      const lockPositionFlag = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "lock_position_flag"
-      ).data;
-      const duplicateRecordCloningFlag = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "keep_duplicate_records"
-      ).data;
-      const isReallyLocked = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "is_really_locked"
-      ).data;
-      const mtextFlag = libredwg.dwg_dynapi_entity_value(entity, "mtext_type").data;
-      const alignmentPoint = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "alignment_pt"
-      ).data;
+      const prompt = libredwg.dwg_dynapi_entity_data(entity, "prompt");
+      const tag = libredwg.dwg_dynapi_entity_data(entity, "tag");
+      const flags = libredwg.dwg_dynapi_entity_data(entity, "flags");
+      const fieldLength = libredwg.dwg_dynapi_entity_data(entity, "field_length");
+      const lockPositionFlag = libredwg.dwg_dynapi_entity_data(entity, "lock_position_flag");
+      const duplicateRecordCloningFlag = libredwg.dwg_dynapi_entity_data(entity, "keep_duplicate_records");
+      const isReallyLocked = libredwg.dwg_dynapi_entity_data(entity, "is_really_locked");
+      const mtextFlag = libredwg.dwg_dynapi_entity_data(entity, "mtext_type");
+      const alignmentPoint = libredwg.dwg_dynapi_entity_data(entity, "alignment_pt");
       return {
         type: "ATTDEF",
         ...commonAttrs,
@@ -1444,26 +1444,14 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     convertAttrib(entity, commonAttrs) {
       const libredwg = this.libredwg;
       const text = this.convertTextBase(entity);
-      const tag = libredwg.dwg_dynapi_entity_value(entity, "tag").data;
-      const flags = libredwg.dwg_dynapi_entity_value(entity, "flags").data;
-      const fieldLength = libredwg.dwg_dynapi_entity_value(entity, "field_length").data;
-      const lockPositionFlag = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "lock_position_flag"
-      ).data;
-      const duplicateRecordCloningFlag = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "keep_duplicate_records"
-      ).data;
-      const mtextFlag = libredwg.dwg_dynapi_entity_value(entity, "mtext_type").data;
-      const isReallyLocked = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "is_really_locked"
-      ).data;
-      const alignmentPoint = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "alignment_pt"
-      ).data;
+      const tag = libredwg.dwg_dynapi_entity_data(entity, "tag");
+      const flags = libredwg.dwg_dynapi_entity_data(entity, "flags");
+      const fieldLength = libredwg.dwg_dynapi_entity_data(entity, "field_length");
+      const lockPositionFlag = libredwg.dwg_dynapi_entity_data(entity, "lock_position_flag");
+      const duplicateRecordCloningFlag = libredwg.dwg_dynapi_entity_data(entity, "keep_duplicate_records");
+      const mtextFlag = libredwg.dwg_dynapi_entity_data(entity, "mtext_type");
+      const isReallyLocked = libredwg.dwg_dynapi_entity_data(entity, "is_really_locked");
+      const alignmentPoint = libredwg.dwg_dynapi_entity_data(entity, "alignment_pt");
       return {
         type: "ATTRIB",
         ...commonAttrs,
@@ -1489,13 +1477,10 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertCircle(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const center = libredwg.dwg_dynapi_entity_value(entity, "center").data;
-      const radius = libredwg.dwg_dynapi_entity_value(entity, "radius").data;
-      const thickness = libredwg.dwg_dynapi_entity_value(entity, "thickness").data;
-      const extrusionDirection = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "extrusion"
-      ).data;
+      const center = libredwg.dwg_dynapi_entity_data(entity, "center");
+      const radius = libredwg.dwg_dynapi_entity_data(entity, "radius");
+      const thickness = libredwg.dwg_dynapi_entity_data(entity, "thickness");
+      const extrusionDirection = libredwg.dwg_dynapi_entity_data(entity, "extrusion");
       return {
         type: "CIRCLE",
         ...commonAttrs,
@@ -1508,26 +1493,11 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     convertAlignedDimension(entity, commonAttrs) {
       const libredwg = this.libredwg;
       const dimensionCommonAttrs = this.getDimensionCommonAttrs(entity);
-      const insertionPoint = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "clone_ins_pt"
-      ).data;
-      const subDefinitionPoint1 = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "xline1_pt"
-      ).data;
-      const subDefinitionPoint2 = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "xline2_pt"
-      ).data;
-      const rotationAngle = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "ins_rotation"
-      ).data;
-      const obliqueAngle = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "oblique_angle"
-      ).data;
+      const insertionPoint = libredwg.dwg_dynapi_entity_data(entity, "clone_ins_pt");
+      const subDefinitionPoint1 = libredwg.dwg_dynapi_entity_data(entity, "xline1_pt");
+      const subDefinitionPoint2 = libredwg.dwg_dynapi_entity_data(entity, "xline2_pt");
+      const rotationAngle = libredwg.dwg_dynapi_entity_data(entity, "ins_rotation");
+      const obliqueAngle = libredwg.dwg_dynapi_entity_data(entity, "oblique_angle");
       return {
         subclassMarker: "AcDbAlignedDimension",
         ...commonAttrs,
@@ -1542,16 +1512,10 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     convert3PointAngularDimension(entity, commonAttrs) {
       const libredwg = this.libredwg;
       const dimensionCommonAttrs = this.getDimensionCommonAttrs(entity);
-      const subDefinitionPoint1 = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "xline1_pt"
-      ).data;
-      const subDefinitionPoint2 = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "xline2_pt"
-      ).data;
-      const centerPoint = libredwg.dwg_dynapi_entity_value(entity, "center_pt").data;
-      const arcPoint = libredwg.dwg_dynapi_entity_value(entity, "xline2end_pt").data;
+      const subDefinitionPoint1 = libredwg.dwg_dynapi_entity_data(entity, "xline1_pt");
+      const subDefinitionPoint2 = libredwg.dwg_dynapi_entity_data(entity, "xline2_pt");
+      const centerPoint = libredwg.dwg_dynapi_entity_data(entity, "center_pt");
+      const arcPoint = libredwg.dwg_dynapi_entity_data(entity, "xline2end_pt");
       return {
         subclassMarker: "AcDb3PointAngularDimension",
         ...commonAttrs,
@@ -1565,8 +1529,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     convertDiameterDimension(entity, commonAttrs) {
       const libredwg = this.libredwg;
       const dimensionCommonAttrs = this.getDimensionCommonAttrs(entity);
-      const centerPoint = libredwg.dwg_dynapi_entity_value(entity, "first_arc_pt").data;
-      const leaderLength = libredwg.dwg_dynapi_entity_value(entity, "leader_len").data;
+      const centerPoint = libredwg.dwg_dynapi_entity_data(entity, "first_arc_pt");
+      const leaderLength = libredwg.dwg_dynapi_entity_data(entity, "leader_len");
       return {
         subclassMarker: "AcDbDiametricDimension",
         ...commonAttrs,
@@ -1578,14 +1542,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     convertOrdinateDimension(entity, commonAttrs) {
       const libredwg = this.libredwg;
       const dimensionCommonAttrs = this.getDimensionCommonAttrs(entity);
-      const subDefinitionPoint1 = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "feature_location_pt"
-      ).data;
-      const subDefinitionPoint2 = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "leader_endpt"
-      ).data;
+      const subDefinitionPoint1 = libredwg.dwg_dynapi_entity_data(entity, "feature_location_pt");
+      const subDefinitionPoint2 = libredwg.dwg_dynapi_entity_data(entity, "leader_endpt");
       return {
         subclassMarker: "AcDbOrdinateDimension",
         ...commonAttrs,
@@ -1597,8 +1555,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     convertRadiusDimension(entity, commonAttrs) {
       const libredwg = this.libredwg;
       const dimensionCommonAttrs = this.getDimensionCommonAttrs(entity);
-      const centerPoint = libredwg.dwg_dynapi_entity_value(entity, "first_arc_pt").data;
-      const leaderLength = libredwg.dwg_dynapi_entity_value(entity, "leader_len").data;
+      const centerPoint = libredwg.dwg_dynapi_entity_data(entity, "first_arc_pt");
+      const leaderLength = libredwg.dwg_dynapi_entity_data(entity, "leader_len");
       return {
         subclassMarker: "AcDbRadialDimension",
         ...commonAttrs,
@@ -1609,18 +1567,12 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertEllise(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const center = libredwg.dwg_dynapi_entity_value(entity, "center").data;
-      const majorAxisEndPoint = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "sm_axis"
-      ).data;
-      const extrusionDirection = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "extrusion"
-      ).data;
-      const axisRatio = libredwg.dwg_dynapi_entity_value(entity, "axis_ratio").data;
-      const startAngle = libredwg.dwg_dynapi_entity_value(entity, "start_angle").data;
-      const endAngle = libredwg.dwg_dynapi_entity_value(entity, "end_angle").data;
+      const center = libredwg.dwg_dynapi_entity_data(entity, "center");
+      const majorAxisEndPoint = libredwg.dwg_dynapi_entity_data(entity, "sm_axis");
+      const extrusionDirection = libredwg.dwg_dynapi_entity_data(entity, "extrusion");
+      const axisRatio = libredwg.dwg_dynapi_entity_data(entity, "axis_ratio");
+      const startAngle = libredwg.dwg_dynapi_entity_data(entity, "start_angle");
+      const endAngle = libredwg.dwg_dynapi_entity_data(entity, "end_angle");
       return {
         type: "ELLIPSE",
         ...commonAttrs,
@@ -1634,53 +1586,29 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertHatch(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const extrusionDirection = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "extrusion"
-      ).data;
-      const patternName = libredwg.dwg_dynapi_entity_value(entity, "name").data;
-      const isSolidFill = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "is_solid_fill"
-      ).data;
-      const isAssociative = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "is_associative"
-      ).data;
-      const numberOfBoundaryPaths = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "num_paths"
-      ).data;
-      const paths_ptr = libredwg.dwg_dynapi_entity_value(entity, "paths").data;
+      const extrusionDirection = libredwg.dwg_dynapi_entity_data(entity, "extrusion");
+      const patternName = libredwg.dwg_dynapi_entity_data(entity, "name");
+      const isSolidFill = libredwg.dwg_dynapi_entity_data(entity, "is_solid_fill");
+      const isAssociative = libredwg.dwg_dynapi_entity_data(entity, "is_associative");
+      const numberOfBoundaryPaths = libredwg.dwg_dynapi_entity_data(entity, "num_paths");
+      const paths_ptr = libredwg.dwg_dynapi_entity_data(entity, "paths");
       const boundaryPaths = libredwg.dwg_ptr_to_hatch_path_array(
         paths_ptr,
         numberOfBoundaryPaths
       );
-      const patternStyle = libredwg.dwg_dynapi_entity_value(entity, "style").data;
-      const patternType = libredwg.dwg_dynapi_entity_value(entity, "pattern_type").data;
-      const patternAngle = libredwg.dwg_dynapi_entity_value(entity, "angle").data;
-      const patternScale = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "scale_spacing"
-      ).data;
-      const numberOfDefinitionLines = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "num_deflines"
-      ).data;
-      const definitionLines_ptr = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "deflines"
-      ).data;
+      const patternStyle = libredwg.dwg_dynapi_entity_data(entity, "style");
+      const patternType = libredwg.dwg_dynapi_entity_data(entity, "pattern_type");
+      const patternAngle = libredwg.dwg_dynapi_entity_data(entity, "angle");
+      const patternScale = libredwg.dwg_dynapi_entity_data(entity, "scale_spacing");
+      const numberOfDefinitionLines = libredwg.dwg_dynapi_entity_data(entity, "num_deflines");
+      const definitionLines_ptr = libredwg.dwg_dynapi_entity_data(entity, "deflines");
       const definitionLines = libredwg.dwg_ptr_to_hatch_defline_array(
         definitionLines_ptr,
         numberOfDefinitionLines
       );
-      const pixelSize = libredwg.dwg_dynapi_entity_value(entity, "pixel_size").data;
-      const numberOfSeedPoints = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "num_seeds"
-      ).data;
-      const seedPoints_ptr = libredwg.dwg_dynapi_entity_value(entity, "seeds").data;
+      const pixelSize = libredwg.dwg_dynapi_entity_data(entity, "pixel_size");
+      const numberOfSeedPoints = libredwg.dwg_dynapi_entity_data(entity, "num_seeds");
+      const seedPoints_ptr = libredwg.dwg_dynapi_entity_data(entity, "seeds");
       const seedPoints = libredwg.dwg_ptr_to_point2d_array(
         seedPoints_ptr,
         numberOfSeedPoints
@@ -1715,14 +1643,14 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         seedPoints
         // gradientFlag?: DwgHatchGradientFlag
       };
-      const gradientFlag = libredwg.dwg_dynapi_entity_value(entity, "is_gradient_fill").data;
+      const gradientFlag = libredwg.dwg_dynapi_entity_data(entity, "is_gradient_fill");
       if (gradientFlag > 0) {
-        const gradientName = libredwg.dwg_dynapi_entity_value(entity, "gradient_name").data;
-        const gradientRotation = libredwg.dwg_dynapi_entity_value(entity, "gradient_angle").data;
-        const gradientDefinition = libredwg.dwg_dynapi_entity_value(entity, "gradient_shift").data;
-        const colorTint = libredwg.dwg_dynapi_entity_value(entity, "gradient_tint").data;
-        const gradientColorFlag = libredwg.dwg_dynapi_entity_value(entity, "single_color_gradient").data;
-        const gradientColors_ptr = libredwg.dwg_dynapi_entity_value(entity, "colors").data;
+        const gradientName = libredwg.dwg_dynapi_entity_data(entity, "gradient_name");
+        const gradientRotation = libredwg.dwg_dynapi_entity_data(entity, "gradient_angle");
+        const gradientDefinition = libredwg.dwg_dynapi_entity_data(entity, "gradient_shift");
+        const colorTint = libredwg.dwg_dynapi_entity_data(entity, "gradient_tint");
+        const gradientColorFlag = libredwg.dwg_dynapi_entity_data(entity, "single_color_gradient");
+        const gradientColors_ptr = libredwg.dwg_dynapi_entity_data(entity, "colors");
         const gradientColors = libredwg.dwg_ptr_to_hatch_gradient_color_array(gradientColors_ptr, gradientColorFlag == 1 ? 1 : 2);
         return {
           type: "HATCH",
@@ -1816,39 +1744,28 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertImage(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const version = libredwg.dwg_dynapi_entity_value(entity, "class_version").data;
-      const position = libredwg.dwg_dynapi_entity_value(entity, "pt0").data;
-      const uPixel = libredwg.dwg_dynapi_entity_value(entity, "uvec").data;
-      const vPixel = libredwg.dwg_dynapi_entity_value(entity, "vvec").data;
-      const imageSize = libredwg.dwg_dynapi_entity_value(entity, "image_size").data;
-      const flags = libredwg.dwg_dynapi_entity_value(entity, "display_props").data;
-      const clipping = libredwg.dwg_dynapi_entity_value(entity, "clipping").data;
-      const brightness = libredwg.dwg_dynapi_entity_value(entity, "brightness").data;
-      const contrast = libredwg.dwg_dynapi_entity_value(entity, "contrast").data;
-      const fade = libredwg.dwg_dynapi_entity_value(entity, "fade").data;
-      const clipMode = libredwg.dwg_dynapi_entity_value(entity, "clip_mode").data;
-      const clippingBoundaryType = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "clip_boundary_type"
-      ).data;
-      const countBoundaryPoints = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "num_clip_verts"
-      ).data;
-      const clip_verts = libredwg.dwg_dynapi_entity_value(entity, "clip_verts").data;
+      const version = libredwg.dwg_dynapi_entity_data(entity, "class_version");
+      const position = libredwg.dwg_dynapi_entity_data(entity, "pt0");
+      const uPixel = libredwg.dwg_dynapi_entity_data(entity, "uvec");
+      const vPixel = libredwg.dwg_dynapi_entity_data(entity, "vvec");
+      const imageSize = libredwg.dwg_dynapi_entity_data(entity, "image_size");
+      const flags = libredwg.dwg_dynapi_entity_data(entity, "display_props");
+      const clipping = libredwg.dwg_dynapi_entity_data(entity, "clipping");
+      const brightness = libredwg.dwg_dynapi_entity_data(entity, "brightness");
+      const contrast = libredwg.dwg_dynapi_entity_data(entity, "contrast");
+      const fade = libredwg.dwg_dynapi_entity_data(entity, "fade");
+      const clipMode = libredwg.dwg_dynapi_entity_data(entity, "clip_mode");
+      const clippingBoundaryType = libredwg.dwg_dynapi_entity_data(entity, "clip_boundary_type");
+      const countBoundaryPoints = libredwg.dwg_dynapi_entity_data(entity, "num_clip_verts");
+      const clip_verts = libredwg.dwg_dynapi_entity_data(entity, "clip_verts");
       const clippingBoundaryPath = libredwg.dwg_ptr_to_point3d_array(
         clip_verts,
         countBoundaryPoints
       );
-      const imagedef_ref = libredwg.dwg_dynapi_entity_value(entity, "imagedef").data;
-      const imageDefHandle = idToString(libredwg.dwg_ref_get_absref(imagedef_ref));
-      const imagedefreactor_ref = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "imagedefreactor"
-      ).data;
-      const imageDefReactorHandle = idToString(
-        libredwg.dwg_ref_get_absref(imagedefreactor_ref)
-      );
+      const imagedef_ref = libredwg.dwg_dynapi_entity_data(entity, "imagedef");
+      const imageDefHandle = libredwg.dwg_ref_get_id(imagedef_ref) ?? "";
+      const imagedefreactor_ref = libredwg.dwg_dynapi_entity_data(entity, "imagedefreactor");
+      const imageDefReactorHandle = libredwg.dwg_ref_get_id(imagedefreactor_ref) ?? "";
       return {
         type: "IMAGE",
         ...commonAttrs,
@@ -1873,10 +1790,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     convertInsert(entity, commonAttrs) {
       const libredwg = this.libredwg;
       let name = "";
-      const block_header_ref = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "block_header"
-      ).data;
+      const block_header_ref = libredwg.dwg_dynapi_entity_data(entity, "block_header");
       if (block_header_ref) {
         const block_header_obj = libredwg.dwg_ref_get_object(block_header_ref);
         if (block_header_obj) {
@@ -1887,22 +1801,16 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         }
       }
       if (!name) {
-        name = libredwg.dwg_dynapi_entity_value(entity, "block_name").data;
+        name = libredwg.dwg_dynapi_entity_data(entity, "block_name");
       }
-      const insertionPoint = libredwg.dwg_dynapi_entity_value(entity, "ins_pt").data;
-      const scale = libredwg.dwg_dynapi_entity_value(entity, "scale").data;
-      const rotation = libredwg.dwg_dynapi_entity_value(entity, "rotation").data;
-      const columnCount = libredwg.dwg_dynapi_entity_value(entity, "num_cols").data;
-      const rowCount = libredwg.dwg_dynapi_entity_value(entity, "num_rows").data;
-      const columnSpacing = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "col_spacing"
-      ).data;
-      const rowSpacing = libredwg.dwg_dynapi_entity_value(entity, "row_spacing").data;
-      const extrusionDirection = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "extrusion"
-      ).data;
+      const insertionPoint = libredwg.dwg_dynapi_entity_data(entity, "ins_pt");
+      const scale = libredwg.dwg_dynapi_entity_data(entity, "scale");
+      const rotation = libredwg.dwg_dynapi_entity_data(entity, "rotation");
+      const columnCount = libredwg.dwg_dynapi_entity_data(entity, "num_cols");
+      const rowCount = libredwg.dwg_dynapi_entity_data(entity, "num_rows");
+      const columnSpacing = libredwg.dwg_dynapi_entity_data(entity, "col_spacing");
+      const rowSpacing = libredwg.dwg_dynapi_entity_data(entity, "row_spacing");
+      const extrusionDirection = libredwg.dwg_dynapi_entity_data(entity, "extrusion");
       const attrib_ptr_array = libredwg.dwg_entity_insert_get_attribs(entity);
       const attribs = [];
       attrib_ptr_array.forEach((object_ptr) => {
@@ -1936,48 +1844,21 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     convertLeader(entity, commonAttrs) {
       const libredwg = this.libredwg;
       const styleName = libredwg.dwg_entity_mtext_get_style_name(entity);
-      const isArrowheadEnabled = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "arrowhead_type"
-      ).data;
-      const isSpline = libredwg.dwg_dynapi_entity_value(entity, "path_type").data;
-      const leaderCreationFlag = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "annot_type"
-      ).data;
-      const isHooklineSameDirection = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "hookline_dir"
-      ).data;
-      const isHooklineExists = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "hookline_on"
-      ).data;
-      const textHeight = libredwg.dwg_dynapi_entity_value(entity, "box_height").data;
-      const textWidth = libredwg.dwg_dynapi_entity_value(entity, "box_width").data;
-      const numberOfVertices = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "num_points"
-      ).data;
-      const vertices_ptr = libredwg.dwg_dynapi_entity_value(entity, "points").data;
+      const isArrowheadEnabled = libredwg.dwg_dynapi_entity_data(entity, "arrowhead_type");
+      const isSpline = libredwg.dwg_dynapi_entity_data(entity, "path_type");
+      const leaderCreationFlag = libredwg.dwg_dynapi_entity_data(entity, "annot_type");
+      const isHooklineSameDirection = libredwg.dwg_dynapi_entity_data(entity, "hookline_dir");
+      const isHooklineExists = libredwg.dwg_dynapi_entity_data(entity, "hookline_on");
+      const textHeight = libredwg.dwg_dynapi_entity_data(entity, "box_height");
+      const textWidth = libredwg.dwg_dynapi_entity_data(entity, "box_width");
+      const numberOfVertices = libredwg.dwg_dynapi_entity_data(entity, "num_points");
+      const vertices_ptr = libredwg.dwg_dynapi_entity_data(entity, "points");
       const vertices = numberOfVertices > 0 ? libredwg.dwg_ptr_to_point3d_array(vertices_ptr, numberOfVertices) : [];
-      const byBlockColor = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "byblock_color"
-      ).data;
-      const normal = libredwg.dwg_dynapi_entity_value(entity, "extrusion").data;
-      const horizontalDirection = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "x_direction"
-      ).data;
-      const offsetFromBlock = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "inspt_offset"
-      ).data;
-      const offsetFromAnnotation = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "endptproj"
-      ).data;
+      const byBlockColor = libredwg.dwg_dynapi_entity_data(entity, "byblock_color");
+      const normal = libredwg.dwg_dynapi_entity_data(entity, "extrusion");
+      const horizontalDirection = libredwg.dwg_dynapi_entity_data(entity, "x_direction");
+      const offsetFromBlock = libredwg.dwg_dynapi_entity_data(entity, "inspt_offset");
+      const offsetFromAnnotation = libredwg.dwg_dynapi_entity_data(entity, "endptproj");
       return {
         type: "LEADER",
         ...commonAttrs,
@@ -2000,13 +1881,10 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertLine(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const startPoint = libredwg.dwg_dynapi_entity_value(entity, "start").data;
-      const endPoint = libredwg.dwg_dynapi_entity_value(entity, "end").data;
-      const thickness = libredwg.dwg_dynapi_entity_value(entity, "thickness").data;
-      const extrusionDirection = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "extrusion"
-      ).data;
+      const startPoint = libredwg.dwg_dynapi_entity_data(entity, "start");
+      const endPoint = libredwg.dwg_dynapi_entity_data(entity, "end");
+      const thickness = libredwg.dwg_dynapi_entity_data(entity, "thickness");
+      const extrusionDirection = libredwg.dwg_dynapi_entity_data(entity, "extrusion");
       return {
         type: "LINE",
         ...commonAttrs,
@@ -2018,27 +1896,18 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertLWPolyline(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const numberOfVertices = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "num_points"
-      ).data;
-      const flag = libredwg.dwg_dynapi_entity_value(entity, "flag").data;
-      const constantWidth = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "const_width"
-      ).data;
-      const elevation = libredwg.dwg_dynapi_entity_value(entity, "elevation").data;
-      const thickness = libredwg.dwg_dynapi_entity_value(entity, "thickness").data;
-      const extrusionDirection = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "extrusion"
-      ).data;
+      const numberOfVertices = libredwg.dwg_dynapi_entity_data(entity, "num_points");
+      const flag = libredwg.dwg_dynapi_entity_data(entity, "flag");
+      const constantWidth = libredwg.dwg_dynapi_entity_data(entity, "const_width");
+      const elevation = libredwg.dwg_dynapi_entity_data(entity, "elevation");
+      const thickness = libredwg.dwg_dynapi_entity_data(entity, "thickness");
+      const extrusionDirection = libredwg.dwg_dynapi_entity_data(entity, "extrusion");
       const vertices = [];
-      const num_points = libredwg.dwg_dynapi_entity_value(entity, "num_points").data;
-      const points_ptr = libredwg.dwg_dynapi_entity_value(entity, "points").data;
+      const num_points = libredwg.dwg_dynapi_entity_data(entity, "num_points");
+      const points_ptr = libredwg.dwg_dynapi_entity_data(entity, "points");
       const points = libredwg.dwg_ptr_to_point2d_array(points_ptr, num_points);
-      const num_bulges = libredwg.dwg_dynapi_entity_value(entity, "num_bulges").data;
-      const bulges_ptr = libredwg.dwg_dynapi_entity_value(entity, "bulges").data;
+      const num_bulges = libredwg.dwg_dynapi_entity_data(entity, "num_bulges");
+      const bulges_ptr = libredwg.dwg_dynapi_entity_data(entity, "bulges");
       const bulges = libredwg.dwg_ptr_to_double_array(bulges_ptr, num_bulges);
       points.forEach((point, index) => {
         vertices.push({
@@ -2062,23 +1931,14 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertMLine(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const scale = libredwg.dwg_dynapi_entity_value(entity, "scale").data;
-      const flags = libredwg.dwg_dynapi_entity_value(entity, "flags").data;
-      const justification = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "justification"
-      ).data;
-      const startPoint = libredwg.dwg_dynapi_entity_value(entity, "base_point").data;
-      const extrusionDirection = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "extrusion"
-      ).data;
-      const numberOfLines = libredwg.dwg_dynapi_entity_value(entity, "num_lines").data;
-      const numberOfVertices = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "num_verts"
-      ).data;
-      const verts_ptr = libredwg.dwg_dynapi_entity_value(entity, "verts").data;
+      const scale = libredwg.dwg_dynapi_entity_data(entity, "scale");
+      const flags = libredwg.dwg_dynapi_entity_data(entity, "flags");
+      const justification = libredwg.dwg_dynapi_entity_data(entity, "justification");
+      const startPoint = libredwg.dwg_dynapi_entity_data(entity, "base_point");
+      const extrusionDirection = libredwg.dwg_dynapi_entity_data(entity, "extrusion");
+      const numberOfLines = libredwg.dwg_dynapi_entity_data(entity, "num_lines");
+      const numberOfVertices = libredwg.dwg_dynapi_entity_data(entity, "num_verts");
+      const verts_ptr = libredwg.dwg_dynapi_entity_data(entity, "verts");
       const verts = libredwg.dwg_ptr_to_mline_vertex_array(
         verts_ptr,
         numberOfVertices
@@ -2115,17 +1975,525 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         // TODO: Set the correct value
       };
     }
+    convertMultiLeader(entity, commonAttrs) {
+      const libredwg = this.libredwg;
+      const entityVal = (field) => libredwg.dwg_dynapi_entity_data(entity, field);
+      const subclassVal = (ptr, subclass, field) => libredwg.dwg_dynapi_subclass_data(ptr, subclass, field);
+      const refToId = (ref) => libredwg.dwg_ref_get_id(ref);
+      const asBool = (value) => value > 0;
+      const mleaderColor = (color) => color != null ? dwgColorToMLeaderRawColor(color) : void 0;
+      const version = entityVal("class_version");
+      const leaderStyleId = refToId(entityVal("mleaderstyle"));
+      const propertyOverrideFlag = entityVal("flags");
+      const leaderLineType = entityVal("type");
+      const leaderLineColor = mleaderColor(entityVal("line_color"));
+      const leaderLineTypeId = refToId(entityVal("line_ltype"));
+      const leaderLineWeight = entityVal("line_linewt");
+      const landingEnabled = asBool(entityVal("has_landing"));
+      const doglegEnabled = asBool(entityVal("has_dogleg"));
+      const doglegLength = entityVal("landing_dist");
+      const arrowheadId = refToId(entityVal("arrow_handle"));
+      const arrowheadSize = entityVal("arrow_size");
+      const contentType = entityVal("style_content");
+      const textStyleId = refToId(entityVal("text_style"));
+      const textLeftAttachmentType = entityVal("text_left");
+      const textRightAttachmentType = entityVal("text_right");
+      const textAngleType = entityVal("text_angletype");
+      const textAlignmentType = entityVal("text_alignment");
+      const textColor = mleaderColor(entityVal("text_color"));
+      const textFrameEnabled = asBool(entityVal("has_text_frame"));
+      const blockContentId = refToId(entityVal("block_style"));
+      const blockContentColor = mleaderColor(entityVal("block_color"));
+      const blockContentScale = entityVal("block_scale");
+      const blockContentRotation = entityVal("block_rotation");
+      const blockContentConnectionType = entityVal("style_attachment");
+      const annotativeScaleEnabled = asBool(entityVal("is_annotative"));
+      const textDirectionNegative = asBool(entityVal("is_neg_textdir"));
+      const textAlignInIPE = entityVal("ipe_alignment");
+      let textAttachmentPoint = entityVal("justification");
+      const textAttachmentDirection = entityVal("attach_dir");
+      const bottomTextAttachmentDirection = entityVal("attach_bottom");
+      const topTextAttachmentDirection = entityVal("attach_top");
+      const contentScale = entityVal("scale_factor");
+      const numArrowheads = entityVal("num_arrowheads");
+      const arrowheadsPtr = entityVal("arrowheads");
+      const arrowHeadSize = libredwg.dwg_dynapi_subclass_size("LEADER_ArrowHead");
+      const arrowheadOverrides = [];
+      for (let i = 0; i < numArrowheads; i++) {
+        const arrowheadPtr = arrowheadsPtr + i * arrowHeadSize;
+        arrowheadOverrides.push({
+          index: subclassVal(arrowheadPtr, "LEADER_ArrowHead", "is_default"),
+          handle: refToId(
+            subclassVal(arrowheadPtr, "LEADER_ArrowHead", "arrowhead")
+          ) ?? ""
+        });
+      }
+      const numBlocklabels = entityVal("num_blocklabels");
+      const blocklabelsPtr = entityVal("blocklabels");
+      const blockLabelSize = libredwg.dwg_dynapi_subclass_size("LEADER_BlockLabel");
+      const blockAttributes = [];
+      for (let i = 0; i < numBlocklabels; i++) {
+        const blocklabelPtr = blocklabelsPtr + i * blockLabelSize;
+        blockAttributes.push({
+          id: refToId(
+            subclassVal(blocklabelPtr, "LEADER_BlockLabel", "attdef")
+          ),
+          index: subclassVal(
+            blocklabelPtr,
+            "LEADER_BlockLabel",
+            "ui_index"
+          ),
+          width: subclassVal(blocklabelPtr, "LEADER_BlockLabel", "width"),
+          text: subclassVal(
+            blocklabelPtr,
+            "LEADER_BlockLabel",
+            "label_text"
+          )
+        });
+      }
+      const ctxPtr = entity + libredwg.dwg_dynapi_entity_field_offset(entity, "ctx");
+      const contentPtr = ctxPtr + libredwg.dwg_dynapi_subclass_field_offset(
+        "MLEADER_AnnotContext",
+        "content"
+      );
+      const contentScaleFactor = subclassVal(
+        ctxPtr,
+        "MLEADER_AnnotContext",
+        "scale_factor"
+      );
+      const contentBasePosition = subclassVal(
+        ctxPtr,
+        "MLEADER_AnnotContext",
+        "content_base"
+      );
+      const landingGap = subclassVal(
+        ctxPtr,
+        "MLEADER_AnnotContext",
+        "landing_gap"
+      );
+      const textAttachment = subclassVal(
+        ctxPtr,
+        "MLEADER_AnnotContext",
+        "attach_dir"
+      );
+      const contextTextHeight = subclassVal(
+        ctxPtr,
+        "MLEADER_AnnotContext",
+        "text_height"
+      );
+      const contextArrowSize = subclassVal(
+        ctxPtr,
+        "MLEADER_AnnotContext",
+        "arrow_size"
+      );
+      const contextTextLeft = subclassVal(
+        ctxPtr,
+        "MLEADER_AnnotContext",
+        "text_left"
+      );
+      const contextTextRight = subclassVal(
+        ctxPtr,
+        "MLEADER_AnnotContext",
+        "text_right"
+      );
+      const contextTextAngleType = subclassVal(
+        ctxPtr,
+        "MLEADER_AnnotContext",
+        "text_angletype"
+      );
+      const contextTextAlignment = subclassVal(
+        ctxPtr,
+        "MLEADER_AnnotContext",
+        "text_alignment"
+      );
+      const hasMText = asBool(
+        subclassVal(ctxPtr, "MLEADER_AnnotContext", "has_content_txt")
+      );
+      const hasBlock = asBool(
+        subclassVal(ctxPtr, "MLEADER_AnnotContext", "has_content_blk")
+      );
+      const planeOrigin = subclassVal(
+        ctxPtr,
+        "MLEADER_AnnotContext",
+        "base"
+      );
+      const planeXAxisDirection = subclassVal(
+        ctxPtr,
+        "MLEADER_AnnotContext",
+        "base_dir"
+      );
+      const planeYAxisDirection = subclassVal(
+        ctxPtr,
+        "MLEADER_AnnotContext",
+        "base_vert"
+      );
+      const planeNormalReversed = asBool(
+        subclassVal(ctxPtr, "MLEADER_AnnotContext", "is_normal_reversed")
+      );
+      let textFlowDirection;
+      let normal;
+      let textRotation;
+      let textWidth;
+      let textLineSpacingFactor;
+      let textLineSpacingStyle;
+      let textAnchor;
+      let textDirection;
+      let textBackgroundColor;
+      let textBackgroundScaleFactor;
+      let textBackgroundTransparency;
+      let textBackgroundColorOn;
+      let textFillOn;
+      let textColumnType;
+      let textUseAutoHeight;
+      let textColumnWidth;
+      let textColumnGutterWidth;
+      let textColumnFlowReversed;
+      let textColumnHeight;
+      let textUseWordBreak;
+      let textContent;
+      if (hasMText) {
+        const textAlignment = subclassVal(
+          contentPtr,
+          "MLEADER_Content_MText",
+          "alignment"
+        );
+        if (textAlignment != null && textAlignment !== 0) {
+          textAttachmentPoint = textAlignment;
+        }
+        normal = subclassVal(
+          contentPtr,
+          "MLEADER_Content_MText",
+          "normal"
+        );
+        textAnchor = subclassVal(
+          contentPtr,
+          "MLEADER_Content_MText",
+          "location"
+        );
+        textRotation = subclassVal(
+          contentPtr,
+          "MLEADER_Content_MText",
+          "rotation"
+        );
+        textDirection = subclassVal(
+          contentPtr,
+          "MLEADER_Content_MText",
+          "direction"
+        );
+        textWidth = subclassVal(contentPtr, "MLEADER_Content_MText", "width");
+        textLineSpacingFactor = subclassVal(
+          contentPtr,
+          "MLEADER_Content_MText",
+          "line_spacing_factor"
+        );
+        textLineSpacingStyle = subclassVal(
+          contentPtr,
+          "MLEADER_Content_MText",
+          "line_spacing_style"
+        );
+        textFlowDirection = subclassVal(
+          contentPtr,
+          "MLEADER_Content_MText",
+          "flow"
+        );
+        textBackgroundColor = mleaderColor(
+          subclassVal(
+            contentPtr,
+            "MLEADER_Content_MText",
+            "bg_color"
+          )
+        );
+        textBackgroundScaleFactor = subclassVal(
+          contentPtr,
+          "MLEADER_Content_MText",
+          "bg_scale"
+        );
+        textBackgroundTransparency = subclassVal(
+          contentPtr,
+          "MLEADER_Content_MText",
+          "bg_transparency"
+        );
+        textFillOn = asBool(
+          subclassVal(contentPtr, "MLEADER_Content_MText", "is_bg_fill")
+        );
+        textBackgroundColorOn = asBool(
+          subclassVal(
+            contentPtr,
+            "MLEADER_Content_MText",
+            "is_bg_mask_fill"
+          )
+        );
+        textColumnType = subclassVal(
+          contentPtr,
+          "MLEADER_Content_MText",
+          "col_type"
+        );
+        textUseAutoHeight = asBool(
+          subclassVal(
+            contentPtr,
+            "MLEADER_Content_MText",
+            "is_height_auto"
+          )
+        );
+        textColumnWidth = subclassVal(
+          contentPtr,
+          "MLEADER_Content_MText",
+          "col_width"
+        );
+        textColumnGutterWidth = subclassVal(
+          contentPtr,
+          "MLEADER_Content_MText",
+          "col_gutter"
+        );
+        textColumnFlowReversed = asBool(
+          subclassVal(
+            contentPtr,
+            "MLEADER_Content_MText",
+            "is_col_flow_reversed"
+          )
+        );
+        const numColSizes = subclassVal(
+          contentPtr,
+          "MLEADER_Content_MText",
+          "num_col_sizes"
+        );
+        const colSizesPtr = subclassVal(
+          contentPtr,
+          "MLEADER_Content_MText",
+          "col_sizes"
+        );
+        if (numColSizes > 0) {
+          textColumnHeight = libredwg.dwg_ptr_to_double_array(
+            colSizesPtr,
+            numColSizes
+          )[0];
+        }
+        textUseWordBreak = asBool(
+          subclassVal(contentPtr, "MLEADER_Content_MText", "word_break")
+        );
+        textContent = subclassVal(
+          contentPtr,
+          "MLEADER_Content_MText",
+          "default_text"
+        );
+      }
+      let blockContent;
+      if (hasBlock) {
+        const transformPtr = subclassVal(
+          contentPtr,
+          "MLEADER_Content_Block",
+          "transform"
+        );
+        blockContent = {
+          blockContentId: refToId(
+            subclassVal(contentPtr, "MLEADER_Content_Block", "block_table")
+          ),
+          normal: subclassVal(
+            contentPtr,
+            "MLEADER_Content_Block",
+            "normal"
+          ),
+          position: subclassVal(
+            contentPtr,
+            "MLEADER_Content_Block",
+            "location"
+          ),
+          scale: subclassVal(
+            contentPtr,
+            "MLEADER_Content_Block",
+            "scale"
+          ),
+          rotation: subclassVal(
+            contentPtr,
+            "MLEADER_Content_Block",
+            "rotation"
+          ),
+          color: mleaderColor(
+            subclassVal(
+              contentPtr,
+              "MLEADER_Content_Block",
+              "color"
+            )
+          ),
+          transformationMatrix: transformPtr ? libredwg.dwg_ptr_to_double_array(transformPtr, 16) : void 0
+        };
+      }
+      const numLeaders = subclassVal(
+        ctxPtr,
+        "MLEADER_AnnotContext",
+        "num_leaders"
+      );
+      const leadersPtr = subclassVal(
+        ctxPtr,
+        "MLEADER_AnnotContext",
+        "leaders"
+      );
+      const leaderNodeSize = libredwg.dwg_dynapi_subclass_size("LEADER_Node");
+      const leaderLineSize = libredwg.dwg_dynapi_subclass_size("LEADER_Line");
+      const leaderBreakSize = libredwg.dwg_dynapi_subclass_size("LEADER_Break");
+      const leaderSections = [];
+      for (let i = 0; i < numLeaders; i++) {
+        const nodePtr = leadersPtr + i * leaderNodeSize;
+        const lastLeaderLinePointSet = asBool(
+          subclassVal(nodePtr, "LEADER_Node", "has_lastleaderlinepoint")
+        );
+        const doglegVectorSet = asBool(
+          subclassVal(nodePtr, "LEADER_Node", "has_dogleg")
+        );
+        const numBreaks = subclassVal(nodePtr, "LEADER_Node", "num_breaks");
+        const breaksPtr = subclassVal(nodePtr, "LEADER_Node", "breaks");
+        const nodeBreaks = [];
+        for (let j = 0; j < numBreaks; j++) {
+          const breakPtr = breaksPtr + j * leaderBreakSize;
+          nodeBreaks.push({
+            start: subclassVal(breakPtr, "LEADER_Break", "start"),
+            end: subclassVal(breakPtr, "LEADER_Break", "end")
+          });
+        }
+        const numLines = subclassVal(nodePtr, "LEADER_Node", "num_lines");
+        const linesPtr = subclassVal(nodePtr, "LEADER_Node", "lines");
+        const leaderLines = [];
+        for (let j = 0; j < numLines; j++) {
+          const linePtr = linesPtr + j * leaderLineSize;
+          const numPoints = subclassVal(
+            linePtr,
+            "LEADER_Line",
+            "num_points"
+          );
+          const pointsPtr = subclassVal(linePtr, "LEADER_Line", "points");
+          const vertices = numPoints > 0 ? libredwg.dwg_ptr_to_point3d_array(pointsPtr, numPoints) : [];
+          const lineNumBreaks = subclassVal(
+            linePtr,
+            "LEADER_Line",
+            "num_breaks"
+          );
+          const lineBreaksPtr = subclassVal(
+            linePtr,
+            "LEADER_Line",
+            "breaks"
+          );
+          const lineBreaks = [];
+          for (let k = 0; k < lineNumBreaks; k++) {
+            const breakPtr = lineBreaksPtr + k * leaderBreakSize;
+            lineBreaks.push({
+              start: subclassVal(breakPtr, "LEADER_Break", "start"),
+              end: subclassVal(breakPtr, "LEADER_Break", "end")
+            });
+          }
+          leaderLines.push({
+            vertices,
+            leaderLineIndex: subclassVal(
+              linePtr,
+              "LEADER_Line",
+              "line_index"
+            ),
+            breaks: lineBreaks.length > 0 ? lineBreaks : void 0
+          });
+        }
+        leaderSections.push({
+          lastLeaderLinePoint: lastLeaderLinePointSet ? subclassVal(
+            nodePtr,
+            "LEADER_Node",
+            "lastleaderlinepoint"
+          ) : void 0,
+          lastLeaderLinePointSet,
+          doglegVector: doglegVectorSet ? subclassVal(nodePtr, "LEADER_Node", "dogleg_vector") : void 0,
+          doglegVectorSet,
+          doglegLength: subclassVal(nodePtr, "LEADER_Node", "dogleg_length"),
+          breaks: nodeBreaks.length > 0 ? nodeBreaks : void 0,
+          leaderBranchIndex: subclassVal(
+            nodePtr,
+            "LEADER_Node",
+            "branch_index"
+          ),
+          leaderLines
+        });
+      }
+      return {
+        type: "MULTILEADER",
+        ...commonAttrs,
+        subclassMarker: "AcDbMLeader",
+        version,
+        leaderStyleId,
+        propertyOverrideFlag,
+        leaderLineType,
+        leaderLineColor,
+        leaderLineTypeId,
+        leaderLineWeight,
+        landingEnabled,
+        doglegEnabled,
+        doglegLength,
+        arrowheadId,
+        arrowheadSize: arrowheadSize || contextArrowSize,
+        contentType,
+        textStyleId,
+        textLeftAttachmentType: textLeftAttachmentType || contextTextLeft,
+        textRightAttachmentType: textRightAttachmentType || contextTextRight,
+        textAngleType: textAngleType || contextTextAngleType,
+        textAlignmentType: textAlignmentType || contextTextAlignment,
+        textColor,
+        textFrameEnabled,
+        landingGap,
+        textAttachment,
+        textFlowDirection,
+        blockContentId,
+        blockContentColor,
+        blockContentScale,
+        blockContentRotation,
+        blockContentConnectionType,
+        annotativeScaleEnabled,
+        arrowheadOverrides: arrowheadOverrides.length > 0 ? arrowheadOverrides : void 0,
+        blockAttributes: blockAttributes.length > 0 ? blockAttributes : void 0,
+        textDirectionNegative,
+        textAlignInIPE,
+        textAttachmentPoint,
+        textAttachmentDirection,
+        bottomTextAttachmentDirection,
+        topTextAttachmentDirection,
+        contentScale: contentScale || contentScaleFactor,
+        contentBasePosition,
+        normal,
+        textHeight: contextTextHeight,
+        textRotation,
+        textWidth,
+        textLineSpacingFactor,
+        textLineSpacingStyle,
+        textAnchor,
+        textDirection,
+        textBackgroundColor,
+        textBackgroundScaleFactor,
+        textBackgroundTransparency,
+        textBackgroundColorOn,
+        textFillOn,
+        textColumnType,
+        textUseAutoHeight,
+        textColumnWidth,
+        textColumnGutterWidth,
+        textColumnFlowReversed,
+        textColumnHeight,
+        textUseWordBreak,
+        textContent,
+        hasMText,
+        hasBlock,
+        blockContent,
+        planeOrigin,
+        planeXAxisDirection,
+        planeYAxisDirection,
+        planeNormalReversed,
+        leaderSections: leaderSections.length > 0 ? leaderSections : void 0
+      };
+    }
     convertOle2Frame(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const oleVersion = libredwg.dwg_dynapi_entity_value(entity, "oleversion").data;
-      const oleClient = libredwg.dwg_dynapi_entity_value(entity, "oleclient").data;
-      const dataSize = libredwg.dwg_dynapi_entity_value(entity, "data_size").data;
-      const leftUpPoint = libredwg.dwg_dynapi_entity_value(entity, "pt1").data;
-      const rightDownPoint = libredwg.dwg_dynapi_entity_value(entity, "pt2").data;
-      const lockAspect = libredwg.dwg_dynapi_entity_value(entity, "lock_aspect").data;
-      const oleObjectType = libredwg.dwg_dynapi_entity_value(entity, "type").data;
-      const tileModeDescriptor = libredwg.dwg_dynapi_entity_value(entity, "mode").data;
-      const binaryData = libredwg.dwg_dynapi_entity_value(entity, "data").data;
+      const oleVersion = libredwg.dwg_dynapi_entity_data(entity, "oleversion");
+      const oleClient = libredwg.dwg_dynapi_entity_data(entity, "oleclient");
+      const dataSize = libredwg.dwg_dynapi_entity_data(entity, "data_size");
+      const leftUpPoint = libredwg.dwg_dynapi_entity_data(entity, "pt1");
+      const rightDownPoint = libredwg.dwg_dynapi_entity_data(entity, "pt2");
+      const lockAspect = libredwg.dwg_dynapi_entity_data(entity, "lock_aspect");
+      const oleObjectType = libredwg.dwg_dynapi_entity_data(entity, "type");
+      const tileModeDescriptor = libredwg.dwg_dynapi_entity_data(entity, "mode");
+      const binaryData = libredwg.dwg_dynapi_entity_data(entity, "data");
       return {
         type: "OLE2FRAME",
         ...commonAttrs,
@@ -2142,10 +2510,10 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertOleFrame(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const flag = libredwg.dwg_dynapi_entity_value(entity, "flag").data;
-      const mode = libredwg.dwg_dynapi_entity_value(entity, "mode").data;
-      const dataSize = libredwg.dwg_dynapi_entity_value(entity, "data_size").data;
-      const binaryData = libredwg.dwg_dynapi_entity_value(entity, "data").data;
+      const flag = libredwg.dwg_dynapi_entity_data(entity, "flag");
+      const mode = libredwg.dwg_dynapi_entity_data(entity, "mode");
+      const dataSize = libredwg.dwg_dynapi_entity_data(entity, "data_size");
+      const binaryData = libredwg.dwg_dynapi_entity_data(entity, "data");
       return {
         type: "OLEFRAME",
         ...commonAttrs,
@@ -2157,76 +2525,31 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertMText(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const insertionPoint = libredwg.dwg_dynapi_entity_value(entity, "ins_pt").data;
-      const textHeight = libredwg.dwg_dynapi_entity_value(entity, "text_height").data;
-      const rectHeight = libredwg.dwg_dynapi_entity_value(entity, "rect_height").data;
-      const rectWidth = libredwg.dwg_dynapi_entity_value(entity, "rect_width").data;
-      const extentsWidth = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "extents_width"
-      ).data;
-      const extentsHeight = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "extents_height"
-      ).data;
-      const attachmentPoint = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "attachment"
-      ).data;
-      const drawingDirection = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "flow_dir"
-      ).data;
-      const text = libredwg.dwg_dynapi_entity_value(entity, "text").data;
+      const insertionPoint = libredwg.dwg_dynapi_entity_data(entity, "ins_pt");
+      const textHeight = libredwg.dwg_dynapi_entity_data(entity, "text_height");
+      const rectHeight = libredwg.dwg_dynapi_entity_data(entity, "rect_height");
+      const rectWidth = libredwg.dwg_dynapi_entity_data(entity, "rect_width");
+      const extentsWidth = libredwg.dwg_dynapi_entity_data(entity, "extents_width");
+      const extentsHeight = libredwg.dwg_dynapi_entity_data(entity, "extents_height");
+      const attachmentPoint = libredwg.dwg_dynapi_entity_data(entity, "attachment");
+      const drawingDirection = libredwg.dwg_dynapi_entity_data(entity, "flow_dir");
+      const text = libredwg.dwg_dynapi_entity_data(entity, "text");
       const styleName = libredwg.dwg_entity_mtext_get_style_name(entity);
-      const extrusionDirection = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "extrusion"
-      ).data;
-      const direction = libredwg.dwg_dynapi_entity_value(entity, "x_axis_dir").data;
-      const lineSpacingStyle = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "linespace_style"
-      ).data;
-      const lineSpacing = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "linespace_factor"
-      ).data;
-      const backgroundFill = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "bg_fill_flag"
-      ).data;
-      const fillBoxScale = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "bg_fill_scale"
-      ).data;
-      const backgroundFillColor = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "bg_fill_color"
-      ).data;
-      const backgroundFillTransparency = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "bg_fill_trans"
-      ).data;
-      const columnType = libredwg.dwg_dynapi_entity_value(entity, "column_type").data;
-      const columnFlowReversed = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "flow_reversed"
-      ).data;
-      const columnAutoHeight = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "auto_height"
-      ).data;
-      const columnWidth = libredwg.dwg_dynapi_entity_value(entity, "column_width").data;
-      const columnGutter = libredwg.dwg_dynapi_entity_value(entity, "gutter").data;
-      const columnHeightCount = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "num_column_heights"
-      ).data;
-      const columnHeights_ptr = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "column_heights"
-      ).data;
+      const extrusionDirection = libredwg.dwg_dynapi_entity_data(entity, "extrusion");
+      const direction = libredwg.dwg_dynapi_entity_data(entity, "x_axis_dir");
+      const lineSpacingStyle = libredwg.dwg_dynapi_entity_data(entity, "linespace_style");
+      const lineSpacing = libredwg.dwg_dynapi_entity_data(entity, "linespace_factor");
+      const backgroundFill = libredwg.dwg_dynapi_entity_data(entity, "bg_fill_flag");
+      const fillBoxScale = libredwg.dwg_dynapi_entity_data(entity, "bg_fill_scale");
+      const backgroundFillColor = libredwg.dwg_dynapi_entity_data(entity, "bg_fill_color");
+      const backgroundFillTransparency = libredwg.dwg_dynapi_entity_data(entity, "bg_fill_trans");
+      const columnType = libredwg.dwg_dynapi_entity_data(entity, "column_type");
+      const columnFlowReversed = libredwg.dwg_dynapi_entity_data(entity, "flow_reversed");
+      const columnAutoHeight = libredwg.dwg_dynapi_entity_data(entity, "auto_height");
+      const columnWidth = libredwg.dwg_dynapi_entity_data(entity, "column_width");
+      const columnGutter = libredwg.dwg_dynapi_entity_data(entity, "gutter");
+      const columnHeightCount = libredwg.dwg_dynapi_entity_data(entity, "num_column_heights");
+      const columnHeights_ptr = libredwg.dwg_dynapi_entity_data(entity, "column_heights");
       const columnHeights = libredwg.dwg_ptr_to_double_array(
         columnHeights_ptr,
         columnHeightCount
@@ -2268,15 +2591,12 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertPoint(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const x = libredwg.dwg_dynapi_entity_value(entity, "x").data;
-      const y = libredwg.dwg_dynapi_entity_value(entity, "y").data;
-      const z = libredwg.dwg_dynapi_entity_value(entity, "z").data;
-      const thickness = libredwg.dwg_dynapi_entity_value(entity, "thickness").data;
-      const extrusionDirection = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "extrusion"
-      ).data;
-      const angle = libredwg.dwg_dynapi_entity_value(entity, "x_ang").data;
+      const x = libredwg.dwg_dynapi_entity_data(entity, "x");
+      const y = libredwg.dwg_dynapi_entity_data(entity, "y");
+      const z = libredwg.dwg_dynapi_entity_data(entity, "z");
+      const thickness = libredwg.dwg_dynapi_entity_data(entity, "thickness");
+      const extrusionDirection = libredwg.dwg_dynapi_entity_data(entity, "extrusion");
+      const angle = libredwg.dwg_dynapi_entity_data(entity, "x_ang");
       return {
         type: "POINT",
         ...commonAttrs,
@@ -2288,16 +2608,13 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertPolyline2d(entity, commonAttrs, object) {
       const libredwg = this.libredwg;
-      const flag = libredwg.dwg_dynapi_entity_value(entity, "flag").data;
-      const smoothType = libredwg.dwg_dynapi_entity_value(entity, "curve_type").data;
-      const startWidth = libredwg.dwg_dynapi_entity_value(entity, "start_width").data;
-      const endWidth = libredwg.dwg_dynapi_entity_value(entity, "end_width").data;
-      const elevation = libredwg.dwg_dynapi_entity_value(entity, "elevation").data;
-      const thickness = libredwg.dwg_dynapi_entity_value(entity, "thickness").data;
-      const extrusionDirection = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "extrusion"
-      ).data;
+      const flag = libredwg.dwg_dynapi_entity_data(entity, "flag");
+      const smoothType = libredwg.dwg_dynapi_entity_data(entity, "curve_type");
+      const startWidth = libredwg.dwg_dynapi_entity_data(entity, "start_width");
+      const endWidth = libredwg.dwg_dynapi_entity_data(entity, "end_width");
+      const elevation = libredwg.dwg_dynapi_entity_data(entity, "elevation");
+      const thickness = libredwg.dwg_dynapi_entity_data(entity, "thickness");
+      const extrusionDirection = libredwg.dwg_dynapi_entity_data(entity, "extrusion");
       const vertices = libredwg.dwg_entity_polyline_2d_get_vertices(object);
       return {
         type: "POLYLINE2D",
@@ -2329,14 +2646,11 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertPolyline3d(entity, commonAttrs, object) {
       const libredwg = this.libredwg;
-      const flag = libredwg.dwg_dynapi_entity_value(entity, "flag").data;
-      const smoothType = libredwg.dwg_dynapi_entity_value(entity, "curve_type").data;
-      const startWidth = libredwg.dwg_dynapi_entity_value(entity, "start_width").data;
-      const endWidth = libredwg.dwg_dynapi_entity_value(entity, "end_width").data;
-      const extrusionDirection = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "extrusion"
-      ).data;
+      const flag = libredwg.dwg_dynapi_entity_data(entity, "flag");
+      const smoothType = libredwg.dwg_dynapi_entity_data(entity, "curve_type");
+      const startWidth = libredwg.dwg_dynapi_entity_data(entity, "start_width");
+      const endWidth = libredwg.dwg_dynapi_entity_data(entity, "end_width");
+      const extrusionDirection = libredwg.dwg_dynapi_entity_data(entity, "extrusion");
       const vertices = libredwg.dwg_entity_polyline_3d_get_vertices(object);
       return {
         type: "POLYLINE3D",
@@ -2358,24 +2672,12 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertProxyEntity(entity, commonAttrs, objectPtr) {
       const libredwg = this.libredwg;
-      const proxyEntityClassId = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "proxy_id"
-      ).data;
-      const applicationEntityClassId = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "class_id"
-      ).data;
-      const entityDataSize = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "data_numbits"
-      ).data;
-      const objectDrawingFormat = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "version"
-      ).data;
-      const fromDxf = libredwg.dwg_dynapi_entity_value(entity, "from_dxf").data;
-      const numObjIds = libredwg.dwg_dynapi_entity_value(entity, "num_objids").data;
+      const proxyEntityClassId = libredwg.dwg_dynapi_entity_data(entity, "proxy_id");
+      const applicationEntityClassId = libredwg.dwg_dynapi_entity_data(entity, "class_id");
+      const entityDataSize = libredwg.dwg_dynapi_entity_data(entity, "data_numbits");
+      const objectDrawingFormat = libredwg.dwg_dynapi_entity_data(entity, "version");
+      const fromDxf = libredwg.dwg_dynapi_entity_data(entity, "from_dxf");
+      const numObjIds = libredwg.dwg_dynapi_entity_data(entity, "num_objids");
       const graphicsBytes = libredwg.dwg_entity_get_preview(objectPtr);
       const graphicsDataSize = (graphicsBytes == null ? void 0 : graphicsBytes.length) ?? 0;
       const entityBytes = libredwg.dwg_entity_proxy_entity_get_entity_data(entity);
@@ -2383,7 +2685,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       const entityData = entityBytes ? uint8ArrayToHexString(entityBytes) : void 0;
       let linkedObjectIds;
       if (numObjIds > 0) {
-        const objidsPtr = libredwg.dwg_dynapi_entity_value(entity, "objids").data;
+        const objidsPtr = libredwg.dwg_dynapi_entity_data(entity, "objids");
         if (objidsPtr) {
           const objids = libredwg.dwg_ptr_to_object_ref_array(
             objidsPtr,
@@ -2438,8 +2740,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertRay(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const firstPoint = libredwg.dwg_dynapi_entity_value(entity, "point").data;
-      const unitDirection = libredwg.dwg_dynapi_entity_value(entity, "vector").data;
+      const firstPoint = libredwg.dwg_dynapi_entity_data(entity, "point");
+      const unitDirection = libredwg.dwg_dynapi_entity_data(entity, "vector");
       return {
         type: "RAY",
         ...commonAttrs,
@@ -2449,51 +2751,25 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertSection(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const state = libredwg.dwg_dynapi_entity_value(entity, "state").data;
-      const flags = libredwg.dwg_dynapi_entity_value(entity, "flag").data;
-      const name = libredwg.dwg_dynapi_entity_value(entity, "name").data;
-      const verticalDirection = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "vert_dir"
-      ).data;
-      const topHeight = libredwg.dwg_dynapi_entity_value(entity, "top_height").data;
-      const bottomHeight = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "bottom_height"
-      ).data;
-      const indicatorTransparency = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "indicator_alpha"
-      ).data;
-      const indicatorColor = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "indicator_color"
-      ).data;
-      const numberOfVertices = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "num_verts"
-      ).data;
-      const vertices_ptr = libredwg.dwg_dynapi_entity_value(entity, "verts").data;
+      const state = libredwg.dwg_dynapi_entity_data(entity, "state");
+      const flags = libredwg.dwg_dynapi_entity_data(entity, "flag");
+      const name = libredwg.dwg_dynapi_entity_data(entity, "name");
+      const verticalDirection = libredwg.dwg_dynapi_entity_data(entity, "vert_dir");
+      const topHeight = libredwg.dwg_dynapi_entity_data(entity, "top_height");
+      const bottomHeight = libredwg.dwg_dynapi_entity_data(entity, "bottom_height");
+      const indicatorTransparency = libredwg.dwg_dynapi_entity_data(entity, "indicator_alpha");
+      const indicatorColor = libredwg.dwg_dynapi_entity_data(entity, "indicator_color");
+      const numberOfVertices = libredwg.dwg_dynapi_entity_data(entity, "num_verts");
+      const vertices_ptr = libredwg.dwg_dynapi_entity_data(entity, "verts");
       const vertices = numberOfVertices > 0 ? libredwg.dwg_ptr_to_point3d_array(vertices_ptr, numberOfVertices) : [];
-      const numberOfBackLineVertices = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "num_blverts"
-      ).data;
-      const backLineVertices_ptr = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "blverts"
-      ).data;
+      const numberOfBackLineVertices = libredwg.dwg_dynapi_entity_data(entity, "num_blverts");
+      const backLineVertices_ptr = libredwg.dwg_dynapi_entity_data(entity, "blverts");
       const backLineVertices = numberOfBackLineVertices > 0 ? libredwg.dwg_ptr_to_point3d_array(
         backLineVertices_ptr,
         numberOfBackLineVertices
       ) : [];
-      const geometrySettingHandle = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "geometrySettingHardId"
-      ).data;
-      const geometrySettingHardId = libredwg.dwg_ref_get_handle_absolute_ref(
-        geometrySettingHandle
-      );
+      const geometrySettingHandle = libredwg.dwg_dynapi_entity_data(entity, "geometrySettingHardId");
+      const geometrySettingHardId = libredwg.dwg_ref_get_handle_absolute_ref(geometrySettingHandle) ?? 0n;
       return {
         type: "SECTION",
         ...commonAttrs,
@@ -2512,17 +2788,40 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         geometrySettingHardId
       };
     }
+    convertShape(entity, commonAttrs) {
+      const libredwg = this.libredwg;
+      const insertionPoint = libredwg.dwg_dynapi_entity_data(entity, "ins_pt");
+      const size = libredwg.dwg_dynapi_entity_data(entity, "scale");
+      const rotation = libredwg.dwg_dynapi_entity_data(entity, "rotation");
+      const xScale = libredwg.dwg_dynapi_entity_data(entity, "width_factor");
+      const obliqueAngle = libredwg.dwg_dynapi_entity_data(entity, "oblique_angle");
+      const thickness = libredwg.dwg_dynapi_entity_data(entity, "thickness");
+      const extrusionDirection = libredwg.dwg_dynapi_entity_data(entity, "extrusion");
+      const shapeNumber = libredwg.dwg_dynapi_entity_data(entity, "style_id");
+      const styleName = libredwg.dwg_entity_text_get_style_name(entity);
+      return {
+        type: "SHAPE",
+        subclassMarker: "AcDbShape",
+        ...commonAttrs,
+        thickness,
+        insertionPoint,
+        size,
+        shapeNumber,
+        styleName,
+        rotation,
+        xScale,
+        obliqueAngle,
+        extrusionDirection
+      };
+    }
     convertSolid(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const corner1 = libredwg.dwg_dynapi_entity_value(entity, "corner1").data;
-      const corner2 = libredwg.dwg_dynapi_entity_value(entity, "corner2").data;
-      const corner3 = libredwg.dwg_dynapi_entity_value(entity, "corner3").data;
-      const corner4 = libredwg.dwg_dynapi_entity_value(entity, "corner4").data;
-      const thickness = libredwg.dwg_dynapi_entity_value(entity, "thickness").data;
-      const extrusionDirection = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "extrusion"
-      ).data;
+      const corner1 = libredwg.dwg_dynapi_entity_data(entity, "corner1");
+      const corner2 = libredwg.dwg_dynapi_entity_data(entity, "corner2");
+      const corner3 = libredwg.dwg_dynapi_entity_data(entity, "corner3");
+      const corner4 = libredwg.dwg_dynapi_entity_data(entity, "corner4");
+      const thickness = libredwg.dwg_dynapi_entity_data(entity, "thickness");
+      const extrusionDirection = libredwg.dwg_dynapi_entity_data(entity, "extrusion");
       return {
         type: "SOLID",
         ...commonAttrs,
@@ -2536,38 +2835,29 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertSpline(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const flag = libredwg.dwg_dynapi_entity_value(entity, "splineflags").data;
-      const degree = libredwg.dwg_dynapi_entity_value(entity, "degree").data;
-      const knotTolerance = libredwg.dwg_dynapi_entity_value(entity, "knot_tol").data;
-      const numberOfKnots = libredwg.dwg_dynapi_entity_value(entity, "num_knots").data;
-      const knots_ptr = libredwg.dwg_dynapi_entity_value(entity, "knots").data;
+      const flag = libredwg.dwg_dynapi_entity_data(entity, "splineflags");
+      const degree = libredwg.dwg_dynapi_entity_data(entity, "degree");
+      const knotTolerance = libredwg.dwg_dynapi_entity_data(entity, "knot_tol");
+      const numberOfKnots = libredwg.dwg_dynapi_entity_data(entity, "num_knots");
+      const knots_ptr = libredwg.dwg_dynapi_entity_data(entity, "knots");
       const knots = libredwg.dwg_ptr_to_double_array(knots_ptr, numberOfKnots);
-      const fitTolerance = libredwg.dwg_dynapi_entity_value(entity, "fit_tol").data;
-      const numberOfFitPoints = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "num_fit_pts"
-      ).data;
-      const fit_pts_ptr = libredwg.dwg_dynapi_entity_value(entity, "fit_pts").data;
+      const fitTolerance = libredwg.dwg_dynapi_entity_data(entity, "fit_tol");
+      const numberOfFitPoints = libredwg.dwg_dynapi_entity_data(entity, "num_fit_pts");
+      const fit_pts_ptr = libredwg.dwg_dynapi_entity_data(entity, "fit_pts");
       const fitPoints = libredwg.dwg_ptr_to_point3d_array(
         fit_pts_ptr,
         numberOfFitPoints
       );
-      const weighted = libredwg.dwg_dynapi_entity_value(entity, "weighted").data;
-      const controlTolerance = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "ctrl_tol"
-      ).data;
-      const numberOfControlPoints = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "num_ctrl_pts"
-      ).data;
-      const ctrl_pts_ptr = libredwg.dwg_dynapi_entity_value(entity, "ctrl_pts").data;
+      const weighted = libredwg.dwg_dynapi_entity_data(entity, "weighted");
+      const controlTolerance = libredwg.dwg_dynapi_entity_data(entity, "ctrl_tol");
+      const numberOfControlPoints = libredwg.dwg_dynapi_entity_data(entity, "num_ctrl_pts");
+      const ctrl_pts_ptr = libredwg.dwg_dynapi_entity_data(entity, "ctrl_pts");
       const controlPoints = libredwg.dwg_ptr_to_point4d_array(
         ctrl_pts_ptr,
         numberOfControlPoints
       );
-      const startTangent = libredwg.dwg_dynapi_entity_value(entity, "beg_tan_vec").data;
-      const endTangent = libredwg.dwg_dynapi_entity_value(entity, "end_tan_vec").data;
+      const startTangent = libredwg.dwg_dynapi_entity_data(entity, "beg_tan_vec");
+      const endTangent = libredwg.dwg_dynapi_entity_data(entity, "end_tan_vec");
       return {
         type: "SPLINE",
         ...commonAttrs,
@@ -2596,66 +2886,32 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertTable(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const name = libredwg.dwg_dynapi_subclass_value(entity, "ldata", "name").data;
-      const startPoint = libredwg.dwg_dynapi_entity_value(entity, "ins_pt").data;
-      const directionVector = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "horiz_direction"
-      ).data;
-      const tableValue = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "flag_for_table_value"
-      ).data;
-      const rowCount = libredwg.dwg_dynapi_entity_value(entity, "num_rows").data;
-      const columnCount = libredwg.dwg_dynapi_entity_value(entity, "num_cols").data;
-      const row_heights_ptr = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "row_heights"
-      ).data;
+      const name = libredwg.dwg_dynapi_subclass_data(entity, "ldata", "name");
+      const startPoint = libredwg.dwg_dynapi_entity_data(entity, "ins_pt");
+      const directionVector = libredwg.dwg_dynapi_entity_data(entity, "horiz_direction");
+      const tableValue = libredwg.dwg_dynapi_entity_data(entity, "flag_for_table_value");
+      const rowCount = libredwg.dwg_dynapi_entity_data(entity, "num_rows");
+      const columnCount = libredwg.dwg_dynapi_entity_data(entity, "num_cols");
+      const row_heights_ptr = libredwg.dwg_dynapi_entity_data(entity, "row_heights");
       const rowHeightArr = libredwg.dwg_ptr_to_double_array(
         row_heights_ptr,
         rowCount
       );
-      const col_widths_ptr = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "col_widths"
-      ).data;
+      const col_widths_ptr = libredwg.dwg_dynapi_entity_data(entity, "col_widths");
       const columnWidthArr = libredwg.dwg_ptr_to_double_array(
         col_widths_ptr,
         columnCount
       );
-      const table_style_ref = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "tablestyle"
-      ).data;
-      const tableStyleId = idToString(
-        libredwg.dwg_ref_get_absref(table_style_ref)
-      );
-      const block_header_ref = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "block_header"
-      ).data;
-      const blockRecordHandle = idToString(
-        libredwg.dwg_ref_get_absref(block_header_ref)
-      );
-      const overrideFlag = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "table_flag_override"
-      ).data;
-      const borderColorOverrideFlag = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "border_color_overrides_flag"
-      ).data;
-      const borderLineWeightOverrideFlag = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "border_lineweight_overrides_flag"
-      ).data;
-      const borderVisibilityOverrideFlag = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "border_visibility_overrides_flag"
-      ).data;
-      const num_cells = libredwg.dwg_dynapi_entity_value(entity, "num_cells").data;
-      const cells_ptr = libredwg.dwg_dynapi_entity_value(entity, "cells").data;
+      const table_style_ref = libredwg.dwg_dynapi_entity_data(entity, "tablestyle");
+      const tableStyleId = libredwg.dwg_ref_get_id(table_style_ref) ?? "";
+      const block_header_ref = libredwg.dwg_dynapi_entity_data(entity, "block_header");
+      const blockRecordHandle = libredwg.dwg_ref_get_id(block_header_ref) ?? "";
+      const overrideFlag = libredwg.dwg_dynapi_entity_data(entity, "table_flag_override");
+      const borderColorOverrideFlag = libredwg.dwg_dynapi_entity_data(entity, "border_color_overrides_flag");
+      const borderLineWeightOverrideFlag = libredwg.dwg_dynapi_entity_data(entity, "border_lineweight_overrides_flag");
+      const borderVisibilityOverrideFlag = libredwg.dwg_dynapi_entity_data(entity, "border_visibility_overrides_flag");
+      const num_cells = libredwg.dwg_dynapi_entity_data(entity, "num_cells");
+      const cells_ptr = libredwg.dwg_dynapi_entity_data(entity, "cells");
       const cells = libredwg.dwg_ptr_to_table_cell_array(cells_ptr, num_cells);
       return {
         type: "ACAD_TABLE",
@@ -2714,28 +2970,19 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertTextBase(entity) {
       const libredwg = this.libredwg;
-      const text = libredwg.dwg_dynapi_entity_value(entity, "text_value").data;
-      const thickness = libredwg.dwg_dynapi_entity_value(entity, "thickness").data;
-      const startPoint = libredwg.dwg_dynapi_entity_value(entity, "ins_pt").data;
-      const endPoint = libredwg.dwg_dynapi_entity_value(entity, "alignment_pt").data;
-      const rotation = libredwg.dwg_dynapi_entity_value(entity, "rotation").data;
-      const textHeight = libredwg.dwg_dynapi_entity_value(entity, "height").data;
-      const xScale = libredwg.dwg_dynapi_entity_value(entity, "width_factor").data;
-      const obliqueAngle = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "oblique_angle"
-      ).data;
+      const text = libredwg.dwg_dynapi_entity_data(entity, "text_value");
+      const thickness = libredwg.dwg_dynapi_entity_data(entity, "thickness");
+      const startPoint = libredwg.dwg_dynapi_entity_data(entity, "ins_pt");
+      const endPoint = libredwg.dwg_dynapi_entity_data(entity, "alignment_pt");
+      const rotation = libredwg.dwg_dynapi_entity_data(entity, "rotation");
+      const textHeight = libredwg.dwg_dynapi_entity_data(entity, "height");
+      const xScale = libredwg.dwg_dynapi_entity_data(entity, "width_factor");
+      const obliqueAngle = libredwg.dwg_dynapi_entity_data(entity, "oblique_angle");
       const styleName = libredwg.dwg_entity_text_get_style_name(entity);
-      const generationFlag = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "generation"
-      ).data;
-      const halign = libredwg.dwg_dynapi_entity_value(entity, "horiz_alignment").data;
-      const valign = libredwg.dwg_dynapi_entity_value(entity, "vert_alignment").data;
-      const extrusionDirection = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "extrusion"
-      ).data;
+      const generationFlag = libredwg.dwg_dynapi_entity_data(entity, "generation");
+      const halign = libredwg.dwg_dynapi_entity_data(entity, "horiz_alignment");
+      const valign = libredwg.dwg_dynapi_entity_data(entity, "vert_alignment");
+      const extrusionDirection = libredwg.dwg_dynapi_entity_data(entity, "extrusion");
       return {
         text,
         thickness,
@@ -2761,16 +3008,10 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertTolerance(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const insertionPoint = libredwg.dwg_dynapi_entity_value(entity, "ins_pt").data;
-      const text = libredwg.dwg_dynapi_entity_value(entity, "text_value").data;
-      const xAxisDirection = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "x_direction"
-      ).data;
-      const extrusionDirection = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "extrusion"
-      ).data;
+      const insertionPoint = libredwg.dwg_dynapi_entity_data(entity, "ins_pt");
+      const text = libredwg.dwg_dynapi_entity_data(entity, "text_value");
+      const xAxisDirection = libredwg.dwg_dynapi_entity_data(entity, "x_direction");
+      const extrusionDirection = libredwg.dwg_dynapi_entity_data(entity, "extrusion");
       const dimStyleName = libredwg.dwg_entity_get_dimstyle_name(entity);
       return {
         type: "TOLERANCE",
@@ -2784,83 +3025,50 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertViewport(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const viewportCenter = libredwg.dwg_dynapi_entity_value(entity, "center").data;
-      const width = libredwg.dwg_dynapi_entity_value(entity, "width").data;
-      const height = libredwg.dwg_dynapi_entity_value(entity, "height").data;
-      const status = libredwg.dwg_dynapi_entity_value(entity, "on_off").data;
-      const displayCenter = libredwg.dwg_dynapi_entity_value(entity, "VIEWCTR").data;
-      const snapBase = libredwg.dwg_dynapi_entity_value(entity, "SNAPBASE").data;
-      const snapSpacing = libredwg.dwg_dynapi_entity_value(entity, "SNAPUNIT").data;
-      const gridSpacing = libredwg.dwg_dynapi_entity_value(entity, "GRIDUNIT").data;
-      const viewDirection = libredwg.dwg_dynapi_entity_value(entity, "VIEWDIR").data;
-      const targetPoint = libredwg.dwg_dynapi_entity_value(entity, "view_target").data;
-      const perspectiveLensLength = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "lens_length"
-      ).data;
-      const frontClipZ = libredwg.dwg_dynapi_entity_value(entity, "front_clip_z").data;
-      const backClipZ = libredwg.dwg_dynapi_entity_value(entity, "back_clip_z").data;
-      const viewHeight = libredwg.dwg_dynapi_entity_value(entity, "VIEWSIZE").data;
-      const snapAngle = libredwg.dwg_dynapi_entity_value(entity, "SNAPANG").data;
-      const viewTwistAngle = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "twist_angle"
-      ).data;
-      const circleZoomPercent = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "circle_zoom"
-      ).data;
-      const statusBitFlags = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "status_flag"
-      ).data;
-      const sheetName = libredwg.dwg_dynapi_entity_value(entity, "style_sheet").data;
-      const renderMode = libredwg.dwg_dynapi_entity_value(entity, "render_mode").data;
-      const ucsPerViewport = libredwg.dwg_dynapi_entity_value(entity, "UCSVP").data;
-      const ucsOrigin = libredwg.dwg_dynapi_entity_value(entity, "ucsorg").data;
-      const ucsXAxis = libredwg.dwg_dynapi_entity_value(entity, "ucsxdir").data;
-      const ucsYAxis = libredwg.dwg_dynapi_entity_value(entity, "ucsydir").data;
-      const named_ucs_ref = libredwg.dwg_dynapi_entity_value(entity, "named_ucs").data;
-      const ucsId = libredwg.dwg_ref_get_absref(named_ucs_ref);
-      const base_ucs_ref = libredwg.dwg_dynapi_entity_value(entity, "base_ucs").data;
-      const ucsBaseId = libredwg.dwg_ref_get_absref(base_ucs_ref);
-      const orthographicType = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "UCSORTHOVIEW"
-      ).data;
-      const elevation = libredwg.dwg_dynapi_entity_value(entity, "ucs_elevation").data;
-      const shadePlotMode = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "shadeplot_mode"
-      ).data;
-      const isDefaultLighting = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "use_default_lights"
-      ).data;
-      const defaultLightingType = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "default_lighting_type"
-      ).data;
-      const brightness = libredwg.dwg_dynapi_entity_value(entity, "brightness").data;
-      const contrast = libredwg.dwg_dynapi_entity_value(entity, "contrast").data;
-      const majorGridFrequency = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "grid_major"
-      ).data;
-      const background_ref = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "background"
-      ).data;
-      const backgroundId = libredwg.dwg_ref_get_absref(background_ref);
-      const shadeplot_ref = libredwg.dwg_dynapi_entity_value(entity, "shadeplot").data;
-      const shadePlotId = libredwg.dwg_ref_get_absref(shadeplot_ref);
-      const visualstyle_ref = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "visualstyle"
-      ).data;
-      const visualStyleId = libredwg.dwg_ref_get_absref(visualstyle_ref);
-      const sun_ref = libredwg.dwg_dynapi_entity_value(entity, "sun").data;
-      const sunId = libredwg.dwg_ref_get_absref(sun_ref);
+      const viewportCenter = libredwg.dwg_dynapi_entity_data(entity, "center");
+      const width = libredwg.dwg_dynapi_entity_data(entity, "width");
+      const height = libredwg.dwg_dynapi_entity_data(entity, "height");
+      const status = libredwg.dwg_dynapi_entity_data(entity, "on_off");
+      const displayCenter = libredwg.dwg_dynapi_entity_data(entity, "VIEWCTR");
+      const snapBase = libredwg.dwg_dynapi_entity_data(entity, "SNAPBASE");
+      const snapSpacing = libredwg.dwg_dynapi_entity_data(entity, "SNAPUNIT");
+      const gridSpacing = libredwg.dwg_dynapi_entity_data(entity, "GRIDUNIT");
+      const viewDirection = libredwg.dwg_dynapi_entity_data(entity, "VIEWDIR");
+      const targetPoint = libredwg.dwg_dynapi_entity_data(entity, "view_target");
+      const perspectiveLensLength = libredwg.dwg_dynapi_entity_data(entity, "lens_length");
+      const frontClipZ = libredwg.dwg_dynapi_entity_data(entity, "front_clip_z");
+      const backClipZ = libredwg.dwg_dynapi_entity_data(entity, "back_clip_z");
+      const viewHeight = libredwg.dwg_dynapi_entity_data(entity, "VIEWSIZE");
+      const snapAngle = libredwg.dwg_dynapi_entity_data(entity, "SNAPANG");
+      const viewTwistAngle = libredwg.dwg_dynapi_entity_data(entity, "twist_angle");
+      const circleZoomPercent = libredwg.dwg_dynapi_entity_data(entity, "circle_zoom");
+      const statusBitFlags = libredwg.dwg_dynapi_entity_data(entity, "status_flag");
+      const sheetName = libredwg.dwg_dynapi_entity_data(entity, "style_sheet");
+      const renderMode = libredwg.dwg_dynapi_entity_data(entity, "render_mode");
+      const ucsPerViewport = libredwg.dwg_dynapi_entity_data(entity, "UCSVP");
+      const ucsOrigin = libredwg.dwg_dynapi_entity_data(entity, "ucsorg");
+      const ucsXAxis = libredwg.dwg_dynapi_entity_data(entity, "ucsxdir");
+      const ucsYAxis = libredwg.dwg_dynapi_entity_data(entity, "ucsydir");
+      const named_ucs_ref = libredwg.dwg_dynapi_entity_data(entity, "named_ucs");
+      const ucsId = libredwg.dwg_ref_get_id(named_ucs_ref);
+      const base_ucs_ref = libredwg.dwg_dynapi_entity_data(entity, "base_ucs");
+      const ucsBaseId = libredwg.dwg_ref_get_id(base_ucs_ref);
+      const orthographicType = libredwg.dwg_dynapi_entity_data(entity, "UCSORTHOVIEW");
+      const elevation = libredwg.dwg_dynapi_entity_data(entity, "ucs_elevation");
+      const shadePlotMode = libredwg.dwg_dynapi_entity_data(entity, "shadeplot_mode");
+      const isDefaultLighting = libredwg.dwg_dynapi_entity_data(entity, "use_default_lights");
+      const defaultLightingType = libredwg.dwg_dynapi_entity_data(entity, "default_lighting_type");
+      const brightness = libredwg.dwg_dynapi_entity_data(entity, "brightness");
+      const contrast = libredwg.dwg_dynapi_entity_data(entity, "contrast");
+      const majorGridFrequency = libredwg.dwg_dynapi_entity_data(entity, "grid_major");
+      const background_ref = libredwg.dwg_dynapi_entity_data(entity, "background");
+      const backgroundId = libredwg.dwg_ref_get_id(background_ref);
+      const shadeplot_ref = libredwg.dwg_dynapi_entity_data(entity, "shadeplot");
+      const shadePlotId = libredwg.dwg_ref_get_id(shadeplot_ref);
+      const visualstyle_ref = libredwg.dwg_dynapi_entity_data(entity, "visualstyle");
+      const visualStyleId = libredwg.dwg_ref_get_id(visualstyle_ref);
+      const sun_ref = libredwg.dwg_dynapi_entity_data(entity, "sun");
+      const sunId = libredwg.dwg_ref_get_id(sun_ref);
       return {
         type: "VIEWPORT",
         ...commonAttrs,
@@ -2890,55 +3098,46 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         ucsOrigin,
         ucsXAxis,
         ucsYAxis,
-        ucsId: idToString(ucsId),
-        ucsBaseId: idToString(ucsBaseId),
+        ucsId: ucsId ?? "",
+        ucsBaseId: ucsBaseId ?? "",
         orthographicType,
         elevation,
         shadePlotMode,
         majorGridFrequency,
-        backgroundId: idToString(backgroundId),
-        shadePlotId: idToString(shadePlotId),
-        visualStyleId: idToString(visualStyleId),
+        backgroundId: backgroundId ?? "",
+        shadePlotId: shadePlotId ?? "",
+        visualStyleId: visualStyleId ?? "",
         isDefaultLighting: !!isDefaultLighting,
         defaultLightingType,
         brightness,
         contrast,
-        sunId: idToString(sunId)
+        sunId: sunId ?? ""
       };
     }
     convertWipeout(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const version = libredwg.dwg_dynapi_entity_value(entity, "class_version").data;
-      const position = libredwg.dwg_dynapi_entity_value(entity, "pt0").data;
-      const uPixel = libredwg.dwg_dynapi_entity_value(entity, "uvec").data;
-      const vPixel = libredwg.dwg_dynapi_entity_value(entity, "vvec").data;
-      const imageSize = libredwg.dwg_dynapi_entity_value(entity, "image_size").data;
-      const flags = libredwg.dwg_dynapi_entity_value(entity, "display_props").data;
-      const clipping = libredwg.dwg_dynapi_entity_value(entity, "clipping").data;
-      const brightness = libredwg.dwg_dynapi_entity_value(entity, "brightness").data;
-      const contrast = libredwg.dwg_dynapi_entity_value(entity, "contrast").data;
-      const fade = libredwg.dwg_dynapi_entity_value(entity, "fade").data;
-      const clipMode = libredwg.dwg_dynapi_entity_value(entity, "clip_mode").data;
-      const clippingBoundaryType = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "clip_boundary_type"
-      ).data;
-      const countBoundaryPoints = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "num_clip_verts"
-      ).data;
-      const clip_verts = libredwg.dwg_dynapi_entity_value(entity, "clip_verts").data;
+      const version = libredwg.dwg_dynapi_entity_data(entity, "class_version");
+      const position = libredwg.dwg_dynapi_entity_data(entity, "pt0");
+      const uPixel = libredwg.dwg_dynapi_entity_data(entity, "uvec");
+      const vPixel = libredwg.dwg_dynapi_entity_data(entity, "vvec");
+      const imageSize = libredwg.dwg_dynapi_entity_data(entity, "image_size");
+      const flags = libredwg.dwg_dynapi_entity_data(entity, "display_props");
+      const clipping = libredwg.dwg_dynapi_entity_data(entity, "clipping");
+      const brightness = libredwg.dwg_dynapi_entity_data(entity, "brightness");
+      const contrast = libredwg.dwg_dynapi_entity_data(entity, "contrast");
+      const fade = libredwg.dwg_dynapi_entity_data(entity, "fade");
+      const clipMode = libredwg.dwg_dynapi_entity_data(entity, "clip_mode");
+      const clippingBoundaryType = libredwg.dwg_dynapi_entity_data(entity, "clip_boundary_type");
+      const countBoundaryPoints = libredwg.dwg_dynapi_entity_data(entity, "num_clip_verts");
+      const clip_verts = libredwg.dwg_dynapi_entity_data(entity, "clip_verts");
       const clippingBoundaryPath = libredwg.dwg_ptr_to_point2d_array(
         clip_verts,
         countBoundaryPoints
       );
-      const imagedef_ref = libredwg.dwg_dynapi_entity_value(entity, "imagedef").data;
-      const imageDefHandle = libredwg.dwg_ref_get_absref(imagedef_ref);
-      const imagedefreactor_ref = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "imagedefreactor"
-      ).data;
-      const imageDefReactorHandle = libredwg.dwg_ref_get_absref(imagedefreactor_ref);
+      const imagedef_ref = libredwg.dwg_dynapi_entity_data(entity, "imagedef");
+      const imageDefHandle = libredwg.dwg_ref_get_absref(imagedef_ref) ?? 0;
+      const imagedefreactor_ref = libredwg.dwg_dynapi_entity_data(entity, "imagedefreactor");
+      const imageDefReactorHandle = libredwg.dwg_ref_get_absref(imagedefreactor_ref) ?? 0;
       return {
         type: "WIPEOUT",
         ...commonAttrs,
@@ -2962,8 +3161,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertXline(entity, commonAttrs) {
       const libredwg = this.libredwg;
-      const firstPoint = libredwg.dwg_dynapi_entity_value(entity, "point").data;
-      const unitDirection = libredwg.dwg_dynapi_entity_value(entity, "vector").data;
+      const firstPoint = libredwg.dwg_dynapi_entity_data(entity, "point");
+      const unitDirection = libredwg.dwg_dynapi_entity_data(entity, "vector");
       return {
         type: "XLINE",
         ...commonAttrs,
@@ -2973,37 +3172,19 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     getDimensionCommonAttrs(entity) {
       const libredwg = this.libredwg;
-      const version = libredwg.dwg_dynapi_entity_value(entity, "class_version").data;
+      const version = libredwg.dwg_dynapi_entity_data(entity, "class_version");
       const name = libredwg.dwg_entity_get_block_name(entity, "block");
-      const definitionPoint = libredwg.dwg_dynapi_entity_value(entity, "def_pt").data;
-      const textPoint = libredwg.dwg_dynapi_entity_value(entity, "text_midpt").data;
-      const attachmentPoint = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "attachmentPoint"
-      ).data;
-      const dimensionType = libredwg.dwg_dynapi_entity_value(entity, "flag").data;
-      const textLineSpacingStyle = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "lspace_factor"
-      ).data;
-      const textLineSpacingFactor = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "lspace_factor"
-      ).data;
-      const measurement = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "act_measurement"
-      ).data;
-      const text = libredwg.dwg_dynapi_entity_value(entity, "user_text").data;
-      const textRotation = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "text_rotation"
-      ).data;
-      const ocsRotation = libredwg.dwg_dynapi_entity_value(entity, "ins_rotation").data;
-      const extrusionDirection = libredwg.dwg_dynapi_entity_value(
-        entity,
-        "extrusion"
-      ).data;
+      const definitionPoint = libredwg.dwg_dynapi_entity_data(entity, "def_pt");
+      const textPoint = libredwg.dwg_dynapi_entity_data(entity, "text_midpt");
+      const attachmentPoint = libredwg.dwg_dynapi_entity_data(entity, "attachmentPoint");
+      const dimensionType = libredwg.dwg_dynapi_entity_data(entity, "flag");
+      const textLineSpacingStyle = libredwg.dwg_dynapi_entity_data(entity, "lspace_factor");
+      const textLineSpacingFactor = libredwg.dwg_dynapi_entity_data(entity, "lspace_factor");
+      const measurement = libredwg.dwg_dynapi_entity_data(entity, "act_measurement");
+      const text = libredwg.dwg_dynapi_entity_data(entity, "user_text");
+      const textRotation = libredwg.dwg_dynapi_entity_data(entity, "text_rotation");
+      const ocsRotation = libredwg.dwg_dynapi_entity_data(entity, "ins_rotation");
+      const extrusionDirection = libredwg.dwg_dynapi_entity_data(entity, "extrusion");
       const styleName = libredwg.dwg_entity_get_dimstyle_name(entity);
       return {
         type: "DIMENSION",
@@ -3108,6 +3289,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
           DICTIONARY: [],
           IMAGEDEF: [],
           LAYOUT: [],
+          MLEADERSTYLE: [],
           SPATIAL_FILTER: []
         },
         header: {},
@@ -3188,6 +3370,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
               case Dwg_Object_Type.DWG_TYPE_LAYOUT:
                 db.objects.LAYOUT.push(this.convertLayout(tio, obj));
                 break;
+              case Dwg_Object_Type.DWG_TYPE_MLEADERSTYLE:
+                db.objects.MLEADERSTYLE.push(this.convertMLeaderStyle(tio, obj));
+                break;
               case Dwg_Object_Type.DWG_TYPE_SPATIAL_FILTER:
                 db.objects.SPATIAL_FILTER.push(
                   this.convertSpatialFilter(tio, obj)
@@ -3234,11 +3419,11 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         if (name == "DIMBLK" || name == "DIMBLK1" || name == "DIMBLK2") {
           var_name = var_name + "_T";
         }
-        let value = libredwg.dwg_dynapi_header_value(data, var_name).data;
+        let value = libredwg.dwg_dynapi_header_data(data, var_name);
         if (name == "CELTYPE" || name == "CLAYER" || name == "CLAYER" || name == "DIMSTYLE" || name == "DIMTXSTY" || name == "TEXTSTYLE") {
           value = value ? libredwg.dwg_ref_get_object_name(value) : "";
         } else if (name == "DRAGVS") {
-          value = value ? libredwg.dwg_ref_get_absref(value) : 2;
+          value = value ? libredwg.dwg_ref_get_absref(value) ?? 2 : 2;
         }
         header[name] = value;
       });
@@ -3263,8 +3448,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     convertAppId(item) {
       const libredwg = this.libredwg;
-      const name = libredwg.dwg_dynapi_entity_value(item, "name").data;
-      const flag = libredwg.dwg_dynapi_entity_value(item, "flag").data;
+      const name = libredwg.dwg_dynapi_entity_data(item, "name");
+      const flag = libredwg.dwg_dynapi_entity_data(item, "flag");
       return {
         name,
         standardFlag: flag
@@ -3277,18 +3462,15 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       if (block.name) {
         commonAttrs.name = block.name;
       }
-      const num_owned = libredwg.dwg_dynapi_entity_value(item, "num_owned").data;
-      const flags = libredwg.dwg_dynapi_entity_value(item, "flag").data;
-      const description = libredwg.dwg_dynapi_entity_value(item, "description").data;
-      const basePoint = libredwg.dwg_dynapi_entity_value(item, "base_pt").data;
-      const insertionUnits = libredwg.dwg_dynapi_entity_value(
-        item,
-        "insert_units"
-      ).data;
-      const explodability = libredwg.dwg_dynapi_entity_value(item, "explodable").data;
-      const scalability = libredwg.dwg_dynapi_entity_value(item, "block_scaling").data;
-      const layout_ptr = libredwg.dwg_dynapi_entity_value(item, "layout").data;
-      const layout = idToString(libredwg.dwg_ref_get_absref(layout_ptr));
+      const num_owned = libredwg.dwg_dynapi_entity_data(item, "num_owned");
+      const flags = libredwg.dwg_dynapi_entity_data(item, "flag");
+      const description = libredwg.dwg_dynapi_entity_data(item, "description");
+      const basePoint = libredwg.dwg_dynapi_entity_data(item, "base_pt");
+      const insertionUnits = libredwg.dwg_dynapi_entity_data(item, "insert_units");
+      const explodability = libredwg.dwg_dynapi_entity_data(item, "explodable");
+      const scalability = libredwg.dwg_dynapi_entity_data(item, "block_scaling");
+      const layout_ptr = libredwg.dwg_dynapi_entity_data(item, "layout");
+      const layout = libredwg.dwg_ref_get_id(layout_ptr) ?? "";
       let bmpPreview = "";
       const uint8ArrayToHexString2 = (bytes) => {
         const hexChars = new Array(bytes.length);
@@ -3304,7 +3486,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       let entities = this.convertEntities(obj, commonAttrs.handle);
       if (!entities || entities.length == 0) {
         entities = [];
-        const entities_ptr = libredwg.dwg_dynapi_entity_value(item, "entities").data;
+        const entities_ptr = libredwg.dwg_dynapi_entity_data(item, "entities");
         if (entities_ptr) {
           const object_ref_ptr_array = libredwg.dwg_ptr_to_object_ref_ptr_array(
             entities_ptr,
@@ -3354,91 +3536,88 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     convertDimStyle(item, obj) {
       const libredwg = this.libredwg;
       const commonAttrs = this.getCommonTableEntryAttrs(item, obj);
-      const DIMTOL = libredwg.dwg_dynapi_entity_value(item, "DIMTOL").data;
-      const DIMLIM = libredwg.dwg_dynapi_entity_value(item, "DIMLIM").data;
-      const DIMTIH = libredwg.dwg_dynapi_entity_value(item, "DIMTIH").data;
-      const DIMTOH = libredwg.dwg_dynapi_entity_value(item, "DIMTOH").data;
-      const DIMSE1 = libredwg.dwg_dynapi_entity_value(item, "DIMSE1").data;
-      const DIMSE2 = libredwg.dwg_dynapi_entity_value(item, "DIMSE2").data;
-      const DIMALT = libredwg.dwg_dynapi_entity_value(item, "DIMALT").data;
-      const DIMTOFL = libredwg.dwg_dynapi_entity_value(item, "DIMTOFL").data;
-      const DIMSAH = libredwg.dwg_dynapi_entity_value(item, "DIMSAH").data;
-      const DIMTIX = libredwg.dwg_dynapi_entity_value(item, "DIMTIX").data;
-      const DIMSOXD = libredwg.dwg_dynapi_entity_value(item, "DIMSOXD").data;
-      const DIMALTD = libredwg.dwg_dynapi_entity_value(item, "DIMALTD").data;
-      const DIMZIN = libredwg.dwg_dynapi_entity_value(item, "DIMZIN").data;
-      const DIMSD1 = libredwg.dwg_dynapi_entity_value(item, "DIMSD1").data;
-      const DIMSD2 = libredwg.dwg_dynapi_entity_value(item, "DIMSD2").data;
-      const DIMTOLJ = libredwg.dwg_dynapi_entity_value(item, "DIMTOLJ").data;
-      const DIMJUST = libredwg.dwg_dynapi_entity_value(item, "DIMJUST").data;
-      const DIMFIT = libredwg.dwg_dynapi_entity_value(item, "DIMFIT").data;
-      const DIMUPT = libredwg.dwg_dynapi_entity_value(item, "DIMUPT").data;
-      const DIMTZIN = libredwg.dwg_dynapi_entity_value(item, "DIMTZIN").data;
-      const DIMALTZ = libredwg.dwg_dynapi_entity_value(item, "DIMALTZ").data;
-      const DIMALTTZ = libredwg.dwg_dynapi_entity_value(item, "DIMALTTZ").data;
-      const DIMTAD = libredwg.dwg_dynapi_entity_value(item, "DIMTAD").data;
-      const DIMUNIT = libredwg.dwg_dynapi_entity_value(item, "DIMUNIT").data;
-      const DIMAUNIT = libredwg.dwg_dynapi_entity_value(item, "DIMAUNIT").data;
-      const DIMDEC = libredwg.dwg_dynapi_entity_value(item, "DIMDEC").data;
-      const DIMTDEC = libredwg.dwg_dynapi_entity_value(item, "DIMTDEC").data;
-      const DIMALTU = libredwg.dwg_dynapi_entity_value(item, "DIMALTU").data;
-      const DIMALTTD = libredwg.dwg_dynapi_entity_value(item, "DIMALTTD").data;
-      const DIMSCALE = libredwg.dwg_dynapi_entity_value(item, "DIMSCALE").data;
-      const DIMASZ = libredwg.dwg_dynapi_entity_value(item, "DIMASZ").data;
-      const DIMEXO = libredwg.dwg_dynapi_entity_value(item, "DIMEXO").data;
-      const DIMDLI = libredwg.dwg_dynapi_entity_value(item, "DIMDLI").data;
-      const DIMEXE = libredwg.dwg_dynapi_entity_value(item, "DIMEXE").data;
-      const DIMRND = libredwg.dwg_dynapi_entity_value(item, "DIMRND").data;
-      const DIMDLE = libredwg.dwg_dynapi_entity_value(item, "DIMDLE").data;
-      const DIMTP = libredwg.dwg_dynapi_entity_value(item, "DIMTP").data;
-      const DIMTM = libredwg.dwg_dynapi_entity_value(item, "DIMTM").data;
-      const DIMFXL = libredwg.dwg_dynapi_entity_value(item, "DIMFXL").data;
-      const DIMJOGANG = libredwg.dwg_dynapi_entity_value(item, "DIMJOGANG").data;
-      const DIMTFILL = libredwg.dwg_dynapi_entity_value(item, "DIMTFILL").data;
-      const DIMTFILLCLR = libredwg.dwg_dynapi_entity_value(item, "DIMTFILLCLR").data;
-      const DIMAZIN = libredwg.dwg_dynapi_entity_value(item, "DIMAZIN").data;
-      const DIMARCSYM = libredwg.dwg_dynapi_entity_value(item, "DIMARCSYM").data;
-      const DIMTXT = libredwg.dwg_dynapi_entity_value(item, "DIMTXT").data;
-      const DIMCEN = libredwg.dwg_dynapi_entity_value(item, "DIMCEN").data;
-      const DIMTSZ = libredwg.dwg_dynapi_entity_value(item, "DIMTSZ").data;
-      const DIMALTF = libredwg.dwg_dynapi_entity_value(item, "DIMALTF").data;
-      const DIMLFAC = libredwg.dwg_dynapi_entity_value(item, "DIMLFAC").data;
-      const DIMTVP = libredwg.dwg_dynapi_entity_value(item, "DIMTVP").data;
-      const DIMTFAC = libredwg.dwg_dynapi_entity_value(item, "DIMTFAC").data;
-      const DIMGAP = libredwg.dwg_dynapi_entity_value(item, "DIMGAP").data;
-      const DIMPOST = libredwg.dwg_dynapi_entity_value(item, "DIMPOST").data;
-      const DIMAPOST = libredwg.dwg_dynapi_entity_value(item, "DIMAPOST").data;
-      const DIMBLK_T = libredwg.dwg_dynapi_entity_value(item, "DIMBLK_T").data;
-      const DIMBLK1_T = libredwg.dwg_dynapi_entity_value(item, "DIMBLK1_T").data;
-      const DIMBLK2_T = libredwg.dwg_dynapi_entity_value(item, "DIMBLK2_T").data;
-      const DIMALTRND = libredwg.dwg_dynapi_entity_value(item, "DIMALTRND").data;
-      const DIMCLRD_N = libredwg.dwg_dynapi_entity_value(item, "DIMCLRD_N").data;
-      const DIMCLRE_N = libredwg.dwg_dynapi_entity_value(item, "DIMCLRE_N").data;
-      const DIMCLRT_N = libredwg.dwg_dynapi_entity_value(item, "DIMCLRT_N").data;
-      const DIMCLRD = libredwg.dwg_dynapi_entity_value(item, "DIMCLRD").data;
-      const DIMCLRE = libredwg.dwg_dynapi_entity_value(item, "DIMCLRE").data;
-      const DIMCLRT = libredwg.dwg_dynapi_entity_value(item, "DIMCLRT").data;
-      const DIMADEC = libredwg.dwg_dynapi_entity_value(item, "DIMADEC").data;
-      const DIMFRAC = libredwg.dwg_dynapi_entity_value(item, "DIMFRAC").data;
-      const DIMLUNIT = libredwg.dwg_dynapi_entity_value(item, "DIMLUNIT").data;
-      const DIMDSEP = libredwg.dwg_dynapi_entity_value(item, "DIMDSEP").data;
-      const DIMTMOVE = libredwg.dwg_dynapi_entity_value(item, "DIMTMOVE").data;
-      const DIMATFIT = libredwg.dwg_dynapi_entity_value(item, "DIMATFIT").data;
-      const DIMFXLON = libredwg.dwg_dynapi_entity_value(item, "DIMFXLON").data;
-      const DIMTXTDIRECTION = libredwg.dwg_dynapi_entity_value(
-        item,
-        "DIMTXTDIRECTION"
-      ).data;
-      const DIMALTMZF = libredwg.dwg_dynapi_entity_value(item, "DIMALTMZF").data;
-      const DIMALTMZS = libredwg.dwg_dynapi_entity_value(item, "DIMALTMZS").data;
-      const DIMMZF = libredwg.dwg_dynapi_entity_value(item, "DIMMZF").data;
-      const DIMMZS = libredwg.dwg_dynapi_entity_value(item, "DIMMZS").data;
-      const DIMLWD = libredwg.dwg_dynapi_entity_value(item, "DIMLWD").data;
-      const DIMLWE = libredwg.dwg_dynapi_entity_value(item, "DIMLWE").data;
-      const DIMTXSTY_Ptr = libredwg.dwg_dynapi_entity_value(item, "DIMTXSTY").data;
-      const DIMTXSTY = libredwg.dwg_ref_get_absref(DIMTXSTY_Ptr);
-      const DIMLDRBLK_Ptr = libredwg.dwg_dynapi_entity_value(item, "DIMLDRBLK").data;
-      const DIMLDRBLK = libredwg.dwg_ref_get_absref(DIMLDRBLK_Ptr);
+      const DIMTOL = libredwg.dwg_dynapi_entity_data(item, "DIMTOL");
+      const DIMLIM = libredwg.dwg_dynapi_entity_data(item, "DIMLIM");
+      const DIMTIH = libredwg.dwg_dynapi_entity_data(item, "DIMTIH");
+      const DIMTOH = libredwg.dwg_dynapi_entity_data(item, "DIMTOH");
+      const DIMSE1 = libredwg.dwg_dynapi_entity_data(item, "DIMSE1");
+      const DIMSE2 = libredwg.dwg_dynapi_entity_data(item, "DIMSE2");
+      const DIMALT = libredwg.dwg_dynapi_entity_data(item, "DIMALT");
+      const DIMTOFL = libredwg.dwg_dynapi_entity_data(item, "DIMTOFL");
+      const DIMSAH = libredwg.dwg_dynapi_entity_data(item, "DIMSAH");
+      const DIMTIX = libredwg.dwg_dynapi_entity_data(item, "DIMTIX");
+      const DIMSOXD = libredwg.dwg_dynapi_entity_data(item, "DIMSOXD");
+      const DIMALTD = libredwg.dwg_dynapi_entity_data(item, "DIMALTD");
+      const DIMZIN = libredwg.dwg_dynapi_entity_data(item, "DIMZIN");
+      const DIMSD1 = libredwg.dwg_dynapi_entity_data(item, "DIMSD1");
+      const DIMSD2 = libredwg.dwg_dynapi_entity_data(item, "DIMSD2");
+      const DIMTOLJ = libredwg.dwg_dynapi_entity_data(item, "DIMTOLJ");
+      const DIMJUST = libredwg.dwg_dynapi_entity_data(item, "DIMJUST");
+      const DIMFIT = libredwg.dwg_dynapi_entity_data(item, "DIMFIT");
+      const DIMUPT = libredwg.dwg_dynapi_entity_data(item, "DIMUPT");
+      const DIMTZIN = libredwg.dwg_dynapi_entity_data(item, "DIMTZIN");
+      const DIMALTZ = libredwg.dwg_dynapi_entity_data(item, "DIMALTZ");
+      const DIMALTTZ = libredwg.dwg_dynapi_entity_data(item, "DIMALTTZ");
+      const DIMTAD = libredwg.dwg_dynapi_entity_data(item, "DIMTAD");
+      const DIMUNIT = libredwg.dwg_dynapi_entity_data(item, "DIMUNIT");
+      const DIMAUNIT = libredwg.dwg_dynapi_entity_data(item, "DIMAUNIT");
+      const DIMDEC = libredwg.dwg_dynapi_entity_data(item, "DIMDEC");
+      const DIMTDEC = libredwg.dwg_dynapi_entity_data(item, "DIMTDEC");
+      const DIMALTU = libredwg.dwg_dynapi_entity_data(item, "DIMALTU");
+      const DIMALTTD = libredwg.dwg_dynapi_entity_data(item, "DIMALTTD");
+      const DIMSCALE = libredwg.dwg_dynapi_entity_data(item, "DIMSCALE");
+      const DIMASZ = libredwg.dwg_dynapi_entity_data(item, "DIMASZ");
+      const DIMEXO = libredwg.dwg_dynapi_entity_data(item, "DIMEXO");
+      const DIMDLI = libredwg.dwg_dynapi_entity_data(item, "DIMDLI");
+      const DIMEXE = libredwg.dwg_dynapi_entity_data(item, "DIMEXE");
+      const DIMRND = libredwg.dwg_dynapi_entity_data(item, "DIMRND");
+      const DIMDLE = libredwg.dwg_dynapi_entity_data(item, "DIMDLE");
+      const DIMTP = libredwg.dwg_dynapi_entity_data(item, "DIMTP");
+      const DIMTM = libredwg.dwg_dynapi_entity_data(item, "DIMTM");
+      const DIMFXL = libredwg.dwg_dynapi_entity_data(item, "DIMFXL");
+      const DIMJOGANG = libredwg.dwg_dynapi_entity_data(item, "DIMJOGANG");
+      const DIMTFILL = libredwg.dwg_dynapi_entity_data(item, "DIMTFILL");
+      const DIMTFILLCLR = libredwg.dwg_dynapi_entity_data(item, "DIMTFILLCLR");
+      const DIMAZIN = libredwg.dwg_dynapi_entity_data(item, "DIMAZIN");
+      const DIMARCSYM = libredwg.dwg_dynapi_entity_data(item, "DIMARCSYM");
+      const DIMTXT = libredwg.dwg_dynapi_entity_data(item, "DIMTXT");
+      const DIMCEN = libredwg.dwg_dynapi_entity_data(item, "DIMCEN");
+      const DIMTSZ = libredwg.dwg_dynapi_entity_data(item, "DIMTSZ");
+      const DIMALTF = libredwg.dwg_dynapi_entity_data(item, "DIMALTF");
+      const DIMLFAC = libredwg.dwg_dynapi_entity_data(item, "DIMLFAC");
+      const DIMTVP = libredwg.dwg_dynapi_entity_data(item, "DIMTVP");
+      const DIMTFAC = libredwg.dwg_dynapi_entity_data(item, "DIMTFAC");
+      const DIMGAP = libredwg.dwg_dynapi_entity_data(item, "DIMGAP");
+      const DIMPOST = libredwg.dwg_dynapi_entity_data(item, "DIMPOST");
+      const DIMAPOST = libredwg.dwg_dynapi_entity_data(item, "DIMAPOST");
+      const DIMBLK_T = libredwg.dwg_dynapi_entity_data(item, "DIMBLK_T");
+      const DIMBLK1_T = libredwg.dwg_dynapi_entity_data(item, "DIMBLK1_T");
+      const DIMBLK2_T = libredwg.dwg_dynapi_entity_data(item, "DIMBLK2_T");
+      const DIMALTRND = libredwg.dwg_dynapi_entity_data(item, "DIMALTRND");
+      const DIMCLRD_N = libredwg.dwg_dynapi_entity_data(item, "DIMCLRD_N");
+      const DIMCLRE_N = libredwg.dwg_dynapi_entity_data(item, "DIMCLRE_N");
+      const DIMCLRT_N = libredwg.dwg_dynapi_entity_data(item, "DIMCLRT_N");
+      const DIMCLRD = libredwg.dwg_dynapi_entity_data(item, "DIMCLRD");
+      const DIMCLRE = libredwg.dwg_dynapi_entity_data(item, "DIMCLRE");
+      const DIMCLRT = libredwg.dwg_dynapi_entity_data(item, "DIMCLRT");
+      const DIMADEC = libredwg.dwg_dynapi_entity_data(item, "DIMADEC");
+      const DIMFRAC = libredwg.dwg_dynapi_entity_data(item, "DIMFRAC");
+      const DIMLUNIT = libredwg.dwg_dynapi_entity_data(item, "DIMLUNIT");
+      const DIMDSEP = libredwg.dwg_dynapi_entity_data(item, "DIMDSEP");
+      const DIMTMOVE = libredwg.dwg_dynapi_entity_data(item, "DIMTMOVE");
+      const DIMATFIT = libredwg.dwg_dynapi_entity_data(item, "DIMATFIT");
+      const DIMFXLON = libredwg.dwg_dynapi_entity_data(item, "DIMFXLON");
+      const DIMTXTDIRECTION = libredwg.dwg_dynapi_entity_data(item, "DIMTXTDIRECTION");
+      const DIMALTMZF = libredwg.dwg_dynapi_entity_data(item, "DIMALTMZF");
+      const DIMALTMZS = libredwg.dwg_dynapi_entity_data(item, "DIMALTMZS");
+      const DIMMZF = libredwg.dwg_dynapi_entity_data(item, "DIMMZF");
+      const DIMMZS = libredwg.dwg_dynapi_entity_data(item, "DIMMZS");
+      const DIMLWD = libredwg.dwg_dynapi_entity_data(item, "DIMLWD");
+      const DIMLWE = libredwg.dwg_dynapi_entity_data(item, "DIMLWE");
+      const DIMTXSTY_Ptr = libredwg.dwg_dynapi_entity_data(item, "DIMTXSTY");
+      const DIMTXSTY = libredwg.dwg_ref_get_absref(DIMTXSTY_Ptr) ?? void 0;
+      const DIMLDRBLK_Ptr = libredwg.dwg_dynapi_entity_data(item, "DIMLDRBLK");
+      const DIMLDRBLK = libredwg.dwg_ref_get_absref(DIMLDRBLK_Ptr) ?? void 0;
       return {
         ...commonAttrs,
         DIMPOST,
@@ -3526,15 +3705,15 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     convertLayer(item, obj) {
       const libredwg = this.libredwg;
       const commonAttrs = this.getCommonTableEntryAttrs(item, obj);
-      const flag = libredwg.dwg_dynapi_entity_value(item, "flag").data;
-      const frozen = libredwg.dwg_dynapi_entity_value(item, "frozen").data;
-      const off = libredwg.dwg_dynapi_entity_value(item, "off").data;
-      const frozenInNew = libredwg.dwg_dynapi_entity_value(item, "frozen_in_new").data;
-      const locked = libredwg.dwg_dynapi_entity_value(item, "plotflockedlag").data;
-      const plotFlag = libredwg.dwg_dynapi_entity_value(item, "plotflag").data;
-      const linewt = libredwg.dwg_dynapi_entity_value(item, "linewt").data;
-      const color = libredwg.dwg_dynapi_entity_value(item, "color").data;
-      const ltypeRef = libredwg.dwg_dynapi_entity_value(item, "ltype").data;
+      const flag = libredwg.dwg_dynapi_entity_data(item, "flag");
+      const frozen = libredwg.dwg_dynapi_entity_data(item, "frozen");
+      const off = libredwg.dwg_dynapi_entity_data(item, "off");
+      const frozenInNew = libredwg.dwg_dynapi_entity_data(item, "frozen_in_new");
+      const locked = libredwg.dwg_dynapi_entity_data(item, "plotflockedlag");
+      const plotFlag = libredwg.dwg_dynapi_entity_data(item, "plotflag");
+      const linewt = libredwg.dwg_dynapi_entity_data(item, "linewt");
+      const color = libredwg.dwg_dynapi_entity_data(item, "color");
+      const ltypeRef = libredwg.dwg_dynapi_entity_data(item, "ltype");
       let ltypeName = "Continuous";
       if (ltypeRef) {
         try {
@@ -3573,11 +3752,11 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     convertLineType(item, obj) {
       const libredwg = this.libredwg;
       const commonAttrs = this.getCommonTableEntryAttrs(item, obj);
-      const flag = libredwg.dwg_dynapi_entity_value(item, "flag").data;
-      const description = libredwg.dwg_dynapi_entity_value(item, "description").data;
-      const numDashes = libredwg.dwg_dynapi_entity_value(item, "numdashes").data;
-      const patternLen = libredwg.dwg_dynapi_entity_value(item, "pattern_len").data;
-      const dashes = libredwg.dwg_dynapi_entity_value(item, "dashes").data;
+      const flag = libredwg.dwg_dynapi_entity_data(item, "flag");
+      const description = libredwg.dwg_dynapi_entity_data(item, "description");
+      const numDashes = libredwg.dwg_dynapi_entity_data(item, "numdashes");
+      const patternLen = libredwg.dwg_dynapi_entity_data(item, "pattern_len");
+      const dashes = libredwg.dwg_dynapi_entity_data(item, "dashes");
       const dashArray = dashes ? libredwg.dwg_ptr_to_ltype_dash_array(dashes, numDashes) : [];
       return {
         ...commonAttrs,
@@ -3609,16 +3788,13 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     convertStyle(item, obj) {
       const libredwg = this.libredwg;
       const commonAttrs = this.getCommonTableEntryAttrs(item, obj);
-      const standardFlag = libredwg.dwg_dynapi_entity_value(item, "flag").data;
-      const widthFactor = libredwg.dwg_dynapi_entity_value(item, "width_factor").data;
-      const obliqueAngle = libredwg.dwg_dynapi_entity_value(item, "oblique_angle").data;
-      const textGenerationFlag = libredwg.dwg_dynapi_entity_value(
-        item,
-        "generation"
-      ).data;
-      const lastHeight = libredwg.dwg_dynapi_entity_value(item, "last_height").data;
-      const font = libredwg.dwg_dynapi_entity_value(item, "font_file").data;
-      const bigFont = libredwg.dwg_dynapi_entity_value(item, "bigfont_file").data;
+      const standardFlag = libredwg.dwg_dynapi_entity_data(item, "flag");
+      const widthFactor = libredwg.dwg_dynapi_entity_data(item, "width_factor");
+      const obliqueAngle = libredwg.dwg_dynapi_entity_data(item, "oblique_angle");
+      const textGenerationFlag = libredwg.dwg_dynapi_entity_data(item, "generation");
+      const lastHeight = libredwg.dwg_dynapi_entity_data(item, "last_height");
+      const font = libredwg.dwg_dynapi_entity_data(item, "font_file");
+      const bigFont = libredwg.dwg_dynapi_entity_data(item, "bigfont_file");
       return {
         ...commonAttrs,
         standardFlag,
@@ -3635,58 +3811,40 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     convertViewport(item, obj) {
       const libredwg = this.libredwg;
       const commonAttrs = this.getCommonTableEntryAttrs(item, obj);
-      const standardFlag = libredwg.dwg_dynapi_entity_value(item, "flag").data;
-      const viewHeight = libredwg.dwg_dynapi_entity_value(item, "VIEWSIZE").data;
-      const aspectRatio = libredwg.dwg_dynapi_entity_value(item, "aspect_ratio").data;
-      const center = libredwg.dwg_dynapi_entity_value(item, "VIEWCTR").data;
-      const viewTarget = libredwg.dwg_dynapi_entity_value(item, "view_target").data;
-      const viewDirectionFromTarget = libredwg.dwg_dynapi_entity_value(
-        item,
-        "VIEWDIR"
-      ).data;
-      const viewTwistAngle = libredwg.dwg_dynapi_entity_value(item, "view_twist").data;
-      const lensLength = libredwg.dwg_dynapi_entity_value(item, "lens_length").data;
-      const frontClippingPlane = libredwg.dwg_dynapi_entity_value(
-        item,
-        "front_clip_z"
-      ).data;
-      const backClippingPlane = libredwg.dwg_dynapi_entity_value(
-        item,
-        "back_clip_z"
-      ).data;
-      const viewMode = libredwg.dwg_dynapi_entity_value(item, "VIEWMODE").data;
-      const renderMode = libredwg.dwg_dynapi_entity_value(item, "render_mode").data;
-      const isDefaultLightingOn = libredwg.dwg_dynapi_entity_value(item, "use_default_lights").data != 0;
-      const defaultLightningType = libredwg.dwg_dynapi_entity_value(
-        item,
-        "default_lightning_type"
-      ).data;
-      const brightness = libredwg.dwg_dynapi_entity_value(item, "brightness").data;
-      const contrast = libredwg.dwg_dynapi_entity_value(item, "contrast").data;
-      const ambient_color = libredwg.dwg_dynapi_entity_value(
-        item,
-        "ambient_color"
-      ).data;
-      const lowerLeftCorner = libredwg.dwg_dynapi_entity_value(item, "lower_left").data;
-      const upperRightCorner = libredwg.dwg_dynapi_entity_value(
-        item,
-        "upper_right"
-      ).data;
-      const circleSides = libredwg.dwg_dynapi_entity_value(item, "circle_zoom").data;
-      const ucsIconSetting = libredwg.dwg_dynapi_entity_value(item, "UCSICON").data;
-      const gridSpacing = libredwg.dwg_dynapi_entity_value(item, "GRIDUNIT").data;
-      const snapRotationAngle = libredwg.dwg_dynapi_entity_value(item, "SNAPANG").data;
-      const snapBasePoint = libredwg.dwg_dynapi_entity_value(item, "SNAPBASE").data;
-      const snapSpacing = libredwg.dwg_dynapi_entity_value(item, "SNAPUNIT").data;
-      const ucsOrigin = libredwg.dwg_dynapi_entity_value(item, "ucsorg").data;
-      const ucsXAxis = libredwg.dwg_dynapi_entity_value(item, "ucsxdir").data;
-      const ucsYAxis = libredwg.dwg_dynapi_entity_value(item, "ucsydir").data;
-      const elevation = libredwg.dwg_dynapi_entity_value(item, "ucs_elevation").data;
-      const majorGridLines = libredwg.dwg_dynapi_entity_value(item, "grid_major").data;
-      const background = libredwg.dwg_dynapi_entity_value(item, "background").data;
-      const backgroundObjectId = background ? idToString(libredwg.dwg_ref_get_absref(background)) : void 0;
-      const visualstyle = libredwg.dwg_dynapi_entity_value(item, "visualstyle").data;
-      const visualStyleObjectId = visualstyle ? idToString(libredwg.dwg_ref_get_absref(visualstyle)) : void 0;
+      const standardFlag = libredwg.dwg_dynapi_entity_data(item, "flag");
+      const viewHeight = libredwg.dwg_dynapi_entity_data(item, "VIEWSIZE");
+      const aspectRatio = libredwg.dwg_dynapi_entity_data(item, "aspect_ratio");
+      const center = libredwg.dwg_dynapi_entity_data(item, "VIEWCTR");
+      const viewTarget = libredwg.dwg_dynapi_entity_data(item, "view_target");
+      const viewDirectionFromTarget = libredwg.dwg_dynapi_entity_data(item, "VIEWDIR");
+      const viewTwistAngle = libredwg.dwg_dynapi_entity_data(item, "view_twist");
+      const lensLength = libredwg.dwg_dynapi_entity_data(item, "lens_length");
+      const frontClippingPlane = libredwg.dwg_dynapi_entity_data(item, "front_clip_z");
+      const backClippingPlane = libredwg.dwg_dynapi_entity_data(item, "back_clip_z");
+      const viewMode = libredwg.dwg_dynapi_entity_data(item, "VIEWMODE");
+      const renderMode = libredwg.dwg_dynapi_entity_data(item, "render_mode");
+      const isDefaultLightingOn = libredwg.dwg_dynapi_entity_data(item, "use_default_lights") != 0;
+      const defaultLightningType = libredwg.dwg_dynapi_entity_data(item, "default_lightning_type");
+      const brightness = libredwg.dwg_dynapi_entity_data(item, "brightness");
+      const contrast = libredwg.dwg_dynapi_entity_data(item, "contrast");
+      const ambient_color = libredwg.dwg_dynapi_entity_data(item, "ambient_color");
+      const lowerLeftCorner = libredwg.dwg_dynapi_entity_data(item, "lower_left");
+      const upperRightCorner = libredwg.dwg_dynapi_entity_data(item, "upper_right");
+      const circleSides = libredwg.dwg_dynapi_entity_data(item, "circle_zoom");
+      const ucsIconSetting = libredwg.dwg_dynapi_entity_data(item, "UCSICON");
+      const gridSpacing = libredwg.dwg_dynapi_entity_data(item, "GRIDUNIT");
+      const snapRotationAngle = libredwg.dwg_dynapi_entity_data(item, "SNAPANG");
+      const snapBasePoint = libredwg.dwg_dynapi_entity_data(item, "SNAPBASE");
+      const snapSpacing = libredwg.dwg_dynapi_entity_data(item, "SNAPUNIT");
+      const ucsOrigin = libredwg.dwg_dynapi_entity_data(item, "ucsorg");
+      const ucsXAxis = libredwg.dwg_dynapi_entity_data(item, "ucsxdir");
+      const ucsYAxis = libredwg.dwg_dynapi_entity_data(item, "ucsydir");
+      const elevation = libredwg.dwg_dynapi_entity_data(item, "ucs_elevation");
+      const majorGridLines = libredwg.dwg_dynapi_entity_data(item, "grid_major");
+      const background = libredwg.dwg_dynapi_entity_data(item, "background");
+      const backgroundObjectId = background ? libredwg.dwg_ref_get_id(background) ?? "" : void 0;
+      const visualstyle = libredwg.dwg_dynapi_entity_data(item, "visualstyle");
+      const visualStyleObjectId = visualstyle ? libredwg.dwg_ref_get_id(visualstyle) ?? "" : void 0;
       return {
         ...commonAttrs,
         standardFlag,
@@ -3741,19 +3899,16 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       return {
         handle: idToString(handle.value),
         ownerHandle: idToString(ownerhandle.absolute_ref),
-        name: libredwg.dwg_dynapi_entity_value(tio, "name").data
+        name: libredwg.dwg_dynapi_entity_data(tio, "name")
       };
     }
     convertDictionary(item, obj) {
       const libredwg = this.libredwg;
       const commonAttrs = this.getCommonObjectAttrs(obj);
-      const isHardOwner = libredwg.dwg_dynapi_entity_value(item, "is_hardowner").data;
-      const cloningFlag = libredwg.dwg_dynapi_entity_value(item, "cloning").data;
-      const numitems = libredwg.dwg_dynapi_entity_value(item, "numitems").data;
-      const itemhandles_ptr = libredwg.dwg_dynapi_entity_value(
-        item,
-        "itemhandles"
-      ).data;
+      const isHardOwner = libredwg.dwg_dynapi_entity_data(item, "is_hardowner");
+      const cloningFlag = libredwg.dwg_dynapi_entity_data(item, "cloning");
+      const numitems = libredwg.dwg_dynapi_entity_data(item, "numitems");
+      const itemhandles_ptr = libredwg.dwg_dynapi_entity_data(item, "itemhandles");
       const itemhandles = libredwg.dwg_ptr_to_object_ref_array(
         itemhandles_ptr,
         numitems
@@ -3773,11 +3928,11 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     convertImageDef(item, obj) {
       const libredwg = this.libredwg;
       const commonAttrs = this.getCommonObjectAttrs(obj);
-      const size = libredwg.dwg_dynapi_entity_value(item, "image_size").data;
-      const fileName = libredwg.dwg_dynapi_entity_value(item, "file_path").data;
-      const isLoaded = libredwg.dwg_dynapi_entity_value(item, "is_loaded").data;
-      const sizeOfOnePixel = libredwg.dwg_dynapi_entity_value(item, "pixel_size").data;
-      const resolutionUnits = libredwg.dwg_dynapi_entity_value(item, "resunits").data;
+      const size = libredwg.dwg_dynapi_entity_data(item, "image_size");
+      const fileName = libredwg.dwg_dynapi_entity_data(item, "file_path");
+      const isLoaded = libredwg.dwg_dynapi_entity_data(item, "is_loaded");
+      const sizeOfOnePixel = libredwg.dwg_dynapi_entity_data(item, "pixel_size");
+      const resolutionUnits = libredwg.dwg_dynapi_entity_data(item, "resunits");
       return {
         ...commonAttrs,
         fileName,
@@ -3790,38 +3945,25 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     convertLayout(item, obj) {
       const libredwg = this.libredwg;
       const commonAttrs = this.getCommonObjectAttrs(obj);
-      const layoutName = libredwg.dwg_dynapi_entity_value(item, "layout_name").data;
-      const tabOrder = libredwg.dwg_dynapi_entity_value(item, "tab_order").data;
-      const controlFlag = libredwg.dwg_dynapi_entity_value(item, "layout_flags").data;
-      const insertionPoint = libredwg.dwg_dynapi_entity_value(item, "INSBASE").data;
-      const minLimit = libredwg.dwg_dynapi_entity_value(item, "LIMMIN").data;
-      const maxLimit = libredwg.dwg_dynapi_entity_value(item, "LIMMAX").data;
-      const ucsOrigin = libredwg.dwg_dynapi_entity_value(item, "UCSORG").data;
-      const ucsXAxis = libredwg.dwg_dynapi_entity_value(item, "UCSXDIR").data;
-      const ucsYAxis = libredwg.dwg_dynapi_entity_value(item, "UCSYDIR").data;
-      const orthographicType = libredwg.dwg_dynapi_entity_value(
-        item,
-        "UCSORTHOVIEW"
-      ).data;
-      const minExtent = libredwg.dwg_dynapi_entity_value(item, "EXTMIN").data;
-      const maxExtent = libredwg.dwg_dynapi_entity_value(item, "EXTMAX").data;
-      const elevation = libredwg.dwg_dynapi_entity_value(item, "ucs_elevation").data;
-      const block_header_ref = libredwg.dwg_dynapi_entity_value(
-        item,
-        "block_header"
-      ).data;
-      const paperSpaceTableId = idToString(
-        libredwg.dwg_ref_get_absref(block_header_ref)
-      );
-      const active_viewport_ref = libredwg.dwg_dynapi_entity_value(
-        item,
-        "active_viewport"
-      ).data;
-      const viewportId = idToString(
-        libredwg.dwg_ref_get_absref(active_viewport_ref)
-      );
-      const named_ucs_ref = libredwg.dwg_dynapi_entity_value(item, "named_ucs").data;
-      const namedUcsId = named_ucs_ref ? idToString(libredwg.dwg_ref_get_absref(named_ucs_ref)) : void 0;
+      const layoutName = libredwg.dwg_dynapi_entity_data(item, "layout_name");
+      const tabOrder = libredwg.dwg_dynapi_entity_data(item, "tab_order");
+      const controlFlag = libredwg.dwg_dynapi_entity_data(item, "layout_flags");
+      const insertionPoint = libredwg.dwg_dynapi_entity_data(item, "INSBASE");
+      const minLimit = libredwg.dwg_dynapi_entity_data(item, "LIMMIN");
+      const maxLimit = libredwg.dwg_dynapi_entity_data(item, "LIMMAX");
+      const ucsOrigin = libredwg.dwg_dynapi_entity_data(item, "UCSORG");
+      const ucsXAxis = libredwg.dwg_dynapi_entity_data(item, "UCSXDIR");
+      const ucsYAxis = libredwg.dwg_dynapi_entity_data(item, "UCSYDIR");
+      const orthographicType = libredwg.dwg_dynapi_entity_data(item, "UCSORTHOVIEW");
+      const minExtent = libredwg.dwg_dynapi_entity_data(item, "EXTMIN");
+      const maxExtent = libredwg.dwg_dynapi_entity_data(item, "EXTMAX");
+      const elevation = libredwg.dwg_dynapi_entity_data(item, "ucs_elevation");
+      const block_header_ref = libredwg.dwg_dynapi_entity_data(item, "block_header");
+      const paperSpaceTableId = libredwg.dwg_ref_get_id(block_header_ref) ?? "";
+      const active_viewport_ref = libredwg.dwg_dynapi_entity_data(item, "active_viewport");
+      const viewportId = libredwg.dwg_ref_get_id(active_viewport_ref) ?? "";
+      const named_ucs_ref = libredwg.dwg_dynapi_entity_data(item, "named_ucs");
+      const namedUcsId = named_ucs_ref ? libredwg.dwg_ref_get_id(named_ucs_ref) ?? "" : void 0;
       return {
         ...commonAttrs,
         layoutName,
@@ -3845,49 +3987,81 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         // TODO: Set the correct value
       };
     }
+    convertMLeaderStyle(item, obj) {
+      const libredwg = this.libredwg;
+      const commonAttrs = this.getCommonObjectAttrs(obj);
+      const objectVal = (field) => libredwg.dwg_dynapi_entity_data(item, field);
+      const refToId = (ref) => libredwg.dwg_ref_get_id(ref);
+      const asBool = (value) => value > 0;
+      const mleaderColor = (color) => color != null ? dwgColorToMLeaderRawColor(color) : void 0;
+      return {
+        ...commonAttrs,
+        subclassMarker: "AcDbMLeaderStyle",
+        unknown1: objectVal("class_version"),
+        contentType: objectVal("content_type"),
+        drawMLeaderOrderType: objectVal("mleader_order"),
+        drawLeaderOrderType: objectVal("leader_order"),
+        maxLeaderSegmentPoints: objectVal("max_points"),
+        firstSegmentAngleConstraint: objectVal("first_seg_angle"),
+        secondSegmentAngleConstraint: objectVal("second_seg_angle"),
+        leaderLineType: objectVal("type"),
+        leaderLineColor: mleaderColor(objectVal("line_color")),
+        leaderLineTypeId: refToId(objectVal("line_type")),
+        leaderLineWeight: objectVal("linewt"),
+        landingEnabled: asBool(objectVal("has_landing")),
+        landingGap: objectVal("landing_gap"),
+        doglegEnabled: asBool(objectVal("has_dogleg")),
+        doglegLength: objectVal("landing_dist"),
+        description: objectVal("description"),
+        arrowheadId: refToId(objectVal("arrow_head")),
+        arrowheadSize: objectVal("arrow_head_size"),
+        defaultMTextContents: objectVal("text_default"),
+        textStyleId: refToId(objectVal("text_style")),
+        textLeftAttachmentType: objectVal("attach_left"),
+        textAngleType: objectVal("text_angle_type"),
+        textAlignmentType: objectVal("text_align_type"),
+        textRightAttachmentType: objectVal("attach_right"),
+        textColor: mleaderColor(objectVal("text_color")),
+        textHeight: objectVal("text_height"),
+        textFrameEnabled: asBool(objectVal("has_text_frame")),
+        textAlignAlwaysLeft: asBool(objectVal("text_always_left")),
+        alignSpace: objectVal("align_space"),
+        blockContentId: refToId(objectVal("block")),
+        blockContentColor: mleaderColor(objectVal("block_color")),
+        blockContentScale: objectVal("block_scale"),
+        blockContentScaleEnabled: asBool(objectVal("use_block_scale")),
+        blockContentRotation: objectVal("block_rotation"),
+        blockContentRotationEnabled: asBool(objectVal("use_block_rotation")),
+        blockContentConnectionType: objectVal("block_connection"),
+        scale: objectVal("scale"),
+        overwritePropertyValue: asBool(objectVal("is_changed")),
+        annotative: asBool(objectVal("is_annotative")),
+        breakGapSize: objectVal("break_size"),
+        textAttachmentDirection: objectVal("attach_dir"),
+        bottomTextAttachmentDirection: objectVal("attach_bottom"),
+        topTextAttachmentDirection: objectVal("attach_top"),
+        unknown2: asBool(objectVal("text_extended"))
+      };
+    }
     convertSpatialFilter(item, obj) {
       const libredwg = this.libredwg;
       const commonAttrs = this.getCommonObjectAttrs(obj);
-      const origin = libredwg.dwg_dynapi_entity_value(item, "origin").data;
-      const numberOfPointsOnClipBoundary = libredwg.dwg_dynapi_entity_value(
-        item,
-        "num_clip_verts"
-      ).data;
-      const clip_verts_ptr = libredwg.dwg_dynapi_entity_value(item, "clip_verts").data;
+      const origin = libredwg.dwg_dynapi_entity_data(item, "origin");
+      const numberOfPointsOnClipBoundary = libredwg.dwg_dynapi_entity_data(item, "num_clip_verts");
+      const clip_verts_ptr = libredwg.dwg_dynapi_entity_data(item, "clip_verts");
       const vertices = libredwg.dwg_ptr_to_point2d_array(
         clip_verts_ptr,
         numberOfPointsOnClipBoundary
       );
-      const extrusionDirection = libredwg.dwg_dynapi_entity_value(
-        item,
-        "extrusion"
-      ).data;
-      const clipBoundaryVisible = libredwg.dwg_dynapi_entity_value(
-        item,
-        "display_boundary_on"
-      ).data;
-      const frontClippingPlaneFlag = libredwg.dwg_dynapi_entity_value(
-        item,
-        "front_clip_on"
-      ).data;
-      const frontClippingPlaneDistance = libredwg.dwg_dynapi_entity_value(
-        item,
-        "front_clip_z"
-      ).data;
-      const backClippingPlaneFlag = libredwg.dwg_dynapi_entity_value(
-        item,
-        "back_clip_on"
-      ).data;
-      const backClippingPlaneDistance = libredwg.dwg_dynapi_entity_value(
-        item,
-        "back_clip_z"
-      ).data;
-      const transform_ptr = libredwg.dwg_dynapi_entity_value(item, "transform").data;
+      const extrusionDirection = libredwg.dwg_dynapi_entity_data(item, "extrusion");
+      const clipBoundaryVisible = libredwg.dwg_dynapi_entity_data(item, "display_boundary_on");
+      const frontClippingPlaneFlag = libredwg.dwg_dynapi_entity_data(item, "front_clip_on");
+      const frontClippingPlaneDistance = libredwg.dwg_dynapi_entity_data(item, "front_clip_z");
+      const backClippingPlaneFlag = libredwg.dwg_dynapi_entity_data(item, "back_clip_on");
+      const backClippingPlaneDistance = libredwg.dwg_dynapi_entity_data(item, "back_clip_z");
+      const transform_ptr = libredwg.dwg_dynapi_entity_data(item, "transform");
       const matrix = libredwg.dwg_ptr_to_double_array(transform_ptr, 12);
-      const inverse_transform_ptr = libredwg.dwg_dynapi_entity_value(
-        item,
-        "inverse_transform"
-      ).data;
+      const inverse_transform_ptr = libredwg.dwg_dynapi_entity_data(item, "inverse_transform");
       const invertBlockMatrix = libredwg.dwg_ptr_to_double_array(
         inverse_transform_ptr,
         12
@@ -5547,6 +5721,54 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     dwg_resolve_handleref(ref_ptr, obj_ptr) {
       return this.wasmInstance.dwg_resolve_handleref(ref_ptr, obj_ptr);
     }
+    /**
+     * Returns the absolute handle reference of one Dwg_Object_Ref instance.
+     * @group Handle Conversion Methods
+     * @returns Returns null when the reference or absolute_ref is absent.
+     */
+    dwg_ref_get_absref(ref_ptr) {
+      if (!ref_ptr) return null;
+      const absref = this.wasmInstance.dwg_ref_get_absref(ref_ptr);
+      return absref === 0 ? null : absref;
+    }
+    /**
+     * Returns the handle value of one Dwg_Object_Ref instance.
+     * @group Handle Conversion Methods
+     * @returns Returns null when the reference or handle value is absent.
+     */
+    dwg_ref_get_handle_value(ref_ptr) {
+      if (!ref_ptr) return null;
+      const value = this.wasmInstance.dwg_ref_get_handle_value(ref_ptr);
+      return value === 0n ? null : value;
+    }
+    /**
+     * Returns the absolute_ref of one Dwg_Object_Ref instance as bigint.
+     * @group Handle Conversion Methods
+     * @returns Returns null when the reference or absolute_ref is absent.
+     */
+    dwg_ref_get_handle_absolute_ref(ref_ptr) {
+      if (!ref_ptr) return null;
+      const value = this.wasmInstance.dwg_ref_get_handle_absolute_ref(ref_ptr);
+      return value === 0n ? null : value;
+    }
+    /**
+     * Returns the handle value of one Dwg_Object instance.
+     * @group Handle Conversion Methods
+     * @returns Returns null when the object or handle value is absent.
+     */
+    dwg_obj_get_handle_value(obj_ptr) {
+      if (!obj_ptr) return null;
+      const value = this.wasmInstance.dwg_obj_get_handle_value(obj_ptr);
+      return value === 0n ? null : value;
+    }
+    /**
+     * Returns the absolute_ref of one Dwg_Object_Ref as uppercase hex handle id.
+     * @group Handle Conversion Methods
+     */
+    dwg_ref_get_id(ref_ptr) {
+      const absref = this.dwg_ref_get_absref(ref_ptr);
+      return absref == null ? void 0 : absref.toString(16).toUpperCase();
+    }
     /**
      * Returns object (such as line type, layer name, dimension style, and etc.) name by its handle.
      * @group Handle Conversion Methods
@@ -5557,7 +5779,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       const wasmInstance = this.wasmInstance;
       const obj = wasmInstance.dwg_ref_get_object(ref_ptr);
       const obj_tio = wasmInstance.dwg_object_to_object_tio(obj);
-      const obj_name = this.dwg_dynapi_entity_value(obj_tio, "name").data;
+      const obj_name = this.dwg_dynapi_entity_data(obj_tio, "name");
       return obj_name;
     }
     /**
@@ -6065,6 +6287,13 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       }
       return value;
     }
+    /**
+     * Returns the decoded field data of one object or entity.
+     * @group Dynamic API Methods
+     */
+    dwg_dynapi_entity_data(obj, field) {
+      return this.dwg_dynapi_entity_value(obj, field).data;
+    }
     /**
      * Header field value getter. Used to get the field value of dwg/dxf header.
      * @group Dynamic API Methods
@@ -6075,6 +6304,13 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     dwg_dynapi_header_value(data, field) {
       return this.wasmInstance.dwg_dynapi_header_value(data, field);
     }
+    /**
+     * Returns the field data of dwg/dxf header.
+     * @group Dynamic API Methods
+     */
+    dwg_dynapi_header_data(data, field) {
+      return this.dwg_dynapi_header_value(data, field).data;
+    }
     /**
      * The common field value getter. Used to get the value of object or entity common fields.
      * @group Dynamic API Methods
@@ -6085,6 +6321,13 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     dwg_dynapi_common_value(obj, field) {
       return this.wasmInstance.dwg_dynapi_common_value(obj, field);
     }
+    /**
+     * Returns the field data of object or entity common fields.
+     * @group Dynamic API Methods
+     */
+    dwg_dynapi_common_data(obj, field) {
+      return this.dwg_dynapi_common_value(obj, field).data;
+    }
     /**
      * The field of one object or entity may not be primitive type. It means one field may consist of
      * multiple sub-fields. This method is used to get the sub-field value of those complex field.
@@ -6097,6 +6340,31 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     dwg_dynapi_subclass_value(obj, subclass, field) {
       return this.wasmInstance.dwg_dynapi_subclass_value(obj, subclass, field);
     }
+    /**
+     * Returns the sub-field data of one complex field.
+     * @group Dynamic API Methods
+     */
+    dwg_dynapi_subclass_data(obj, subclass, field) {
+      return this.dwg_dynapi_subclass_value(obj, subclass, field).data;
+    }
+    /**
+     * Returns the struct size of a dynapi subclass.
+     */
+    dwg_dynapi_subclass_size(subclass) {
+      return this.wasmInstance.dwg_dynapi_subclass_size(subclass);
+    }
+    /**
+     * Returns the byte offset of a field within an entity struct.
+     */
+    dwg_dynapi_entity_field_offset(entity, field) {
+      return this.wasmInstance.dwg_dynapi_entity_field_offset(entity, field);
+    }
+    /**
+     * Returns the byte offset of a field within a dynapi subclass struct.
+     */
+    dwg_dynapi_subclass_field_offset(subclass, field) {
+      return this.wasmInstance.dwg_dynapi_subclass_field_offset(subclass, field);
+    }
     /**
      * Returns the handle of one Dwg_Object instance.
      * @group Dwg_Object Methods
@@ -6208,7 +6476,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
      */
     dwg_entity_get_block_name(ptr, field) {
       const wasmInstance = this.wasmInstance;
-      const block_header_ref = wasmInstance.dwg_dynapi_entity_value(ptr, field).data;
+      const block_header_ref = this.dwg_dynapi_entity_data(ptr, field);
       const block_header_obj = wasmInstance.dwg_ref_get_object(block_header_ref);
       const block_header_tio = wasmInstance.dwg_object_to_object_tio(block_header_obj);
       const block = this.dwg_entity_block_header_get_block(block_header_tio);
@@ -6224,10 +6492,10 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
      */
     dwg_entity_get_dimstyle_name(ptr, field = "dimstyle") {
       const wasmInstance = this.wasmInstance;
-      const dimstyle_ref = wasmInstance.dwg_dynapi_entity_value(ptr, field).data;
+      const dimstyle_ref = this.dwg_dynapi_entity_data(ptr, field);
       const dimstyle_obj = wasmInstance.dwg_ref_get_object(dimstyle_ref);
       const dimstyle_tio = wasmInstance.dwg_object_to_object_tio(dimstyle_obj);
-      const dimstyle_name = this.dwg_dynapi_entity_value(dimstyle_tio, "name").data;
+      const dimstyle_name = this.dwg_dynapi_entity_data(dimstyle_tio, "name");
       return dimstyle_name;
     }
     /**
@@ -6238,11 +6506,11 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
      */
     dwg_entity_block_header_get_block(ptr) {
       const wasmInstance = this.wasmInstance;
-      const block_ref = wasmInstance.dwg_dynapi_entity_value(ptr, "block_entity").data;
+      const block_ref = this.dwg_dynapi_entity_data(ptr, "block_entity");
       const block_obj = wasmInstance.dwg_ref_get_object(block_ref);
       const block_tio = wasmInstance.dwg_object_to_entity_tio(block_obj);
-      const name = wasmInstance.dwg_dynapi_entity_value(block_tio, "name").data;
-      const base_pt = wasmInstance.dwg_dynapi_entity_value(block_tio, "base_pt").data;
+      const name = this.dwg_dynapi_entity_data(block_tio, "name");
+      const base_pt = this.dwg_dynapi_entity_data(block_tio, "base_pt");
       return {
         name,
         base_pt
@@ -6312,10 +6580,10 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
      */
     dwg_entity_mtext_get_style_name(ptr) {
       const wasmInstance = this.wasmInstance;
-      const style_ref = wasmInstance.dwg_dynapi_entity_value(ptr, "style").data;
+      const style_ref = this.dwg_dynapi_entity_data(ptr, "style");
       const style_obj = wasmInstance.dwg_ref_get_object(style_ref);
       const style_tio = wasmInstance.dwg_object_to_object_tio(style_obj);
-      const name = wasmInstance.dwg_dynapi_entity_value(style_tio, "name").data;
+      const name = this.dwg_dynapi_entity_data(style_tio, "name");
       return name;
     }
     /**