diff --git a/biosimulators_utils/combine/data_model.py b/biosimulators_utils/combine/data_model.py
index 3dbe6aac..9cc79dc4 100644
--- a/biosimulators_utils/combine/data_model.py
+++ b/biosimulators_utils/combine/data_model.py
@@ -145,7 +145,7 @@ class CombineArchiveContentFormat(str, enum.Enum):
     HDF5 = 'http://purl.org/NET/mediatypes/application/x-hdf'
     HOC = 'http://purl.org/NET/mediatypes/text/x-hoc'
     HTML = 'http://purl.org/NET/mediatypes/text/html'
-    ICO = 'http://purl.org/NET/mediatypes/image/x-icon'   
+    ICO = 'http://purl.org/NET/mediatypes/image/x-icon'
     INI = 'http://purl.org/NET/mediatypes/text/x-ini'
     IPython_Notebook = 'http://purl.org/NET/mediatypes/application/x-ipynb+json'
     JAVA_ARCHIVE = 'http://purl.org/NET/mediatypes/application/java-archive'
@@ -247,7 +247,14 @@ class CombineArchiveContentFormatPattern(str, enum.Enum):
     ICO = r'^https?://purl\.org/NET/mediatypes/(image/x-icon|image/vnd\.microsoft\.icon)$'
     INI = r'^https?://purl\.org/NET/mediatypes/text/x-ini$'
     IPython_Notebook = r'^https?://purl\.org/NET/mediatypes/application/x-ipynb\+json$'
-    JAVA_ARCHIVE = r'^https?://purl\.org/NET/mediatypes/(application/java-archive|application/x-java-archive|application/jar|application/x-jar)$'
+    JAVA_ARCHIVE = (
+        r'^https?://purl\.org/NET/mediatypes/('
+        r'application/java-archive'
+        r'|application/x-java-archive'
+        r'|application/jar'
+        r'|application/x-jar'
+        r')$'
+    )
     JAVA_CLASS = r'^https?://purl\.org/NET/mediatypes/(application/java-vm|application/x-java-vm|application/java|application/x-java)$'
     JAVA_SOURCE = r'^https?://purl\.org/NET/mediatypes/(text/x-java|text/x-java-source)$'
     JAVASCRIPT = r'^https?://purl\.org/NET/mediatypes/(text/javascript|text/x-javascript|application/javascript|application/x-javascript)$'
@@ -273,7 +280,17 @@ class CombineArchiveContentFormatPattern(str, enum.Enum):
     PNG = r'^https?://purl\.org/NET/mediatypes/image/png$'
     PPT = r'^https?://purl\.org/NET/mediatypes/application/vnd\.ms-powerpoint$'
     PPTX = r'^https?://purl\.org/NET/mediatypes/application/vnd\.openxmlformats-officedocument\.presentationml\.presentation$'
-    PSD = r'^https?://purl\.org/NET/mediatypes/(image/vnd\.adobe\.photoshop|image/psd|image/x-psd|application/photoshop|application/x-photoshop|application/psd|application/x-psd)$'
+    PSD = (
+        r'^https?://purl\.org/NET/mediatypes/('
+        r'image/vnd\.adobe\.photoshop'
+        r'|image/psd'
+        r'|image/x-psd'
+        r'|application/photoshop'
+        r'|application/x-photoshop'
+        r'|application/psd'
+        r'|application/x-psd'
+        r')$'
+    )
     Python = r'^https?://purl\.org/NET/mediatypes/application/x-python-code$'
     QUICKTIME = r'^https?://purl\.org/NET/mediatypes/(video/quicktime|image/mov)$'
     R = r'^https?://purl\.org/NET/mediatypes/text/x-r$'