diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CanonicalType.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CanonicalType.java
index bb0deaa3c..d4290d695 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CanonicalType.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CanonicalType.java
@@ -77,6 +77,16 @@ public class CanonicalType extends UriType {
 	public String fhirType() {
 		return "canonical";		
 	}
+
+  public String baseUrl() {
+    var s = primitiveValue();
+    return s == null || !s.contains("|") ? s : s.substring(0, s.indexOf("|"));
+  }
+
+  public String version() {
+    var s = primitiveValue();
+    return s == null || !s.contains("|") ? null : s.substring(s.indexOf("|")+1);
+  }
 	
 
 }
\ No newline at end of file