diff --git a/dspace-api/src/main/java/org/dspace/submit/model/UploadConfiguration.java b/dspace-api/src/main/java/org/dspace/submit/model/UploadConfiguration.java
index 306891ec14..fc4db44c5b 100644
--- a/dspace-api/src/main/java/org/dspace/submit/model/UploadConfiguration.java
+++ b/dspace-api/src/main/java/org/dspace/submit/model/UploadConfiguration.java
@@ -19,7 +19,7 @@ public class UploadConfiguration<T extends SubmissionFormField>{
 	
 	private ConfigurationService configurationService;
 	
-	private List<T> metadata;
+	private String metadataDefinition;
 	private List<AccessConditionOption> options;
 	private Long maxSize;
 	private Boolean required;
@@ -33,12 +33,12 @@ public class UploadConfiguration<T extends SubmissionFormField>{
 		this.options = options;
 	}
 
-	public List<T> getMetadata() {
-		return metadata;
+	public String getMetadata() {
+		return metadataDefinition;
 	}
 
-	public void setMetadata(List<T> metadata) {
-		this.metadata = metadata;
+	public void setMetadata(String metadata) {
+		this.metadataDefinition = metadata;
 	}
 
 	public Long getMaxSize() {
diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/SubmissionUploadRest.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/SubmissionUploadRest.java
index 5479785e9b..67ce8dbeb5 100644
--- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/SubmissionUploadRest.java
+++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/model/SubmissionUploadRest.java
@@ -13,6 +13,7 @@ import java.util.List;
 import org.dspace.app.rest.RestResourceController;
 import org.dspace.submit.model.AccessConditionOption;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
@@ -29,9 +30,10 @@ public class SubmissionUploadRest extends BaseObjectRest<String> {
 
 	private String name;
 	
-	private List<SubmissionFormFieldRest> metadata;
+	@JsonIgnore
+	private SubmissionFormRest metadata;
 
-	private List<AccessConditionOptionRest> accessConditions;
+	private List<AccessConditionOptionRest> accessConditionOptions;
 	
 	private boolean required;
 	
diff --git a/dspace/config/spring/api/access-condition.xml b/dspace/config/spring/api/access-condition.xml
index 875da46cbd..a18deac299 100644
--- a/dspace/config/spring/api/access-condition.xml
+++ b/dspace/config/spring/api/access-condition.xml
@@ -7,12 +7,7 @@
 	<bean id="uploadConfigurationDefault" class="org.dspace.submit.model.UploadConfiguration">
 		<property name="name" value="upload"></property>
 		<property name="configurationService" ref="org.dspace.services.ConfigurationService"/>
-		<property name="metadata">
-			<list>
-                <ref local="fieldBitstreamName"/> 
-                <ref local="fieldBitstreamDescription"/>			
-			</list>
-		</property>
+		<property name="metadata" value="bitstream-metadata" />
         <property name="options">
             <list>
                 <ref local="openAccess"/> 
diff --git a/dspace/config/submission-forms.xml b/dspace/config/submission-forms.xml
index 4f566c111a..c1db8d34b8 100644
--- a/dspace/config/submission-forms.xml
+++ b/dspace/config/submission-forms.xml
@@ -21,7 +21,29 @@
  <!-- serves as a 'this field is required' flag.                           -->
 
  <form-definitions>
+	<form name="bitstream-metadata">
+       <field>
+         <dc-schema>dc</dc-schema>
+         <dc-element>title</dc-element>
+         <dc-qualifier></dc-qualifier>
+         <repeatable>false</repeatable>
+         <label>Title</label>
+         <input-type>onebox</input-type>
+         <hint>Enter the name of the file.</hint>
+         <required>You must enter a main title for this item.</required>
+       </field>
 
+       <field>
+         <dc-schema>dc</dc-schema>
+         <dc-element>description</dc-element>
+         <repeatable>true</repeatable>
+         <label>Description</label>
+         <input-type>textarea</input-type>
+         <hint>Enter a description for the file</hint>
+         <required></required>
+       </field>
+   </form>    
+   
    <form name="traditionalpageone">
        <field>
          <dc-schema>dc</dc-schema>