diff --git a/API-CHANGES.txt b/API-CHANGES.txt
index 18c4bc6f4ea01e365326ebb8da4b0a8403463885..d008b21af5e26ccc39aae385f04993d62a8fe132 100644
--- a/API-CHANGES.txt
+++ b/API-CHANGES.txt
@@ -1,3 +1,4 @@
 Changes to make once we are ready to do a backwards incompatible change.
 - TSK_SERVICE_ACCOUNT to TSK_ACCOUNT
 - HashDB to use new TSK_BASE_HASHDB enum instead of its own ENUM
+- Java SLeuthkitCase.addArtifactType shoudl return different if artifact already exists or getArtifactId should....
diff --git a/bindings/java/src/org/sleuthkit/datamodel/AbstractContent.java b/bindings/java/src/org/sleuthkit/datamodel/AbstractContent.java
index fcec827f006e7ea5c9d89f9f554bb8876cf64185..d618e915decc462e5e336d3263a82092d69d63c0 100755
--- a/bindings/java/src/org/sleuthkit/datamodel/AbstractContent.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/AbstractContent.java
@@ -208,6 +208,18 @@ public ArrayList<BlackboardArtifact> getArtifacts(int artifactTypeID) throws Tsk
 	public ArrayList<BlackboardArtifact> getArtifacts(BlackboardArtifact.ARTIFACT_TYPE type) throws TskCoreException {
 		return db.getBlackboardArtifacts(type, objId);
 	}
+	
+	@Override
+	public BlackboardArtifact getGenInfoArtifact() throws TskCoreException {
+		ArrayList<BlackboardArtifact> arts = getArtifacts(BlackboardArtifact.ARTIFACT_TYPE.TSK_GEN_INFO);
+		if (arts.isEmpty()) {
+			BlackboardArtifact art = newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_GEN_INFO);
+			return art;
+		}
+		else {
+			return arts.get(0);
+		}
+	}
 
 	@Override
 	public ArrayList<BlackboardArtifact> getAllArtifacts() throws TskCoreException {
diff --git a/bindings/java/src/org/sleuthkit/datamodel/Content.java b/bindings/java/src/org/sleuthkit/datamodel/Content.java
index e918e701f932810f1d0d44f755752b6cc36b5d6a..d8b87688c1ee78dbf59dd7b8822013da1b83f536 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/Content.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/Content.java
@@ -163,6 +163,16 @@ public interface Content extends SleuthkitVisitableItem {
 	 */
 	public ArrayList<BlackboardArtifact> getArtifacts(String artifactTypeName) throws TskCoreException;
 
+	
+	/**
+	 * Return the TSK_GEN_INFO artifact for the file so that individual attributes 
+	 * can be added to it.
+	 * 
+	 * @returna Instance of the TSK_GEN_INFO artifact
+	 * @throws TskCoreException 
+	 */
+	public BlackboardArtifact getGenInfoArtifact() throws TskCoreException;
+	
 	/**
 	 * Get all artifacts associated with this content that have the given type
 	 * id