diff --git a/datamanager/src/main/java/eu/arrowhead/core/datamanager/DataManagerController.java b/datamanager/src/main/java/eu/arrowhead/core/datamanager/DataManagerController.java
index 454c6991e..488a09d00 100644
--- a/datamanager/src/main/java/eu/arrowhead/core/datamanager/DataManagerController.java
+++ b/datamanager/src/main/java/eu/arrowhead/core/datamanager/DataManagerController.java
@@ -334,7 +334,7 @@ public class DataManagerController {
 		@ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = CoreCommonConstants.SWAGGER_HTTP_500_MESSAGE)
 	})
 	@GetMapping(value= CommonConstants.OP_DATAMANAGER_PROXY + "/{systemName}/{serviceName}", produces = MediaType.APPLICATION_JSON_VALUE)
-	@ResponseBody public Vector<SenML> proxyServiceGet(@PathVariable(value="systemName", required=true) final String systemName,
+	@ResponseBody public List<SenML> proxyServiceGet(@PathVariable(value="systemName", required=true) final String systemName,
 													   @PathVariable(value="serviceName", required=true) final String serviceName) {
         if (Utilities.isEmpty(systemName) || Utilities.isEmpty(serviceName)) {
             throw new InvalidParameterException(OP_NOT_VALID_ERROR_MESSAGE, HttpStatus.SC_BAD_REQUEST, CommonConstants.OP_DATAMANAGER_PROXY);
diff --git a/datamanager/src/main/java/eu/arrowhead/core/datamanager/HistorianWSHandler.java b/datamanager/src/main/java/eu/arrowhead/core/datamanager/HistorianWSHandler.java
index a55147747..156985518 100644
--- a/datamanager/src/main/java/eu/arrowhead/core/datamanager/HistorianWSHandler.java
+++ b/datamanager/src/main/java/eu/arrowhead/core/datamanager/HistorianWSHandler.java
@@ -54,7 +54,7 @@ public class HistorianWSHandler extends TextWebSocketHandler {
     @Autowired
     private DataManagerDriver dataManagerDriver;
 
-    @Autowired
+    @Autowired(required = false)
     private DatamanagerACLFilter dataManagerACLFilter;
 
     //=================================================================================================
@@ -96,7 +96,9 @@ protected void handleTextMessage(final WebSocketSession session, final TextMessa
             payload = message.getPayload();
 
 		    logger.debug("Got message for {}/{}", systemName, serviceName);
-            final boolean authorized = dataManagerACLFilter.checkRequest(CN, DatamanagerACLFilter.ACL_METHOD_PUT, CommonConstants.DATAMANAGER_URI + CommonConstants.OP_DATAMANAGER_HISTORIAN + "/ws/" + attributes.get(WSConstants.SYSTEM_ID) + "/" +
+            boolean authorized = true;
+            if (dataManagerACLFilter != null)
+                authorized = dataManagerACLFilter.checkRequest(CN, DatamanagerACLFilter.ACL_METHOD_PUT, CommonConstants.DATAMANAGER_URI + CommonConstants.OP_DATAMANAGER_HISTORIAN + "/ws/" + attributes.get(WSConstants.SYSTEM_ID) + "/" +
             															 attributes.get(WSConstants.SERVICE_ID));
             if (authorized) {
                 final Vector<SenML> sml = gson.fromJson(payload, new TypeToken<Vector<SenML>>(){}.getType());
diff --git a/datamanager/src/main/java/eu/arrowhead/core/datamanager/service/ProxyElement.java b/datamanager/src/main/java/eu/arrowhead/core/datamanager/service/ProxyElement.java
index 07a0c7a6d..526303f74 100644
--- a/datamanager/src/main/java/eu/arrowhead/core/datamanager/service/ProxyElement.java
+++ b/datamanager/src/main/java/eu/arrowhead/core/datamanager/service/ProxyElement.java
@@ -13,14 +13,14 @@
  ********************************************************************************/
 package eu.arrowhead.core.datamanager.service;
 
-import java.util.Vector;
+import java.util.List;
 import eu.arrowhead.common.dto.shared.SenML;
 
 public class ProxyElement {
 
   private String systemName = null;
   private String serviceName = null;
-  private Vector<SenML> message = null;
+  private List<SenML> message = null;
 
 
   public ProxyElement(final String systemName, final String serviceName) {
@@ -30,7 +30,7 @@ public ProxyElement(final String systemName, final String serviceName) {
   }
 
 
-  public ProxyElement(final String systemName, final String serviceName, final Vector<SenML> message) {
+  public ProxyElement(final String systemName, final String serviceName, final List<SenML> message) {
     this.systemName = systemName;
     this.serviceName = serviceName;
     this.message = message;
@@ -42,8 +42,8 @@ public ProxyElement(final String systemName, final String serviceName, final Vec
   public String getServiceName() {return serviceName; };
   public void setServiceName(final String serviceName) {this.serviceName = serviceName; };
  
-  public Vector<SenML> getMessage() {return message; };
-  public void setMessage(final Vector<SenML> message) {this.message = message; };
+  public List<SenML> getMessage() {return message; };
+  public void setMessage(final List<SenML> message) {this.message = message; };
  
 }