diff --git a/java/ql/lib/ext/java.util.model.yml b/java/ql/lib/ext/java.util.model.yml
index 07eae7c95b45..9e4cca35e9d3 100644
--- a/java/ql/lib/ext/java.util.model.yml
+++ b/java/ql/lib/ext/java.util.model.yml
@@ -227,6 +227,8 @@ extensions:
       - ["java.util", "Map", True, "replace", "(Object,Object,Object)", "", "Argument[0]", "Argument[this].MapKey", "value", "manual"]
       - ["java.util", "Map", True, "replace", "(Object,Object,Object)", "", "Argument[2]", "Argument[this].MapValue", "value", "manual"]
       - ["java.util", "Map", True, "values", "()", "", "Argument[this].MapValue", "ReturnValue.Element", "value", "manual"]
+      - ["java.util", "Map$Entry", True, "copyOf", "(Map$Entry)", "", "Argument[0].MapKey", "ReturnValue.MapKey", "value", "df-generated"]
+      - ["java.util", "Map$Entry", True, "copyOf", "(Map$Entry)", "", "Argument[0].MapValue", "ReturnValue.MapValue", "value", "df-generated"]
       - ["java.util", "Map$Entry", True, "getKey", "", "", "Argument[this].MapKey", "ReturnValue", "value", "manual"]
       - ["java.util", "Map$Entry", True, "getValue", "", "", "Argument[this].MapValue", "ReturnValue", "value", "manual"]
       - ["java.util", "Map$Entry", True, "setValue", "", "", "Argument[this].MapValue", "ReturnValue", "value", "manual"]
diff --git a/java/ql/lib/ext/javax.crypto.model.yml b/java/ql/lib/ext/javax.crypto.model.yml
index b001017b256a..9c909320344c 100644
--- a/java/ql/lib/ext/javax.crypto.model.yml
+++ b/java/ql/lib/ext/javax.crypto.model.yml
@@ -7,3 +7,20 @@ extensions:
       - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameterSpec,SecureRandom)", "", "Argument[2]", "encryption-iv", "manual"]
       - ["javax.crypto", "Cipher", False, "unwrap", "(byte[],String,int)", "", "Argument[0]", "credentials-key", "hq-generated"]
       - ["javax.crypto", "CipherSpi", True, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "credentials-key", "hq-generated"]
+  - addsTo:
+      pack: codeql/java-all
+      extensible: neutralModel
+    data:
+      - ["javax.crypto", "Cipher", "doFinal", "", "summary", "manual"]
+      - ["javax.crypto", "Cipher", "getAlgorithm", "", "summary", "manual"]
+      - ["javax.crypto", "Cipher", "getExemptionMechanism", "", "summary", "manual"]
+      - ["javax.crypto", "Cipher", "getInstance", "", "summary", "manual"]
+      - ["javax.crypto", "Cipher", "getIV", "", "summary", "manual"]
+      - ["javax.crypto", "Cipher", "getParameters", "", "summary", "manual"]
+      - ["javax.crypto", "Cipher", "getProvider", "", "summary", "manual"]
+      - ["javax.crypto", "Cipher", "init", "", "summary", "manual"]
+      - ["javax.crypto", "Cipher", "toString", "", "summary", "manual"]
+      - ["javax.crypto", "Cipher", "unwrap", "", "summary", "manual"]
+      - ["javax.crypto", "Cipher", "update", "", "summary", "manual"]
+      - ["javax.crypto", "Cipher", "updateAAD", "", "summary", "manual"]
+      - ["javax.crypto", "Cipher", "wrap", "", "summary", "manual"]