diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/Property.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/Property.java
index 2e5f3f941..7b1766c68 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/Property.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/Property.java
@@ -609,5 +609,15 @@ public class Property {
     return ok;
   }
 
+
+  public String getXmlTypeName() {
+    TypeRefComponent tr = type;
+    if (tr == null) {
+      tr = definition.getTypeFirstRep();
+    }
+    StructureDefinition sd = context.fetchTypeDefinition(tr.getWorkingCode());
+    return sd.getSnapshot().getElementFirstRep().getPath();
+  }
+
   
 }
\ No newline at end of file
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java
index 042dade65..07825fdcb 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java
@@ -256,6 +256,7 @@ public class ToolingExtensions {
   public static final String EXT_OBLIGATION_CORE = "http://hl7.org/fhir/StructureDefinition/obligation";
   public static final String EXT_NO_BINDING = "http://hl7.org/fhir/tools/StructureDefinition/no-binding";
   public static final String EXT_ID_CHOICE_GROUP = "http://hl7.org/fhir/tools/StructureDefinition/xml-choice-group";
+  public static final String EXT_DATE_RULES = "http://hl7.org/fhir/tools/StructureDefinition/elementdefinition-date-rules";
   
   // specific extension helpers
 
diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/NpmPackageTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/NpmPackageTests.java
index b115e42ea..bf22daa18 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/NpmPackageTests.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/NpmPackageTests.java
@@ -62,7 +62,7 @@ public class NpmPackageTests {
 
 
   private void checkNpm(NpmPackage npm) throws IOException {
-    Assertions.assertEquals(1, npm.list("other").size());
+    Assertions.assertEquals(2, npm.list("other").size());
     Assertions.assertEquals("help.png", npm.list("other").get(0));
     Assertions.assertEquals(1, npm.list("package").size());
     Assertions.assertEquals("StructureDefinition-Definition.json", npm.list("package").get(0));