diff --git a/InternalPythonModules/android/browserlocation.py b/InternalPythonModules/android/browserlocation.py
index 81ce9d9163..6db230c2e6 100755
--- a/InternalPythonModules/android/browserlocation.py
+++ b/InternalPythonModules/android/browserlocation.py
@@ -90,7 +90,7 @@ class BrowserLocationAnalyzer(general.AndroidComponentAnalyzer):
                 latitude = Double.valueOf(resultSet.getString("latitude"))
                 longitude = Double.valueOf(resultSet.getString("longitude"))
 
-                attributes = ArrayList<>()
+                attributes = ArrayList()
                 artifact = abstractFile.newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_TRACKPOINT)
                 attributes.add(BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_GEO_LATITUDE, general.MODULE_NAME, latitude))
                 attributes.add(BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_GEO_LONGITUDE, general.MODULE_NAME, longitude))
diff --git a/InternalPythonModules/android/cachelocation.py b/InternalPythonModules/android/cachelocation.py
index 680db6d6e6..019c03c654 100755
--- a/InternalPythonModules/android/cachelocation.py
+++ b/InternalPythonModules/android/cachelocation.py
@@ -121,7 +121,7 @@ class CacheLocationAnalyzer(general.AndroidComponentAnalyzer):
                 inputStream.read(tempBytes)
                 timestamp = BigInteger(tempBytes).longValue() / 1000
 
-                attributes = ArrayList<>()
+                attributes = ArrayList()
                 artifact = abstractFile.newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_TRACKPOINT)
                 attributes.add(BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_GEO_LATITUDE, AndroidAnalyzer.MODULE_NAME, latitude))
                 attributes.add(BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_GEO_LONGITUDE, AndroidAnalyzer.MODULE_NAME, longitude))
diff --git a/InternalPythonModules/android/calllog.py b/InternalPythonModules/android/calllog.py
index c3a65f8f38..6b9cb956d8 100755
--- a/InternalPythonModules/android/calllog.py
+++ b/InternalPythonModules/android/calllog.py
@@ -120,7 +120,7 @@ class CallLogAnalyzer(general.AndroidComponentAnalyzer):
                         name = resultSet.getString("name") # name of person dialed or called. None if unregistered
 
                         try:
-                            attributes = ArrayList<>()
+                            attributes = ArrayList()
                             artifact = abstractFile.newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_CALLLOG) # create a call log and then add attributes from result set.
                             if direction == CallLogAnalyzer.OUTGOING:
                                 attributes.add(BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PHONE_NUMBER_TO, general.MODULE_NAME, number))
diff --git a/InternalPythonModules/android/contact.py b/InternalPythonModules/android/contact.py
index 75768b8a8e..22eb681061 100755
--- a/InternalPythonModules/android/contact.py
+++ b/InternalPythonModules/android/contact.py
@@ -119,7 +119,7 @@ class ContactAnalyzer(general.AndroidComponentAnalyzer):
                     + "WHERE mimetype = 'vnd.android.cursor.item/phone_v2' OR mimetype = 'vnd.android.cursor.item/email_v2'\n"
                     + "ORDER BY raw_contacts.display_name ASC;")
 
-            attributes = ArrayList<>()
+            attributes = ArrayList()
             artifact = abstractFile.newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_CONTACT)
             oldName = ""
             while resultSet.next():
diff --git a/InternalPythonModules/android/googlemaplocation.py b/InternalPythonModules/android/googlemaplocation.py
index 3b4a265937..10a1542568 100755
--- a/InternalPythonModules/android/googlemaplocation.py
+++ b/InternalPythonModules/android/googlemaplocation.py
@@ -97,7 +97,7 @@ class GoogleMapLocationAnalyzer(general.AndroidComponentAnalyzer):
                 source_lat = GoogleMapLocationAnalyzer.convertGeo(resultSet.getString("source_lat"))
                 source_lng = GoogleMapLocationAnalyzer.convertGeo(resultSet.getString("source_lng"))
 
-                attributes = ArrayList<>()
+                attributes = ArrayList()
                 artifact = abstractFile.newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_ROUTE)
                 attributes.add(BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_CATEGORY, general.MODULE_NAME, "Destination"))
                 attributes.add(BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME, general.MODULE_NAME, time))
diff --git a/InternalPythonModules/android/tangomessage.py b/InternalPythonModules/android/tangomessage.py
index 5ba6ad0339..9a792064da 100755
--- a/InternalPythonModules/android/tangomessage.py
+++ b/InternalPythonModules/android/tangomessage.py
@@ -95,7 +95,7 @@ class TangoMessageAnalyzer(general.AndroidComponentAnalyzer):
                     direction = "Outgoing"
                 payload = resultSet.getString("payload")
 
-                attributes = ArrayList<>()
+                attributes = ArrayList()
                 artifact = abstractFile.newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_MESSAGE) #create a call log and then add attributes from result set.
                 attributes.add(BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME, general.MODULE_NAME, create_time))
                 attributes.add(BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DIRECTION, general.MODULE_NAME, direction))
diff --git a/InternalPythonModules/android/textmessage.py b/InternalPythonModules/android/textmessage.py
index 221023ce44..55bb563fea 100755
--- a/InternalPythonModules/android/textmessage.py
+++ b/InternalPythonModules/android/textmessage.py
@@ -93,7 +93,7 @@ class TextMessageAnalyzer(general.AndroidComponentAnalyzer):
                 read = resultSet.getInt("read") # may be unread = 0, read = 1
                 subject = resultSet.getString("subject") # message subject
                 body = resultSet.getString("body") # message body
-                attributes = ArrayList<>()
+                attributes = ArrayList()
                 artifact = abstractFile.newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_MESSAGE); #create Message artifact and then add attributes from result set.
                 if resultSet.getString("type") == "1":
                     attributes.add(BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DIRECTION, general.MODULE_NAME, "Incoming"))
diff --git a/InternalPythonModules/android/wwfmessage.py b/InternalPythonModules/android/wwfmessage.py
index 1fe80a099d..941e81f329 100755
--- a/InternalPythonModules/android/wwfmessage.py
+++ b/InternalPythonModules/android/wwfmessage.py
@@ -88,7 +88,7 @@ class WWFMessageAnalyzer(general.AndroidComponentAnalyzer):
                 user_id = resultSet.getString("user_id") # the ID of the user who sent the message.
                 game_id = resultSet.getString("game_id") # ID of the game which the the message was sent.
 
-                attributes = ArrayList<>()
+                attributes = ArrayList()
                 artifact = abstractFile.newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_MESSAGE) # create a call log and then add attributes from result set.
                 attributes.add(BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME, general.MODULE_NAME, created_at))
                 attributes.add(BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_NAME, general.MODULE_NAME, user_id))
diff --git a/pythonExamples/Aug2015DataSourceTutorial/FindContactsDb.py b/pythonExamples/Aug2015DataSourceTutorial/FindContactsDb.py
index 5900f4f04f..2aa5d9d9a4 100755
--- a/pythonExamples/Aug2015DataSourceTutorial/FindContactsDb.py
+++ b/pythonExamples/Aug2015DataSourceTutorial/FindContactsDb.py
@@ -163,7 +163,7 @@ class ContactsDbIngestModule(DataSourceIngestModule):
                 
                 # Make an artifact on the blackboard, TSK_CONTACT and give it attributes for each of the fields
                 art = file.newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_CONTACT)
-                attributes = ArrayList<>()
+                attributes = ArrayList()
 
                 attributes.add(BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_NAME_PERSON.getTypeID(), 
                     ContactsDbIngestModuleFactory.moduleName, name))