diff --git a/bindings/java/doxygen/artifact_catalog.dox b/bindings/java/doxygen/artifact_catalog.dox
index 41a666328a03aa16346449faac896f98e8acee7d..5f780c912b1f0e28ab9a1e80a57bc2caf99346ca 100644
--- a/bindings/java/doxygen/artifact_catalog.dox
+++ b/bindings/java/doxygen/artifact_catalog.dox
@@ -26,6 +26,7 @@ Describes how a data source was used, e.g., as a SIM card or an OS drive (such a
 ### REQUIRED ATTRIBUTES
 - TSK_DESCRIPTION (Description of the usage, e.g., "OS Drive (Windows Vista)").
 
+
 ---
 ## TSK_ENCRYPTION_DETECTED
 An indication that the content is encrypted.
@@ -33,6 +34,7 @@ An indication that the content is encrypted.
 ### REQUIRED ATTRIBUTES
 - TSK_COMMENT (A comment on the encryption, e.g., encryption type or password)
 
+
 ---
 ## TSK_ENCRYPTION_SUSPECTED
 An indication that the content is likely encrypted.
@@ -40,6 +42,7 @@ An indication that the content is likely encrypted.
 ### REQUIRED ATTRIBUTES
 - TSK_COMMENT (Reason for suspecting encryption)
 
+
 ---
 ## TSK_EXT_MISMATCH_DETECTED
 An indication that the registered extensions for a file's mime type do not match the file's extension.
@@ -47,6 +50,7 @@ An indication that the registered extensions for a file's mime type do not match
 ### REQUIRED ATTRIBUTES
 None
 
+
 ---
 ## TSK_FACE_DETECTED
 An indication that a human face was detected in some content.
@@ -54,6 +58,7 @@ An indication that a human face was detected in some content.
 ### REQUIRED ATTRIBUTES
 None
 
+
 ---
 ## TSK_HASHSET_HIT
 Indicates that the MD5 hash of a file matches a set of known MD5s (possibly user defined).
@@ -64,6 +69,7 @@ Indicates that the MD5 hash of a file matches a set of known MD5s (possibly user
 ### OPTIONAL ATTRIBUTES
 - TSK_COMMENT (Additional comments about the hit)
 
+
 ---
 ## TSK_INTERESTING_ARTIFACT_HIT
 Indicates that the source artifact matches some set of criteria which deem it interesting. Artifacts with this meta artifact will be brought to the attention of the user.
@@ -76,6 +82,7 @@ Indicates that the source artifact matches some set of criteria which deem it in
 - TSK_COMMENT (Comment on the reason that the source artifact is interesting)
 - TSK_CATEGORY (The set membership rule that was satisfied)
 
+
 ---
 ## TSK_INTERESTING_FILE_HIT
 Indication that the source file matches some set of criteria (possibly user defined) which deem it interesting. Files with this artifact will be brought to the attention of the user.
@@ -87,6 +94,7 @@ Indication that the source file matches some set of criteria (possibly user defi
 - TSK_COMMENT (Comment on the reason that the source artifact is interesting)
 - TSK_CATEGORY (The set membership rule that was satisfied. I.e. a particular mime)
 
+
 ---
 ## TSK_KEYWORD_HIT
 Indication that the source artifact or file contains a keyword. Keywords are grouped into named sets.
@@ -101,6 +109,7 @@ Indication that the source artifact or file contains a keyword. Keywords are gro
 ### OPTIONAL ATTRIBUTES
 - TSK_KEYWORD_PREVIEW (Snippet of text around keyword)
 
+
 ---
 ## TSK_OBJECT_DETECTED
 Indicates that an object was detected in a media file. Typically used by computer vision software to classify images.
@@ -111,6 +120,7 @@ Indicates that an object was detected in a media file. Typically used by compute
 ### OPTIONAL ATTRIBUTES
 - TSK_DESCRIPTION (Additional comments about the object or observer, e.g., what detected the object)
 
+
 ---
 ## TSK_USER_CONTENT_SUSPECTED
 An indication that some media file content was generated by the user.
@@ -118,6 +128,7 @@ An indication that some media file content was generated by the user.
 ### REQUIRED ATTRIBUTES
 - TSK_COMMENT (The reason why user-generated content is suspected)
 
+
 ---
 ## TSK_VERIFICATION_FAILED
 An indication that some data did not pass verification. One example would be verifying a SHA-1 hash.
@@ -125,6 +136,7 @@ An indication that some data did not pass verification. One example would be ver
 ### REQUIRED ATTRIBUTES
 - TSK_COMMENT (Reason for failure, what failed)
 
+
 ---
 ## TSK_WEB_ACCOUNT_TYPE
 A web account type entry. 
@@ -134,6 +146,7 @@ A web account type entry.
 - TSK_TEXT (Indicates type of account (admin/moderator/user) and possible platform)
 - TSK_URL (URL indicating the user has an account on this domain)
 
+
 ---
 ## TSK_WEB_CATEGORIZATION
 The categorization of a web host using a specific usage type, e.g. mail.google.com would correspond to Web Email.
@@ -143,6 +156,7 @@ The categorization of a web host using a specific usage type, e.g. mail.google.c
 - TSK_DOMAIN (The domain of the host, e.g. google.com)
 - TSK_HOST (The full host, e.g. mail.google.com)
 
+
 ---
 ## TSK_YARA_HIT
 Indicates that the some content of the file was a hit for a YARA rule match.
@@ -151,6 +165,7 @@ Indicates that the some content of the file was a hit for a YARA rule match.
 - TSK_RULE (The rule that was a hit for this file)
 - TSK_SET_NAME (Name of the rule set containing the matching rule YARA rule)
 
+
 ---
 ## TSK_METADATA_EXIF
 EXIF metadata found in an image or audio file.
@@ -192,8 +207,8 @@ TSK_CARD_NUMBER (Credit card number)
 - TSK_KEYWORD_SEARCH_DOCUMENT_ID (Document ID of the Solr document that contains the TSK_CARD_NUMBER when the account is a credit card discovered by the Autopsy regular expression search for credit cards)
 - TSK_SET_NAME (The keyword list name, i.e., "Credit Card Numbers", when the account is a credit card discovered by the Autopsy regular expression search for credit cards)
 
----
 
+---
 ## TSK_ASSOCIATED_OBJECT
 Provides a backwards link to an artifact that references the parent file of this artifact.  Example usage is that a downloaded file will have this artifact and it will point back to the TSK_WEB_DOWNLOAD artifact that is associated with a browser's SQLite database. See \ref jni_bb_associated_object.
 
@@ -212,7 +227,6 @@ Details about System/aplication/file backups.
 - TSK_DATETIME_END (Date/Time the backup ended)
 
 
-
 ---
 ## TSK_BLUETOOTH_ADAPTER
 Details about a Bluetooth adapter.
@@ -252,7 +266,6 @@ A calendar entry in an application file or database.
 - TSK_DATETIME_END (End of the entry, in seconds since 1970-01-01T00:00:00Z)
 
 
-
 ---
 ## TSK_CALLLOG
 A call log record in an application file or database.
@@ -270,7 +283,6 @@ A call log record in an application file or database.
 - TSK_NAME (The name of the caller or callee)
 
 
-
 ---
 ## TSK_CLIPBOARD_CONTENT
 Data found on the operating system's clipboard.
@@ -279,7 +291,6 @@ Data found on the operating system's clipboard.
 - TSK_TEXT (Text on the clipboard)
 
 
-
 ---
 ## TSK_CONTACT
 A contact book entry in an application file or database.
@@ -300,8 +311,6 @@ A contact book entry in an application file or database.
 - TSK_URL (e.g., the URL of an image if the contact is a vCard)
 
 
-
-
 ---
 ## TSK_DELETED_PROG
 Programs that have been deleted from the system.
@@ -314,7 +323,6 @@ Programs that have been deleted from the system.
 - TSK_PATH (Location where the program resided before being deleted)
 
 
-
 ---
 ## TSK_DEVICE_ATTACHED
 Details about a device that was physically attached to a data source.
@@ -329,7 +337,6 @@ Details about a device that was physically attached to a data source.
 - TSK_MAC_ADDRESS (Mac address of the attached device)
 
 
-
 ---
 ## TSK_DEVICE_INFO
 Details about a device data source.
@@ -341,7 +348,6 @@ Details about a device data source.
 - TSK_IMSI (IMSI number of the device)
 
 
-
 ---
 ## TSK_EMAIL_MSG
 An email message found in an application file or database.
@@ -364,6 +370,7 @@ An email message found in an application file or database.
 - TSK_SUBJECT (Subject of the email message)
 - TSK_THREAD_ID (ID specified by the analysis module to group emails into threads for display purposes)
 
+
 ---
 ## TSK_EXTRACTED_TEXT
 Text extracted from some content.
@@ -371,6 +378,7 @@ Text extracted from some content.
 ### REQUIRED ATTRIBUTES
 - TSK_TEXT (The extracted text)
 
+
 ---
 ## TSK_GEN_INFO
 A generic information artifact. Each content object will have at most one TSK_GEN_INFO artifact, which is easily accessed through org.sleuthkit.datamodel.AbstractContent.getGenInfoArtifact() and related methods. The TSK_GEN_INFO object is useful for storing values related to the content object without making a new artifact type.
@@ -381,6 +389,7 @@ None
 ### OPTIONAL ATTRIBUTES
 - TSK_PHOTODNA_HASH (The PhotoDNA hash of an image)
 
+
 ---
 ## TSK_GPS_AREA
 An outline of an area.
@@ -393,6 +402,7 @@ An outline of an area.
 - TSK_NAME (Name of the area, e.g., Minute Man Trail)
 - TSK_PROG_NAME (Name of the application that was the source of the GPS route)
 
+
 ---
 ## TSK_GPS_BOOKMARK
 A bookmarked GPS location or saved waypoint.
@@ -409,7 +419,6 @@ A bookmarked GPS location or saved waypoint.
 - TSK_PROG_NAME (Name of the application that was the source of the GPS bookmark)
 
 
-
 ---
 ## TSK_GPS_LAST_KNOWN_LOCATION
 The last known location of a GPS connected device. This may be from a perspective other than the device.
@@ -425,7 +434,6 @@ The last known location of a GPS connected device. This may be from a perspectiv
 - TSK_NAME (The name of the last known location. Ex: Boston)
 
 
-
 ---
 ## TSK_GPS_ROUTE
 A GPS route.
@@ -440,7 +448,6 @@ A GPS route.
 - TSK_PROG_NAME (Name of the application that was the source of the GPS route)
 
 
-
 ---
 ## TSK_GPS_SEARCH
 A GPS location that was known to have been searched by the device or user.
@@ -456,7 +463,6 @@ A GPS location that was known to have been searched by the device or user.
 - TSK_NAME (The name of the target location, e.g., Boston)
 
 
-
 ---
 ## TSK_GPS_TRACK
 A Global Positioning System (GPS) track artifact records the track, or path, of a GPS-enabled dvice as a connected series of track points. A track point is a location in a geographic coordinate system with latitude, longitude and altitude (elevation) axes.
@@ -469,7 +475,6 @@ A Global Positioning System (GPS) track artifact records the track, or path, of
 - TSK_PROG_NAME (Name of application containing the GPS trackpoint set)
 
 
-
 ---
 ## TSK_INSTALLED_PROG
 Details about an installed program. 
@@ -484,6 +489,7 @@ Details about an installed program.
 - TSK_PERMISSIONS (Permissions of the installed program)
 - TSK_VERSION (Version number of the program)
 
+
 ---
 ## TSK_MESSAGE
 A message that is found in some content.
@@ -506,7 +512,6 @@ A message that is found in some content.
 - TSK_THREAD_ID (ID for keeping threaded messages together)
 
 
-
 ---
 ## TSK_METADATA
 General metadata for some content.
@@ -525,6 +530,7 @@ None
 - TSK_USER_ID (Last author of the document)
 - TSK_VERSION (Version number of the program used to create the document)
 
+
 ---
 ## TSK_OS_INFO
 Details about an operating system recovered from the data source.
@@ -545,7 +551,6 @@ Details about an operating system recovered from the data source.
 - TSK_VERSION (Version of the OS)
 
 
-
 ---
 ## TSK_PROG_NOTIFICATIONS
 Notifications to the user.
@@ -559,7 +564,6 @@ Notifications to the user.
 - TSK_VALUE (Message being sent or received)
 
 
-
 ---
 ## TSK_PROG_RUN
 The number of times a program/application was run.
@@ -577,7 +581,6 @@ The number of times a program/application was run.
 - TSK_PATH (Path of the executable program)
 
 
-
 ---
 ## TSK_RECENT_OBJECT
 Indicates recently accessed content. Examples: Recent Documents or Recent Downloads menu items on Windows.
@@ -594,7 +597,6 @@ Indicates recently accessed content. Examples: Recent Documents or Recent Downlo
 - TSK_COMMENT (What the source of the attribute may be)
 
 
-
 ---
 ## TSK_REMOTE_DRIVE
 Details about a remote drive found in the data source.
@@ -606,7 +608,6 @@ Details about a remote drive found in the data source.
 - TSK_LOCAL_PATH (The local path of this remote drive. This path may be mapped, e.g., 'D:/' or 'F:/')
 
 
-
 ---
 ## TSK_SCREEN_SHOTS
 Screenshots from a device or application.
@@ -642,7 +643,6 @@ An application or web user account.
 - TSK_USER_NAME (User name of the service account)
 
 
-
 ---
 ## TSK_SIM_ATTACHED
 Details about a SIM card that was physically attached to the device.
@@ -653,7 +653,6 @@ Details about a SIM card that was physically attached to the device.
 - TSK_IMSI (IMSI number of this SIM card)
 
 
-
 ---
 ## TSK_SPEED_DIAL_ENTRY
 A speed dial entry.
@@ -666,7 +665,6 @@ A speed dial entry.
 - TSK_SHORTCUT (Keyboard shortcut)
 
 
-
 ---
 ## TSK_TL_EVENT
 An event in the timeline of a case.
@@ -676,6 +674,7 @@ An event in the timeline of a case.
 - TSK_DATETIME (When the event occurred, in seconds since 1970-01-01T00:00:00Z)
 - TSK_DESCRIPTION (A description of the event)
 
+
 ---
 ## TSK_USER_DEVICE_EVENT
 Activity on the system or from an application.  Example usage is a mobile device being locked and unlocked. 
@@ -689,6 +688,7 @@ Activity on the system or from an application.  Example usage is a mobile device
 - TSK_PROG_NAME (Name of the program doing the activity)
 - TSK_VALUE (Connection type)
 
+
 ---
 ## TSK_WEB_BOOKMARK
 A web bookmark entry.
@@ -703,6 +703,7 @@ A web bookmark entry.
 - TSK_NAME (Name of the bookmark entry)
 - TSK_TITLE (Title of the web page that was bookmarked)
 
+
 ---
 ## TSK_WEB_CACHE
 A web cache entry. The resource that was cached may or may not be present in the data source.
@@ -717,6 +718,7 @@ A web cache entry. The resource that was cached may or may not be present in the
 - TSK_PATH_ID (Object ID of the source cache file)
 - TSK_DOMAIN (Domain of the URL)
 
+
 ---
 ## TSK_WEB_COOKIE
 A Web cookie found.
@@ -734,7 +736,6 @@ A Web cookie found.
 - TSK_PROG_NAME (Name of the application or application extractor that stored the Web cookie)
 
 
-
 ---
 ## TSK_WEB_DOWNLOAD
 A Web download. The downloaded resource may or may not be present in the data source.
@@ -750,7 +751,6 @@ A Web download. The downloaded resource may or may not be present in the data so
 - TSK_PROG_NAME (Name of the application or application extractor that downloaded this resource)
 
 
-
 ---
 ## TSK_WEB_FORM_ADDRESS
 Contains autofill data for a person's address. Form data is usually saved by a Web browser.
@@ -803,7 +803,6 @@ A Web history entry.
 - TSK_DATETIME_CREATED (The datetime the page was created, ie: offline pages)
 
 
-
 ---
 ## TSK_WEB_SEARCH_QUERY
 Details about a Web search query.
@@ -817,7 +816,6 @@ Details about a Web search query.
 - TSK_PROG_NAME (Application or application extractor that stored the Web search query)
 
 
-
 ---
 ## TSK_WIFI_NETWORK
 Details about a WiFi network.
diff --git a/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java b/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java
index a1d8c218a8656ad86d496b3887db607fc857860f..35afad3414ed657173bbbaff93083fdc00585c7a 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java
@@ -23,7 +23,6 @@
 import java.sql.SQLException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -711,7 +710,7 @@ public BlackboardArtifact newArtifact(int artifactTypeID) throws TskCoreExceptio
 	public AnalysisResultAdded newAnalysisResult(BlackboardArtifact.Type artifactType, Score score, String conclusion, String configuration, String justification, Collection<BlackboardAttribute> attributesList) throws TskCoreException {
 		CaseDbTransaction trans = sleuthkitCase.beginTransaction();
 		try {
-			AnalysisResultAdded resultAdded = sleuthkitCase.getBlackboard().newAnalysisResult(artifactType, this.getObjectID(), this.getDataSource().getId(), score, conclusion, configuration, justification, attributesList, trans);
+			AnalysisResultAdded resultAdded = sleuthkitCase.getBlackboard().newAnalysisResult(artifactType, this.getId(), this.getDataSource().getId(), score, conclusion, configuration, justification, attributesList, trans);
 
 			trans.commit();
 			return resultAdded;
@@ -725,7 +724,7 @@ public AnalysisResultAdded newAnalysisResult(BlackboardArtifact.Type artifactTyp
 	public AnalysisResultAdded newAnalysisResult(BlackboardArtifact.Type artifactType, Score score, String conclusion, String configuration, String justification, Collection<BlackboardAttribute> attributesList, long dataSourceId) throws TskCoreException {
 		CaseDbTransaction trans = sleuthkitCase.beginTransaction();
 		try {
-			AnalysisResultAdded resultAdded = sleuthkitCase.getBlackboard().newAnalysisResult(artifactType, this.getObjectID(), dataSourceId, score, conclusion, configuration, justification, attributesList, trans);
+			AnalysisResultAdded resultAdded = sleuthkitCase.getBlackboard().newAnalysisResult(artifactType, this.getId(), dataSourceId, score, conclusion, configuration, justification, attributesList, trans);
 
 			trans.commit();
 			return resultAdded;
@@ -1288,6 +1287,27 @@ public static final class Type implements Serializable {
 		 */
 		public static final Type TSK_WEB_CATEGORIZATION = new BlackboardArtifact.Type(68, "TSK_WEB_CATEGORIZATION", bundle.getString("BlackboardArtifact.tskWebCategorization.text"), Category.ANALYSIS_RESULT);
 
+		/**
+		 * Indicates that the file or artifact was previously seen in another Autopsy case.
+		 */
+		public static final Type TSK_PREVIOUSLY_SEEN = new BlackboardArtifact.Type(69, "TSK_PREVIOUSLY_SEEN", bundle.getString("BlackboardArtifact.tskPreviouslySeen.text"), Category.ANALYSIS_RESULT);
+		
+		/**
+		 * Indicates that the file or artifact was previously unseen in another Autopsy case.
+		 */
+		public static final Type TSK_PREVIOUSLY_UNSEEN = new BlackboardArtifact.Type(70, "TSK_PREVIOUSLY_UNSEEN", bundle.getString("BlackboardArtifact.tskPreviouslyUnseen.text"), Category.ANALYSIS_RESULT);
+		
+		/**
+		 * Indicates that the file or artifact was previously tagged as "Notable" in another Autopsy case.
+		 */
+		public static final Type TSK_PREVIOUSLY_NOTABLE = new BlackboardArtifact.Type(71, "TSK_PREVIOUSLY_NOTABLE", bundle.getString("BlackboardArtifact.tskPreviouslyNotable.text"), Category.ANALYSIS_RESULT);
+
+		/**
+		 * *TEMPORARY* Indicates that the artifact is associated with a persona.
+		 */
+		public static final Type TSK_MATCHING_PERSONA = new BlackboardArtifact.Type(72, "TSK_MATCHING_PERSONA", bundle.getString("BlackboardArtifact.tskMatchingPersona.text"), Category.ANALYSIS_RESULT);
+
+		
 		// NOTE: When adding a new standard BlackboardArtifact.Type, add the instance and then add to the STANDARD_TYPES map.
 		/**
 		 * All standard artifact types with ids mapped to the type.
@@ -1353,7 +1373,11 @@ public static final class Type implements Serializable {
 				TSK_USER_DEVICE_EVENT,
 				TSK_YARA_HIT,
 				TSK_GPS_AREA,
-				TSK_WEB_CATEGORIZATION
+				TSK_WEB_CATEGORIZATION,
+				TSK_PREVIOUSLY_SEEN,
+				TSK_PREVIOUSLY_UNSEEN,
+				TSK_PREVIOUSLY_NOTABLE,
+				TSK_MATCHING_PERSONA
 		).collect(Collectors.toMap(type -> type.getTypeID(), type -> type)));
 
 		private final String typeName;
@@ -1849,8 +1873,30 @@ public enum ARTIFACT_TYPE implements SleuthkitVisitableItem {
 		TSK_GPS_AREA(67, "TSK_GPS_AREA",
 				bundle.getString("BlackboardArtifact.tskGPSArea.text"), Category.DATA_ARTIFACT),
 		TSK_WEB_CATEGORIZATION(68, "TSK_WEB_CATEGORIZATION",
-				bundle.getString("BlackboardArtifact.tskWebCategorization.text"), Category.ANALYSIS_RESULT),;
+				bundle.getString("BlackboardArtifact.tskWebCategorization.text"), Category.ANALYSIS_RESULT),
+		/**
+		 * Indicates that the file or artifact was previously seen in another Autopsy case.
+		 */
+		TSK_PREVIOUSLY_SEEN(69, "TSK_PREVIOUSLY_SEEN",
+				bundle.getString("BlackboardArtifact.tskPreviouslySeen.text"), Category.ANALYSIS_RESULT),		
+		/**
+		 * Indicates that the file or artifact was previously unseen in another Autopsy case.
+		 */
+		TSK_PREVIOUSLY_UNSEEN(70, "TSK_PREVIOUSLY_UNSEEN",
+				bundle.getString("BlackboardArtifact.tskPreviouslyUnseen.text"), Category.ANALYSIS_RESULT),
+		/**
+		 * Indicates that the file or artifact was previously tagged as "Notable" in another Autopsy case.
+		 */
+		TSK_PREVIOUSLY_NOTABLE(71, "TSK_PREVIOUSLY_NOTABLE",
+				bundle.getString("BlackboardArtifact.tskPreviouslyNotable.text"), Category.ANALYSIS_RESULT),
+		
+		/**
+		 * *TEMPORARY* Indicates that the artifact is associated with a persona.
+		 */
+		TSK_MATCHING_PERSONA(72, "TSK_MATCHING_PERSONA",
+				bundle.getString("BlackboardArtifact.tskMatchingPersona.text"), Category.ANALYSIS_RESULT);
 
+		
 		/*
 		 * To developers: For each new artifact, ensure that: - The enum value
 		 * has 1-line JavaDoc description - The artifact catalog
diff --git a/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java b/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java
index 5696355d4cd0f109aa1d5887208f19d78342418c..508c45bd795a892d5e30a1f290957bfd28bd0359 100755
--- a/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java
@@ -609,6 +609,10 @@ public static final class Type implements Serializable {
 		public static final Type TSK_HOST = new Type(154, "TSK_HOST", bundle.getString("BlackboardAttribute.tskHost.text"), TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING);
 		public static final Type TSK_HOME_DIR = new Type(155, "TSK_HOME_DIR", bundle.getString("BlackboardAttribute.tskHomeDir.text"), TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING);
 		public static final Type TSK_IS_ADMIN = new Type(156, "TSK_IS_ADMIN", bundle.getString("BlackboardAttribute.tskIsAdmin.text"), TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.INTEGER);
+		public static final Type TSK_CORRELATION_TYPE = new Type(157, "TSK_CORRELATION_TYPE", bundle.getString("BlackboardAttribute.tskCorrelationType.text"), TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING);
+		public static final Type TSK_CORRELATION_VALUE = new Type(158, "TSK_CORRELATION_VALUE", bundle.getString("BlackboardAttribute.tskCorrelationValue.text"), TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING);
+		public static final Type TSK_OTHER_CASES = new Type(159, "TSK_OTHER_CASES", bundle.getString("BlackboardAttribute.tskOtherCases.text"), TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING);
+		
 		// NOTE: When adding a new standard BlackboardAttribute.Type, add the instance and then add to the STANDARD_TYPES list.
 		/**
 		 * A list of all the standard attribute types.
@@ -761,7 +765,10 @@ public static final class Type implements Serializable {
 				TSK_REALM,
 				TSK_HOST,
 				TSK_HOME_DIR,
-				TSK_IS_ADMIN
+				TSK_IS_ADMIN,
+				TSK_CORRELATION_TYPE,
+				TSK_CORRELATION_VALUE,
+				TSK_OTHER_CASES
 		));
 
 		private static final long serialVersionUID = 1L;
@@ -1529,7 +1536,16 @@ public enum ATTRIBUTE_TYPE {
 				TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING),
 		TSK_IS_ADMIN(156, "TSK_IS_ADMIN",
 				bundle.getString("BlackboardAttribute.tskIsAdmin.text"),
-				TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.INTEGER),;
+				TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.INTEGER),
+		TSK_CORRELATION_TYPE(157, "TSK_CORRELATION_TYPE",
+				bundle.getString("BlackboardAttribute.tskCorrelationType.text"),
+				TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING),
+		TSK_CORRELATION_VALUE(158, "TSK_CORRELATION_VALUE",
+				bundle.getString("BlackboardAttribute.tskCorrelationValue.text"),
+				TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING),
+		TSK_OTHER_CASES(159, "TSK_OTHER_CASES",
+				bundle.getString("BlackboardAttribute.tskOtherCases.text"),
+				TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING),;
 
 		private final int typeID;
 		private final String typeName;
diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
index 6a52a5d8b40a1cd2aa94183251e69c4f62ae45f7..a55bcfc11abf62aeba1a91f1dc27fdd87d67f274 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
+++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties
@@ -64,6 +64,10 @@ BlackboardArtifact.tskUserDeviceEvent.text=User Device Events
 BlackboardArtifact.shortDescriptionDate.text=at {0}
 BlackboardArtifact.tskAssociatedObject.text=Associated Object
 BlackboardArtifact.tskWebCategorization.text=Web Categories
+BlackboardArtifact.tskPreviouslySeen.text=Previously Seen
+BlackboardArtifact.tskPreviouslyUnseen.text=Previously Unseen
+BlackboardArtifact.tskPreviouslyNotable.text=Previously Notable
+BlackboardArtifact.tskMatchingPersona.text=Matching Persona
 BlackboardArtifact.tskYaraHit.text=YARA Hit
 BlackboardArtifact.tskGPSArea.text=GPS Area
 BlackboardAttribute.tskAccountType.text=Account Type
@@ -216,6 +220,9 @@ BlackboardAttribute.tskRealm.text=Realm
 BlackboardAttribute.tskHost.text=Host
 BlackboardAttribute.tskHomeDir.text=Home Directory
 BlackboardAttribute.tskIsAdmin.text=Is Administrator
+BlackboardAttribute.tskCorrelationType.text=Correlation Type
+BlackboardAttribute.tskCorrelationValue.text=Correlation Value
+BlackboardAttribute.tskOtherCases.text=Other Cases
 AbstractFile.readLocal.exception.msg4.text=Error reading local file\: {0}
 AbstractFile.readLocal.exception.msg1.text=Error reading local file, local path is not set
 AbstractFile.readLocal.exception.msg2.text=Error reading local file, it does not exist at local path\: {0}
diff --git a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED
index 6a52a5d8b40a1cd2aa94183251e69c4f62ae45f7..a55bcfc11abf62aeba1a91f1dc27fdd87d67f274 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED
+++ b/bindings/java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED
@@ -64,6 +64,10 @@ BlackboardArtifact.tskUserDeviceEvent.text=User Device Events
 BlackboardArtifact.shortDescriptionDate.text=at {0}
 BlackboardArtifact.tskAssociatedObject.text=Associated Object
 BlackboardArtifact.tskWebCategorization.text=Web Categories
+BlackboardArtifact.tskPreviouslySeen.text=Previously Seen
+BlackboardArtifact.tskPreviouslyUnseen.text=Previously Unseen
+BlackboardArtifact.tskPreviouslyNotable.text=Previously Notable
+BlackboardArtifact.tskMatchingPersona.text=Matching Persona
 BlackboardArtifact.tskYaraHit.text=YARA Hit
 BlackboardArtifact.tskGPSArea.text=GPS Area
 BlackboardAttribute.tskAccountType.text=Account Type
@@ -216,6 +220,9 @@ BlackboardAttribute.tskRealm.text=Realm
 BlackboardAttribute.tskHost.text=Host
 BlackboardAttribute.tskHomeDir.text=Home Directory
 BlackboardAttribute.tskIsAdmin.text=Is Administrator
+BlackboardAttribute.tskCorrelationType.text=Correlation Type
+BlackboardAttribute.tskCorrelationValue.text=Correlation Value
+BlackboardAttribute.tskOtherCases.text=Other Cases
 AbstractFile.readLocal.exception.msg4.text=Error reading local file\: {0}
 AbstractFile.readLocal.exception.msg1.text=Error reading local file, local path is not set
 AbstractFile.readLocal.exception.msg2.text=Error reading local file, it does not exist at local path\: {0}
diff --git a/bindings/java/src/org/sleuthkit/datamodel/Content.java b/bindings/java/src/org/sleuthkit/datamodel/Content.java
index 39df2ae626069ff0dec5310be61cb7e55873c011..5993ac460165046abba1e0ec0cf1603f181e397a 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/Content.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/Content.java
@@ -211,7 +211,7 @@ public interface Content extends SleuthkitVisitableItem {
 	 * @param justification	 Justification
 	 * @param attributesList Additional attributes to attach to this analysis
 	 *                       result artifact.
-	 * @param dataDourcrId   The data source for the analysis result
+	 * @param dataSourceId   The data source for the analysis result
 	 *
 	 * @return AnalysisResultAdded The analysis return added and the current
 	 *         aggregate score of content.