diff --git a/pom.xml b/pom.xml
index db09499..b132eb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.onap.sdc.jtosca</groupId>
 	<artifactId>jtosca</artifactId>
-	<version>1.4.0-SNAPSHOT</version>
+	<version>1.4.1-SNAPSHOT</version>
 	<name>sdc-jtosca</name>
 	<properties>
 
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/InterfacesDef.java b/src/main/java/org/onap/sdc/toscaparser/api/elements/InterfacesDef.java
index 86333d6..3edf3b7 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/InterfacesDef.java
+++ b/src/main/java/org/onap/sdc/toscaparser/api/elements/InterfacesDef.java
@@ -31,7 +31,7 @@
 
 	private String operationName;
 	private Object operationDef;
-	private String implementation;
+	private Object implementation;
 	private LinkedHashMap<String,Object> inputs;
 	private String description;
 
@@ -85,7 +85,7 @@
 			if(ivalue instanceof LinkedHashMap) {
 				for(Map.Entry<String,Object> me: ((LinkedHashMap<String,Object>)ivalue).entrySet()) {
 					if(me.getKey().equals(IMPLEMENTATION)) {
-						implementation = (String)me.getValue();
+						implementation = me.getValue();
 					}
 					else if(me.getKey().equals(INPUTS)) {
 						inputs = (LinkedHashMap<String,Object>)me.getValue();
@@ -148,11 +148,11 @@
 		inputs.put(name, value);
 	}
 
-	public String getImplementation(){
+	public Object getImplementation(){
 		return  implementation;
 	}
 
-	public void setImplementation(String implementation){
+	public void setImplementation(Object implementation){
 		this.implementation = implementation;
 	}
 
diff --git a/version.properties b/version.properties
index d709d86..a169fce 100644
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 major=1
 minor=4
-patch=0
+patch=1
 
 base_version=${major}.${minor}.${patch}
 
