diff --git a/api/src/main/java/org/openmrs/module/reporting/serializer/ReportingSerializer.java b/api/src/main/java/org/openmrs/module/reporting/serializer/ReportingSerializer.java
index 4e1a248cb8..36e5042a72 100644
--- a/api/src/main/java/org/openmrs/module/reporting/serializer/ReportingSerializer.java
+++ b/api/src/main/java/org/openmrs/module/reporting/serializer/ReportingSerializer.java
@@ -60,28 +60,33 @@ public Object unmarshal(HierarchicalStreamReader reader, Object root) {
 	            return unmarshal(reader, root, cache.get());
 	        }
 	    });
+	}
+
+	@Override
+	protected void initXStream(XStream xstream) {
+		super.initXStream(xstream);
 
-	    Mapper mapper = xstream.getMapper();
-	    ConverterLookup converterLookup = xstream.getConverterLookup();
+		Mapper mapper = xstream.getMapper();
+		ConverterLookup converterLookup = xstream.getConverterLookup();
 
-	    xstream.registerConverter(new PersonQueryConverter(mapper, converterLookup));
-	    xstream.registerConverter(new CohortDefinitionConverter(mapper, converterLookup));
-	    xstream.registerConverter(new EncounterQueryConverter(mapper, converterLookup));
-	    xstream.registerConverter(new ObsQueryConverter(mapper, converterLookup));
+		xstream.registerConverter(new PersonQueryConverter(mapper, converterLookup));
+		xstream.registerConverter(new CohortDefinitionConverter(mapper, converterLookup));
+		xstream.registerConverter(new EncounterQueryConverter(mapper, converterLookup));
+		xstream.registerConverter(new ObsQueryConverter(mapper, converterLookup));
 		xstream.registerConverter(new CalculationRegistrationShortConverter(mapper, converterLookup));
 
 		xstream.registerConverter(new PersonDataDefinitionConverter(mapper, converterLookup));
-	    xstream.registerConverter(new PatientDataDefinitionConverter(mapper, converterLookup));
-	    xstream.registerConverter(new EncounterDataDefinitionConverter(mapper, converterLookup));
-	    
-	    xstream.registerConverter(new DataSetDefinitionConverter(mapper, converterLookup));
-	    
-	    xstream.registerConverter(new DimensionConverter(mapper, converterLookup));
-	    xstream.registerConverter(new IndicatorConverter(mapper, converterLookup));
+		xstream.registerConverter(new PatientDataDefinitionConverter(mapper, converterLookup));
+		xstream.registerConverter(new EncounterDataDefinitionConverter(mapper, converterLookup));
+
+		xstream.registerConverter(new DataSetDefinitionConverter(mapper, converterLookup));
+
+		xstream.registerConverter(new DimensionConverter(mapper, converterLookup));
+		xstream.registerConverter(new IndicatorConverter(mapper, converterLookup));
 
 		xstream.registerConverter(new ReportDefinitionConverter(mapper, converterLookup));
 	}
-	
+
 	@Override
 	synchronized public <T> T deserialize(String serializedObject, Class<? extends T> clazz) throws SerializationException {
 		boolean cacheOwner = cache.get() == null;
@@ -105,7 +110,7 @@ synchronized public <T> T deserialize(String serializedObject, Class<? extends T
      */
     public void serializeToStream(Object object, OutputStream out) {
         try {
-            xstream.toXML(object, new OutputStreamWriter(out, "UTF-8"));
+            getXstream().toXML(object, new OutputStreamWriter(out, "UTF-8"));
         } catch (UnsupportedEncodingException e) {
             throw new IllegalStateException("Unsupported encoding", e);
         }
diff --git a/pom.xml b/pom.xml
index b13117eb72..0dc87c0c3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
 		<reportingCompatibilityVersion>2.0.6</reportingCompatibilityVersion>
 		<openMRSMinorVersion>1.9</openMRSMinorVersion>
 		<htmlwidgetsVersion>1.7.2</htmlwidgetsVersion>
-		<serializationVersion>0.2.14</serializationVersion>
+		<serializationVersion>0.2.17-SNAPSHOT</serializationVersion>
 		<calculationVersion>1.2</calculationVersion>
 		<jacksonVersion>1.5.0</jacksonVersion>
 		<quartzVersion>2.1.1</quartzVersion>