140 files changed, 3908 insertions, 2331 deletions

diff --git a/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.cpp b/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.cpp
index 46c9704..5d19435 100644
--- a/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.cpp
+++ b/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
diff --git a/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.hpp b/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.hpp
index 90589dc..201d486 100644
--- a/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.hpp
+++ b/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -58,11 +58,8 @@ struct DerivedTypeCollection {
     	}
     
     };
-    typedef std::vector<TestStruct> TestArrayTestStruct;
+    typedef std::vector<DerivedTypeCollection::TestStruct> TestArrayTestStruct;
     typedef std::unordered_map<uint32_t, ::commonapi::tests::DerivedTypeCollection::TestArrayTestStruct> TestMap;
-    /**
-     * description: Common errors.
-     */
     
     struct TestEnum : CommonAPI::Enumeration<int32_t> {
         enum Literal : int32_t {
@@ -72,9 +69,24 @@ struct DerivedTypeCollection {
             E_NOT_USED = 3
         };
         
-        TestEnum() = default;
+        TestEnum()
+            : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(Literal::E_UNKNOWN)) {}
         TestEnum(const Literal &_value) 
             : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_value)) {}
+        TestEnum(const int32_t &_value) 
+            : CommonAPI::Enumeration<int32_t>(_value) {}
+    
+        inline bool validate() const {
+            switch (value_) {
+            case static_cast<int32_t>(Literal::E_UNKNOWN):
+            case static_cast<int32_t>(Literal::E_OK):
+            case static_cast<int32_t>(Literal::E_OUT_OF_RANGE):
+            case static_cast<int32_t>(Literal::E_NOT_USED):
+                return true;
+            default:
+                return false;
+            }
+        }
     
         inline bool operator==(const TestEnum &_other) const { return (value_ == _other.value_); }
         inline bool operator!=(const TestEnum &_other) const { return (value_ != _other.value_); }
@@ -96,14 +108,28 @@ struct DerivedTypeCollection {
             E_NEW = 4
         };
         
-        TestEnumExtended() = default;
+        TestEnumExtended()
+            : TestEnum(static_cast<TestEnum::Literal>(Literal::E_NEW)) {}
         TestEnumExtended(const Literal &_value) 
-            : TestEnum(static_cast<TestEnum::Literal>(_value)) {}
+            : TestEnum(static_cast<int32_t>(_value)) {}
+        TestEnumExtended(const int32_t &_value) 
+            : TestEnum(_value) {}
+        TestEnumExtended(const TestEnum::Literal &_value)
+            : TestEnum(_value) {}
         TestEnumExtended &operator=(const TestEnum::Literal &_value) {
             value_ = static_cast<int32_t>(_value);
             return (*this);
         }
     
+        inline bool validate() const {
+            switch (value_) {
+            case static_cast<int32_t>(Literal::E_NEW):
+                return true;
+            default:
+                return TestEnum::validate();
+            }
+        }
+    
         inline bool operator==(const TestEnumExtended &_other) const { return (value_ == _other.value_); }
         inline bool operator!=(const TestEnumExtended &_other) const { return (value_ != _other.value_); }
         inline bool operator<=(const TestEnumExtended &_other) const { return (value_ <= _other.value_); }
@@ -124,9 +150,16 @@ struct DerivedTypeCollection {
             E_NEW2 = 5
         };
         
-        TestEnumExtended2() = default;
+        TestEnumExtended2()
+            : TestEnumExtended(static_cast<TestEnumExtended::Literal>(Literal::E_NEW2)) {}
         TestEnumExtended2(const Literal &_value) 
-            : TestEnumExtended(static_cast<TestEnumExtended::Literal>(_value)) {}
+            : TestEnumExtended(static_cast<int32_t>(_value)) {}
+        TestEnumExtended2(const int32_t &_value) 
+            : TestEnumExtended(_value) {}
+        TestEnumExtended2(const TestEnum::Literal &_value)
+            : TestEnumExtended(_value) {}
+        TestEnumExtended2(const TestEnumExtended::Literal &_value)
+            : TestEnumExtended(_value) {}
         TestEnumExtended2 &operator=(const TestEnumExtended::Literal &_value) {
             value_ = static_cast<int32_t>(_value);
             return (*this);
@@ -136,6 +169,15 @@ struct DerivedTypeCollection {
             return (*this);
         }
     
+        inline bool validate() const {
+            switch (value_) {
+            case static_cast<int32_t>(Literal::E_NEW2):
+                return true;
+            default:
+                return TestEnumExtended::validate();
+            }
+        }
+    
         inline bool operator==(const TestEnumExtended2 &_other) const { return (value_ == _other.value_); }
         inline bool operator!=(const TestEnumExtended2 &_other) const { return (value_ != _other.value_); }
         inline bool operator<=(const TestEnumExtended2 &_other) const { return (value_ <= _other.value_); }
@@ -187,9 +229,23 @@ struct DerivedTypeCollection {
             E3 = 2
         };
         
-        TestEnumMissingValue() = default;
+        TestEnumMissingValue()
+            : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(Literal::E1)) {}
         TestEnumMissingValue(const Literal &_value) 
             : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_value)) {}
+        TestEnumMissingValue(const int32_t &_value) 
+            : CommonAPI::Enumeration<int32_t>(_value) {}
+    
+        inline bool validate() const {
+            switch (value_) {
+            case static_cast<int32_t>(Literal::E1):
+            case static_cast<int32_t>(Literal::E2):
+            case static_cast<int32_t>(Literal::E3):
+                return true;
+            default:
+                return false;
+            }
+        }
     
         inline bool operator==(const TestEnumMissingValue &_other) const { return (value_ == _other.value_); }
         inline bool operator!=(const TestEnumMissingValue &_other) const { return (value_ != _other.value_); }
@@ -211,7 +267,7 @@ struct DerivedTypeCollection {
     
     struct TestPolymorphicStruct : CommonAPI::PolymorphicStruct {
     	static std::shared_ptr<TestPolymorphicStruct> create(CommonAPI::Serial _serial);
-    	const CommonAPI::Serial getSerial() const {	return TESTPOLYMORPHICSTRUCT_SERIAL; }
+    	CommonAPI::Serial getSerial() const { return TESTPOLYMORPHICSTRUCT_SERIAL; }
     	
     	TestPolymorphicStruct() {
     	}
@@ -245,14 +301,25 @@ struct DerivedTypeCollection {
     			break;
     		}
     	}
-    
     	template<class _Output>
-    	void writeType(CommonAPI::TypeOutputStream<_Output> &_output) {
-    		_output.writeType(std::get<0>(values_));
-    		_output.writeType(std::get<1>(values_));
+    	void writeType(CommonAPI::TypeOutputStream<_Output> &_output, const CommonAPI::EmptyDeployment *_depl) {
+    		_output.writeType(std::get<0>(values_), _depl);
+    		_output.writeType(std::get<1>(values_), _depl);
+    		switch (getSerial()) {
+    		case TESTEXTENDEDPOLYMORPHICSTRUCT_SERIAL:
+    			static_cast<TestExtendedPolymorphicStruct *>(this)->template writeType<_Output>(_output, _depl);
+    			break;
+    		default:
+    			break;
+    		}
+    	}
+    	template<class _Output, class _Deployment>
+    	void writeType(CommonAPI::TypeOutputStream<_Output> &_output, const _Deployment *_depl) {
+    		_output.writeType(std::get<0>(values_), std::get<0>(_depl->values_));
+    		_output.writeType(std::get<1>(values_), std::get<1>(_depl->values_));
     		switch (getSerial()) {
     		case TESTEXTENDEDPOLYMORPHICSTRUCT_SERIAL:
-    			static_cast<TestExtendedPolymorphicStruct *>(this)->template writeType<_Output>(_output);
+    			static_cast<TestExtendedPolymorphicStruct *>(this)->template writeType<_Output, _Deployment>(_output, _depl);
     			break;
     		default:
     			break;
@@ -274,8 +341,8 @@ struct DerivedTypeCollection {
     
     	template<class _Output, class _Deployment>
     	void writeValue(CommonAPI::OutputStream<_Output> &_output, const _Deployment *_depl) {
-    		_output.template writeValue<>(std::get<0>(values_), _depl, std::get<0>(_depl->values_));
-    		_output.template writeValue<>(std::get<1>(values_), _depl, std::get<1>(_depl->values_));
+    		_output.template writeValue<>(std::get<0>(values_), std::get<0>(_depl->values_));
+    		_output.template writeValue<>(std::get<1>(values_), std::get<1>(_depl->values_));
     		switch (getSerial()) {
     		case TESTEXTENDEDPOLYMORPHICSTRUCT_SERIAL:
     			static_cast<TestExtendedPolymorphicStruct *>(this)->template writeValue<>(_output, _depl);
@@ -303,7 +370,7 @@ struct DerivedTypeCollection {
     
     };
     struct TestExtendedPolymorphicStruct : TestPolymorphicStruct {
-    	const CommonAPI::Serial getSerial() const {	return TESTEXTENDEDPOLYMORPHICSTRUCT_SERIAL; }
+    	CommonAPI::Serial getSerial() const { return TESTEXTENDEDPOLYMORPHICSTRUCT_SERIAL; }
     	
     	TestExtendedPolymorphicStruct() {
     	}
@@ -314,6 +381,7 @@ struct DerivedTypeCollection {
     	}
     	template<class _Input>
     	void readValue(CommonAPI::InputStream<_Input> &_input, const CommonAPI::EmptyDeployment *_depl) {
+    	    (void) _depl;
     		_input.template readValue<CommonAPI::EmptyDeployment>(std::get<0>(values_));
     	}
     
@@ -321,20 +389,24 @@ struct DerivedTypeCollection {
     	void readValue(CommonAPI::InputStream<_Input> &_input, const _Deployment *_depl) {
     		_input.template readValue<>(std::get<0>(values_), std::get<2>(_depl->values_));
     	}
-    
     	template<class _Output>
-    	void writeType(CommonAPI::TypeOutputStream<_Output> &_output) {
-    		_output.writeType(std::get<0>(values_));
+    	void writeType(CommonAPI::TypeOutputStream<_Output> &_output, const CommonAPI::EmptyDeployment *_depl) {
+    		_output.writeType(std::get<0>(values_), _depl);
+    	}
+    	template<class _Output, class _Deployment>
+    	void writeType(CommonAPI::TypeOutputStream<_Output> &_output, const _Deployment *_depl) {
+    		_output.writeType(std::get<0>(values_), std::get<2>(_depl->values_));
     	}
     
     	template<class _Output>
     	void writeValue(CommonAPI::OutputStream<_Output> &_output, const CommonAPI::EmptyDeployment *_depl) {
+    	    (void) _depl;
     		_output.template writeValue<CommonAPI::EmptyDeployment>(std::get<0>(values_));
     	}
     
     	template<class _Output, class _Deployment>
     	void writeValue(CommonAPI::OutputStream<_Output> &_output, const _Deployment *_depl) {
-    		_output.template writeValue<>(std::get<0>(values_), _depl, std::get<2>(_depl->values_));
+    		_output.template writeValue<>(std::get<0>(values_), std::get<2>(_depl->values_));
     	}
     	inline const uint32_t &getAdditionalValue() const { return std::get<0>(values_); }
     	inline void setAdditionalValue(const uint32_t &_value) { std::get<0>(values_) = _value; }
@@ -431,4 +503,6 @@ namespace std {
     };
 }
 
+
+
 #endif // COMMONAPI_TESTS_Derived_Type_Collection_HPP_
diff --git a/src/test/src-gen/core/commonapi/tests/PredefinedTypeCollection.hpp b/src/test/src-gen/core/commonapi/tests/PredefinedTypeCollection.hpp
index b9f894a..beb2ed8 100644
--- a/src/test/src-gen/core/commonapi/tests/PredefinedTypeCollection.hpp
+++ b/src/test/src-gen/core/commonapi/tests/PredefinedTypeCollection.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -61,4 +61,6 @@ namespace CommonAPI {
 namespace std {
 }
 
+
+
 #endif // COMMONAPI_TESTS_Predefined_Type_Collection_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterface.hpp b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterface.hpp
index 219ef38..2c47dda 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterface.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterface.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -12,7 +12,7 @@
 
 
 
-#include <v1_0/commonapi/tests/TestInterface.hpp>
+#include <v1/commonapi/tests/TestInterface.hpp>
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -22,7 +22,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -46,9 +46,13 @@ CommonAPI::Version ExtendedInterface::getInterfaceVersion() {
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 namespace CommonAPI {
 }
 
+
+// Compatibility
+namespace v1_0 = v1;
+
 #endif // COMMONAPI_TESTS_EXTENDED_INTERFACE_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceProxy.hpp
index 36d9fc0..daebf8c 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceProxy.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,9 +10,9 @@
 #ifndef COMMONAPI_TESTS_Extended_Interface_PROXY_HPP_
 #define COMMONAPI_TESTS_Extended_Interface_PROXY_HPP_
 
-#include <v1_0/commonapi/tests/ExtendedInterfaceProxyBase.hpp>
+#include <v1/commonapi/tests/ExtendedInterfaceProxyBase.hpp>
 
-#include "v1_0/commonapi/tests/TestInterfaceProxy.hpp"
+#include "v1/commonapi/tests/TestInterfaceProxy.hpp"
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -21,7 +21,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -29,8 +29,8 @@ template <typename ... _AttributeExtensions>
 class ExtendedInterfaceProxy
     : virtual public ExtendedInterface, 
       virtual public ExtendedInterfaceProxyBase,
-      virtual public TestInterfaceProxy<_AttributeExtensions...>,
-      public _AttributeExtensions... {
+      public TestInterfaceProxy<_AttributeExtensions...>,
+      virtual public _AttributeExtensions... {
 public:
     ExtendedInterfaceProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
     ~ExtendedInterfaceProxy();
@@ -62,7 +62,7 @@ public:
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> TestIntMethodExtendedAsync(const uint32_t &_inInt, TestIntMethodExtendedAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr);
+    virtual std::future<CommonAPI::CallStatus> TestIntMethodExtendedAsync(const uint32_t &_inInt, TestIntMethodExtendedAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr);
 
 
     /**
@@ -104,7 +104,7 @@ typedef ExtendedInterfaceProxy<> ExtendedInterfaceProxyDefault;
 //
 template <typename ... _AttributeExtensions>
 ExtendedInterfaceProxy<_AttributeExtensions...>::ExtendedInterfaceProxy(std::shared_ptr<CommonAPI::Proxy> delegate):
-        TestInterfaceProxy<_AttributeExtensions...>(delegate),
+        ::v1::commonapi::tests::TestInterfaceProxy<_AttributeExtensions...>(delegate),
         _AttributeExtensions(*(std::dynamic_pointer_cast<ExtendedInterfaceProxyBase>(delegate)))...,
         delegate_(std::dynamic_pointer_cast<ExtendedInterfaceProxyBase>(delegate)) {
 }
@@ -151,7 +151,11 @@ CommonAPI::InterfaceVersionAttribute& ExtendedInterfaceProxy<_AttributeExtension
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 
+
+// Compatibility
+namespace v1_0 = v1;
+
 #endif // COMMONAPI_TESTS_Extended_Interface_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceProxyBase.hpp
index 852ff96..3dfb547 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceProxyBase.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,8 +10,8 @@
 #ifndef COMMONAPI_TESTS_Extended_Interface_PROXY_BASE_HPP_
 #define COMMONAPI_TESTS_Extended_Interface_PROXY_BASE_HPP_
 
-#include <v1_0/commonapi/tests/ExtendedInterface.hpp>
-#include <v1_0/commonapi/tests/TestInterfaceProxyBase.hpp>
+#include <v1/commonapi/tests/ExtendedInterface.hpp>
+#include <v1/commonapi/tests/TestInterfaceProxyBase.hpp>
 
 
 
@@ -27,7 +27,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -40,11 +40,15 @@ public:
 
 
     virtual void TestIntMethodExtended(const uint32_t &_inInt, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info = nullptr) = 0;
-    virtual std::future<CommonAPI::CallStatus> TestIntMethodExtendedAsync(const uint32_t &_inInt, TestIntMethodExtendedAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr) = 0;
+    virtual std::future<CommonAPI::CallStatus> TestIntMethodExtendedAsync(const uint32_t &_inInt, TestIntMethodExtendedAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr) = 0;
 };
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_Extended_Interface_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStub.hpp
index 551fc0f..7618ad1 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStub.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -14,9 +14,9 @@
 
 
 
-#include <v1_0/commonapi/tests/TestInterfaceStub.hpp>
+#include <v1/commonapi/tests/TestInterfaceStub.hpp>
 
-#include <v1_0/commonapi/tests/ExtendedInterface.hpp>
+#include <v1/commonapi/tests/ExtendedInterface.hpp>
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -28,7 +28,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -39,8 +39,8 @@ namespace tests {
  * An application developer should not need to bother with this class.
  */
 class ExtendedInterfaceStubAdapter
-    : virtual public CommonAPI::StubAdapter, 
-      public ExtendedInterface, 
+    : public virtual CommonAPI::StubAdapter, 
+      public virtual ExtendedInterface, 
       public virtual TestInterfaceStubAdapter {
  public:
 
@@ -103,6 +103,10 @@ public:
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_Extended_Interface_STUB_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStubDefault.cpp
index 09d45b0..6f9de13 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStubDefault.cpp
@@ -1,16 +1,16 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#include <v1_0/commonapi/tests/ExtendedInterfaceStubDefault.hpp>
+#include <v1/commonapi/tests/ExtendedInterfaceStubDefault.hpp>
 #include <assert.h>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -20,6 +20,7 @@ ExtendedInterfaceStubDefault::ExtendedInterfaceStubDefault():
 }
 
 const CommonAPI::Version& ExtendedInterfaceStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> _client) {
+    (void)_client;
     return interfaceVersion_;
 }
 
@@ -31,6 +32,8 @@ ExtendedInterfaceStubRemoteEvent* ExtendedInterfaceStubDefault::initStubAdapter(
 
 
 void ExtendedInterfaceStubDefault::TestIntMethodExtended(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t _inInt, TestIntMethodExtendedReply_t _reply) {
+    (void)_client;
+    (void) _inInt;
     _reply();
 }
 
@@ -44,4 +47,4 @@ ExtendedInterfaceStubDefault::RemoteEventHandler::RemoteEventHandler(ExtendedInt
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStubDefault.hpp
index 07f0218..3f36ee3 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStubDefault.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,12 +10,12 @@
 #ifndef COMMONAPI_TESTS_Extended_Interface_STUB_DEFAULT_HPP_
 #define COMMONAPI_TESTS_Extended_Interface_STUB_DEFAULT_HPP_
 
-#include <v1_0/commonapi/tests/TestInterfaceStubDefault.hpp>
+#include <v1/commonapi/tests/TestInterfaceStubDefault.hpp>
 
-#include <v1_0/commonapi/tests/ExtendedInterfaceStub.hpp>
+#include <v1/commonapi/tests/ExtendedInterfaceStub.hpp>
 #include <sstream>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -62,6 +62,10 @@ private:
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_Extended_Interface_STUB_DEFAULT
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterface.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterface.hpp
index 9227a55..4383045 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterface.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterface.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -12,7 +12,7 @@
 
 
 
-#include <v1_0/commonapi/tests/TestFreedesktopInterface.hpp>
+#include <v1/commonapi/tests/TestFreedesktopInterface.hpp>
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -22,7 +22,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -46,9 +46,13 @@ CommonAPI::Version TestFreedesktopDerivedInterface::getInterfaceVersion() {
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 namespace CommonAPI {
 }
 
+
+// Compatibility
+namespace v1_0 = v1;
+
 #endif // COMMONAPI_TESTS_TEST_FREEDESKTOP_DERIVED_INTERFACE_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxy.hpp
index 8ec26d8..de0af83 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxy.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,9 +10,9 @@
 #ifndef COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_HPP_
 #define COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_HPP_
 
-#include <v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp>
+#include <v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp>
 
-#include "v1_0/commonapi/tests/TestFreedesktopInterfaceProxy.hpp"
+#include "v1/commonapi/tests/TestFreedesktopInterfaceProxy.hpp"
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -23,7 +23,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -31,8 +31,8 @@ template <typename ... _AttributeExtensions>
 class TestFreedesktopDerivedInterfaceProxy
     : virtual public TestFreedesktopDerivedInterface, 
       virtual public TestFreedesktopDerivedInterfaceProxyBase,
-      virtual public TestFreedesktopInterfaceProxy<_AttributeExtensions...>,
-      public _AttributeExtensions... {
+      public TestFreedesktopInterfaceProxy<_AttributeExtensions...>,
+      virtual public _AttributeExtensions... {
 public:
     TestFreedesktopDerivedInterfaceProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
     ~TestFreedesktopDerivedInterfaceProxy();
@@ -116,7 +116,7 @@ namespace TestFreedesktopDerivedInterfaceExtensions {
 //
 template <typename ... _AttributeExtensions>
 TestFreedesktopDerivedInterfaceProxy<_AttributeExtensions...>::TestFreedesktopDerivedInterfaceProxy(std::shared_ptr<CommonAPI::Proxy> delegate):
-        TestFreedesktopInterfaceProxy<_AttributeExtensions...>(delegate),
+        ::v1::commonapi::tests::TestFreedesktopInterfaceProxy<_AttributeExtensions...>(delegate),
         _AttributeExtensions(*(std::dynamic_pointer_cast<TestFreedesktopDerivedInterfaceProxyBase>(delegate)))...,
         delegate_(std::dynamic_pointer_cast<TestFreedesktopDerivedInterfaceProxyBase>(delegate)) {
 }
@@ -154,16 +154,20 @@ CommonAPI::InterfaceVersionAttribute& TestFreedesktopDerivedInterfaceProxy<_Attr
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 namespace CommonAPI {
 template<template<typename > class _AttributeExtension>
-struct DefaultAttributeProxyHelper<::v1_0::commonapi::tests::TestFreedesktopDerivedInterfaceProxy,
+struct DefaultAttributeProxyHelper<::v1::commonapi::tests::TestFreedesktopDerivedInterfaceProxy,
     _AttributeExtension> {
-    typedef typename ::v1_0::commonapi::tests::TestFreedesktopDerivedInterfaceProxy<
-            ::v1_0::commonapi::tests::TestFreedesktopDerivedInterfaceExtensions::TestAttributedFromDerivedInterfaceAttributeExtension<_AttributeExtension>
+    typedef typename ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceProxy<
+            ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceExtensions::TestAttributedFromDerivedInterfaceAttributeExtension<_AttributeExtension>
     > class_t;
 };
 }
 
+
+// Compatibility
+namespace v1_0 = v1;
+
 #endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp
index 6af057d..65f35f8 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,8 +10,8 @@
 #ifndef COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_BASE_HPP_
 #define COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_BASE_HPP_
 
-#include <v1_0/commonapi/tests/TestFreedesktopDerivedInterface.hpp>
-#include <v1_0/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp>
+#include <v1/commonapi/tests/TestFreedesktopDerivedInterface.hpp>
+#include <v1/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp>
 
 
 
@@ -25,7 +25,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -42,6 +42,10 @@ public:
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp
index c37b764..54e7c1c 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -14,9 +14,9 @@
 
 
 
-#include <v1_0/commonapi/tests/TestFreedesktopInterfaceStub.hpp>
+#include <v1/commonapi/tests/TestFreedesktopInterfaceStub.hpp>
 
-#include <v1_0/commonapi/tests/TestFreedesktopDerivedInterface.hpp>
+#include <v1/commonapi/tests/TestFreedesktopDerivedInterface.hpp>
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -27,7 +27,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -38,8 +38,8 @@ namespace tests {
  * An application developer should not need to bother with this class.
  */
 class TestFreedesktopDerivedInterfaceStubAdapter
-    : virtual public CommonAPI::StubAdapter, 
-      public TestFreedesktopDerivedInterface, 
+    : public virtual CommonAPI::StubAdapter, 
+      public virtual TestFreedesktopDerivedInterface, 
       public virtual TestFreedesktopInterfaceStubAdapter {
  public:
     ///Notifies all remote listeners about a change of value of the attribute TestAttributedFromDerivedInterface.
@@ -74,7 +74,7 @@ public:
     virtual ~TestFreedesktopDerivedInterfaceStubRemoteEvent() { }
 
     /// Verification callback for remote set requests on the attribute TestAttributedFromDerivedInterface
-    virtual bool onRemoteSetTestAttributedFromDerivedInterfaceAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t TestAttributedFromDerivedInterface) = 0;
+    virtual bool onRemoteSetTestAttributedFromDerivedInterfaceAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t _value) = 0;
     /// Action callback for remote set requests on the attribute TestAttributedFromDerivedInterface
     virtual void onRemoteTestAttributedFromDerivedInterfaceAttributeChanged() = 0;
 };
@@ -107,6 +107,10 @@ public:
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.cpp
index f9ea339..0e72205 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.cpp
@@ -1,16 +1,16 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#include <v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.hpp>
+#include <v1/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.hpp>
 #include <assert.h>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -20,6 +20,7 @@ TestFreedesktopDerivedInterfaceStubDefault::TestFreedesktopDerivedInterfaceStubD
 }
 
 const CommonAPI::Version& TestFreedesktopDerivedInterfaceStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> _client) {
+    (void)_client;
     return interfaceVersion_;
 }
 
@@ -34,14 +35,17 @@ const uint32_t& TestFreedesktopDerivedInterfaceStubDefault::getTestAttributedFro
 }
 
 const uint32_t& TestFreedesktopDerivedInterfaceStubDefault::getTestAttributedFromDerivedInterfaceAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) {
+    (void)_client;
     return getTestAttributedFromDerivedInterfaceAttribute();
 }
 
 void TestFreedesktopDerivedInterfaceStubDefault::setTestAttributedFromDerivedInterfaceAttribute(uint32_t _value) {
     const bool valueChanged = trySetTestAttributedFromDerivedInterfaceAttribute(std::move(_value));
-    if (valueChanged && CommonAPI::Stub<TestFreedesktopDerivedInterfaceStubAdapter, TestFreedesktopDerivedInterfaceStubRemoteEvent>::stubAdapter_ != NULL) {
-         CommonAPI::Stub<TestFreedesktopDerivedInterfaceStubAdapter, TestFreedesktopDerivedInterfaceStubRemoteEvent>::stubAdapter_->fireTestAttributedFromDerivedInterfaceAttributeChanged(testAttributedFromDerivedInterfaceAttributeValue_);
-     }
+    if (valueChanged) {
+        auto stubAdapter = CommonAPI::Stub<TestFreedesktopDerivedInterfaceStubAdapter, TestFreedesktopDerivedInterfaceStubRemoteEvent>::stubAdapter_.lock();
+        if (stubAdapter)
+            stubAdapter->fireTestAttributedFromDerivedInterfaceAttributeChanged(testAttributedFromDerivedInterfaceAttributeValue_);
+    }
 }
 
 bool TestFreedesktopDerivedInterfaceStubDefault::trySetTestAttributedFromDerivedInterfaceAttribute(uint32_t _value) {
@@ -54,10 +58,12 @@ bool TestFreedesktopDerivedInterfaceStubDefault::trySetTestAttributedFromDerived
 }
 
 bool TestFreedesktopDerivedInterfaceStubDefault::validateTestAttributedFromDerivedInterfaceAttributeRequestedValue(const uint32_t &_value) {
-    return true;
+    (void)_value;
+	return true;
 }
 
 void TestFreedesktopDerivedInterfaceStubDefault::setTestAttributedFromDerivedInterfaceAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t _value) {
+    (void)_client;
     setTestAttributedFromDerivedInterfaceAttribute(_value);
 }
 
@@ -76,6 +82,7 @@ bool TestFreedesktopDerivedInterfaceStubDefault::RemoteEventHandler::onRemoteSet
 }
 
 bool TestFreedesktopDerivedInterfaceStubDefault::RemoteEventHandler::onRemoteSetTestAttributedFromDerivedInterfaceAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t _value) {
+    (void)_client;
     return onRemoteSetTestAttributedFromDerivedInterfaceAttribute(_value);
 }
 
@@ -90,4 +97,4 @@ TestFreedesktopDerivedInterfaceStubDefault::RemoteEventHandler::RemoteEventHandl
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.hpp
index 1eac976..02cacc6 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,12 +10,12 @@
 #ifndef COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_DEFAULT_HPP_
 #define COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_DEFAULT_HPP_
 
-#include <v1_0/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp>
+#include <v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp>
 
-#include <v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp>
+#include <v1/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp>
 #include <sstream>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -66,13 +66,17 @@ protected:
 private:
     TestFreedesktopDerivedInterfaceStubDefault::RemoteEventHandler remoteEventHandler_;
 
-    uint32_t testAttributedFromDerivedInterfaceAttributeValue_;
+    uint32_t testAttributedFromDerivedInterfaceAttributeValue_ {};
 
     CommonAPI::Version interfaceVersion_;
 };
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_DEFAULT
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterface.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterface.hpp
index 06a274f..9d726d3 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterface.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterface.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -21,7 +21,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -44,9 +44,13 @@ CommonAPI::Version TestFreedesktopInterface::getInterfaceVersion() {
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 namespace CommonAPI {
 }
 
+
+// Compatibility
+namespace v1_0 = v1;
+
 #endif // COMMONAPI_TESTS_TEST_FREEDESKTOP_INTERFACE_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceProxy.hpp
index db831bd..08b45ac 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceProxy.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,7 +10,7 @@
 #ifndef COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_HPP_
 #define COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_HPP_
 
-#include <v1_0/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp>
+#include <v1/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp>
 
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
@@ -22,7 +22,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -30,7 +30,7 @@ template <typename ... _AttributeExtensions>
 class TestFreedesktopInterfaceProxy
     : virtual public TestFreedesktopInterface, 
       virtual public TestFreedesktopInterfaceProxyBase,
-      public _AttributeExtensions... {
+      virtual public _AttributeExtensions... {
 public:
     TestFreedesktopInterfaceProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
     ~TestFreedesktopInterfaceProxy();
@@ -232,19 +232,23 @@ CommonAPI::InterfaceVersionAttribute& TestFreedesktopInterfaceProxy<_AttributeEx
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 namespace CommonAPI {
 template<template<typename > class _AttributeExtension>
-struct DefaultAttributeProxyHelper<::v1_0::commonapi::tests::TestFreedesktopInterfaceProxy,
+struct DefaultAttributeProxyHelper<::v1::commonapi::tests::TestFreedesktopInterfaceProxy,
     _AttributeExtension> {
-    typedef typename ::v1_0::commonapi::tests::TestFreedesktopInterfaceProxy<
-            ::v1_0::commonapi::tests::TestFreedesktopInterfaceExtensions::TestPredefinedTypeAttributeAttributeExtension<_AttributeExtension>, 
-            ::v1_0::commonapi::tests::TestFreedesktopInterfaceExtensions::TestReadonlyAttributeAttributeExtension<_AttributeExtension>, 
-            ::v1_0::commonapi::tests::TestFreedesktopInterfaceExtensions::TestDerivedStructAttributeAttributeExtension<_AttributeExtension>, 
-            ::v1_0::commonapi::tests::TestFreedesktopInterfaceExtensions::TestDerivedArrayAttributeAttributeExtension<_AttributeExtension>
+    typedef typename ::v1::commonapi::tests::TestFreedesktopInterfaceProxy<
+            ::v1::commonapi::tests::TestFreedesktopInterfaceExtensions::TestPredefinedTypeAttributeAttributeExtension<_AttributeExtension>, 
+            ::v1::commonapi::tests::TestFreedesktopInterfaceExtensions::TestReadonlyAttributeAttributeExtension<_AttributeExtension>, 
+            ::v1::commonapi::tests::TestFreedesktopInterfaceExtensions::TestDerivedStructAttributeAttributeExtension<_AttributeExtension>, 
+            ::v1::commonapi::tests::TestFreedesktopInterfaceExtensions::TestDerivedArrayAttributeAttributeExtension<_AttributeExtension>
     > class_t;
 };
 }
 
+
+// Compatibility
+namespace v1_0 = v1;
+
 #endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp
index e78cfc2..a4efed7 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,7 +10,7 @@
 #ifndef COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_BASE_HPP_
 #define COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_BASE_HPP_
 
-#include <v1_0/commonapi/tests/TestFreedesktopInterface.hpp>
+#include <v1/commonapi/tests/TestFreedesktopInterface.hpp>
 
 
 #include <commonapi/tests/DerivedTypeCollection.hpp>
@@ -27,7 +27,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -50,6 +50,10 @@ public:
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStub.hpp
index 6bf5ad2..9af7df6 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStub.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -16,7 +16,7 @@
 
 #include <commonapi/tests/DerivedTypeCollection.hpp>
 
-#include <v1_0/commonapi/tests/TestFreedesktopInterface.hpp>
+#include <v1/commonapi/tests/TestFreedesktopInterface.hpp>
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -29,7 +29,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -40,8 +40,8 @@ namespace tests {
  * An application developer should not need to bother with this class.
  */
 class TestFreedesktopInterfaceStubAdapter
-    : virtual public CommonAPI::StubAdapter, 
-      public TestFreedesktopInterface {
+    : public virtual CommonAPI::StubAdapter, 
+      public virtual TestFreedesktopInterface {
  public:
     ///Notifies all remote listeners about a change of value of the attribute TestPredefinedTypeAttribute.
     virtual void fireTestPredefinedTypeAttributeAttributeChanged(const uint32_t& TestPredefinedTypeAttribute) = 0;
@@ -80,15 +80,15 @@ public:
     virtual ~TestFreedesktopInterfaceStubRemoteEvent() { }
 
     /// Verification callback for remote set requests on the attribute TestPredefinedTypeAttribute
-    virtual bool onRemoteSetTestPredefinedTypeAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t TestPredefinedTypeAttribute) = 0;
+    virtual bool onRemoteSetTestPredefinedTypeAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t _value) = 0;
     /// Action callback for remote set requests on the attribute TestPredefinedTypeAttribute
     virtual void onRemoteTestPredefinedTypeAttributeAttributeChanged() = 0;
     /// Verification callback for remote set requests on the attribute TestDerivedStructAttribute
-    virtual bool onRemoteSetTestDerivedStructAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestStructExtended TestDerivedStructAttribute) = 0;
+    virtual bool onRemoteSetTestDerivedStructAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestStructExtended _value) = 0;
     /// Action callback for remote set requests on the attribute TestDerivedStructAttribute
     virtual void onRemoteTestDerivedStructAttributeAttributeChanged() = 0;
     /// Verification callback for remote set requests on the attribute TestDerivedArrayAttribute
-    virtual bool onRemoteSetTestDerivedArrayAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 TestDerivedArrayAttribute) = 0;
+    virtual bool onRemoteSetTestDerivedArrayAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 _value) = 0;
     /// Action callback for remote set requests on the attribute TestDerivedArrayAttribute
     virtual void onRemoteTestDerivedArrayAttributeAttributeChanged() = 0;
 };
@@ -126,6 +126,10 @@ public:
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.cpp
index ff96aed..e06ecaa 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.cpp
@@ -1,16 +1,16 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#include <v1_0/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp>
+#include <v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp>
 #include <assert.h>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -20,6 +20,7 @@ TestFreedesktopInterfaceStubDefault::TestFreedesktopInterfaceStubDefault():
 }
 
 const CommonAPI::Version& TestFreedesktopInterfaceStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> _client) {
+    (void)_client;
     return interfaceVersion_;
 }
 
@@ -33,14 +34,17 @@ const uint32_t& TestFreedesktopInterfaceStubDefault::getTestPredefinedTypeAttrib
 }
 
 const uint32_t& TestFreedesktopInterfaceStubDefault::getTestPredefinedTypeAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) {
+    (void)_client;
     return getTestPredefinedTypeAttributeAttribute();
 }
 
 void TestFreedesktopInterfaceStubDefault::setTestPredefinedTypeAttributeAttribute(uint32_t _value) {
     const bool valueChanged = trySetTestPredefinedTypeAttributeAttribute(std::move(_value));
-    if (valueChanged && CommonAPI::Stub<TestFreedesktopInterfaceStubAdapter, TestFreedesktopInterfaceStubRemoteEvent>::stubAdapter_ != NULL) {
-         CommonAPI::Stub<TestFreedesktopInterfaceStubAdapter, TestFreedesktopInterfaceStubRemoteEvent>::stubAdapter_->fireTestPredefinedTypeAttributeAttributeChanged(testPredefinedTypeAttributeAttributeValue_);
-     }
+    if (valueChanged) {
+        auto stubAdapter = CommonAPI::Stub<TestFreedesktopInterfaceStubAdapter, TestFreedesktopInterfaceStubRemoteEvent>::stubAdapter_.lock();
+        if (stubAdapter)
+            stubAdapter->fireTestPredefinedTypeAttributeAttributeChanged(testPredefinedTypeAttributeAttributeValue_);
+    }
 }
 
 bool TestFreedesktopInterfaceStubDefault::trySetTestPredefinedTypeAttributeAttribute(uint32_t _value) {
@@ -53,10 +57,12 @@ bool TestFreedesktopInterfaceStubDefault::trySetTestPredefinedTypeAttributeAttri
 }
 
 bool TestFreedesktopInterfaceStubDefault::validateTestPredefinedTypeAttributeAttributeRequestedValue(const uint32_t &_value) {
-    return true;
+    (void)_value;
+	return true;
 }
 
 void TestFreedesktopInterfaceStubDefault::setTestPredefinedTypeAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t _value) {
+    (void)_client;
     setTestPredefinedTypeAttributeAttribute(_value);
 }
 
@@ -75,6 +81,7 @@ bool TestFreedesktopInterfaceStubDefault::RemoteEventHandler::onRemoteSetTestPre
 }
 
 bool TestFreedesktopInterfaceStubDefault::RemoteEventHandler::onRemoteSetTestPredefinedTypeAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t _value) {
+    (void)_client;
     return onRemoteSetTestPredefinedTypeAttributeAttribute(_value);
 }
 
@@ -83,14 +90,17 @@ const uint32_t& TestFreedesktopInterfaceStubDefault::getTestReadonlyAttributeAtt
 }
 
 const uint32_t& TestFreedesktopInterfaceStubDefault::getTestReadonlyAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) {
+    (void)_client;
     return getTestReadonlyAttributeAttribute();
 }
 
 void TestFreedesktopInterfaceStubDefault::setTestReadonlyAttributeAttribute(uint32_t _value) {
     const bool valueChanged = trySetTestReadonlyAttributeAttribute(std::move(_value));
-    if (valueChanged && CommonAPI::Stub<TestFreedesktopInterfaceStubAdapter, TestFreedesktopInterfaceStubRemoteEvent>::stubAdapter_ != NULL) {
-         CommonAPI::Stub<TestFreedesktopInterfaceStubAdapter, TestFreedesktopInterfaceStubRemoteEvent>::stubAdapter_->fireTestReadonlyAttributeAttributeChanged(testReadonlyAttributeAttributeValue_);
-     }
+    if (valueChanged) {
+        auto stubAdapter = CommonAPI::Stub<TestFreedesktopInterfaceStubAdapter, TestFreedesktopInterfaceStubRemoteEvent>::stubAdapter_.lock();
+        if (stubAdapter)
+            stubAdapter->fireTestReadonlyAttributeAttributeChanged(testReadonlyAttributeAttributeValue_);
+    }
 }
 
 bool TestFreedesktopInterfaceStubDefault::trySetTestReadonlyAttributeAttribute(uint32_t _value) {
@@ -103,7 +113,8 @@ bool TestFreedesktopInterfaceStubDefault::trySetTestReadonlyAttributeAttribute(u
 }
 
 bool TestFreedesktopInterfaceStubDefault::validateTestReadonlyAttributeAttributeRequestedValue(const uint32_t &_value) {
-    return true;
+    (void)_value;
+	return true;
 }
 
 
@@ -112,14 +123,17 @@ const ::commonapi::tests::DerivedTypeCollection::TestStructExtended& TestFreedes
 }
 
 const ::commonapi::tests::DerivedTypeCollection::TestStructExtended& TestFreedesktopInterfaceStubDefault::getTestDerivedStructAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) {
+    (void)_client;
     return getTestDerivedStructAttributeAttribute();
 }
 
 void TestFreedesktopInterfaceStubDefault::setTestDerivedStructAttributeAttribute(::commonapi::tests::DerivedTypeCollection::TestStructExtended _value) {
     const bool valueChanged = trySetTestDerivedStructAttributeAttribute(std::move(_value));
-    if (valueChanged && CommonAPI::Stub<TestFreedesktopInterfaceStubAdapter, TestFreedesktopInterfaceStubRemoteEvent>::stubAdapter_ != NULL) {
-         CommonAPI::Stub<TestFreedesktopInterfaceStubAdapter, TestFreedesktopInterfaceStubRemoteEvent>::stubAdapter_->fireTestDerivedStructAttributeAttributeChanged(testDerivedStructAttributeAttributeValue_);
-     }
+    if (valueChanged) {
+        auto stubAdapter = CommonAPI::Stub<TestFreedesktopInterfaceStubAdapter, TestFreedesktopInterfaceStubRemoteEvent>::stubAdapter_.lock();
+        if (stubAdapter)
+            stubAdapter->fireTestDerivedStructAttributeAttributeChanged(testDerivedStructAttributeAttributeValue_);
+    }
 }
 
 bool TestFreedesktopInterfaceStubDefault::trySetTestDerivedStructAttributeAttribute(::commonapi::tests::DerivedTypeCollection::TestStructExtended _value) {
@@ -132,10 +146,12 @@ bool TestFreedesktopInterfaceStubDefault::trySetTestDerivedStructAttributeAttrib
 }
 
 bool TestFreedesktopInterfaceStubDefault::validateTestDerivedStructAttributeAttributeRequestedValue(const ::commonapi::tests::DerivedTypeCollection::TestStructExtended &_value) {
-    return true;
+    (void)_value;
+	return true;
 }
 
 void TestFreedesktopInterfaceStubDefault::setTestDerivedStructAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestStructExtended _value) {
+    (void)_client;
     setTestDerivedStructAttributeAttribute(_value);
 }
 
@@ -154,6 +170,7 @@ bool TestFreedesktopInterfaceStubDefault::RemoteEventHandler::onRemoteSetTestDer
 }
 
 bool TestFreedesktopInterfaceStubDefault::RemoteEventHandler::onRemoteSetTestDerivedStructAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestStructExtended _value) {
+    (void)_client;
     return onRemoteSetTestDerivedStructAttributeAttribute(_value);
 }
 
@@ -162,14 +179,17 @@ const ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64& TestFreedeskto
 }
 
 const ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64& TestFreedesktopInterfaceStubDefault::getTestDerivedArrayAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) {
+    (void)_client;
     return getTestDerivedArrayAttributeAttribute();
 }
 
 void TestFreedesktopInterfaceStubDefault::setTestDerivedArrayAttributeAttribute(::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 _value) {
     const bool valueChanged = trySetTestDerivedArrayAttributeAttribute(std::move(_value));
-    if (valueChanged && CommonAPI::Stub<TestFreedesktopInterfaceStubAdapter, TestFreedesktopInterfaceStubRemoteEvent>::stubAdapter_ != NULL) {
-         CommonAPI::Stub<TestFreedesktopInterfaceStubAdapter, TestFreedesktopInterfaceStubRemoteEvent>::stubAdapter_->fireTestDerivedArrayAttributeAttributeChanged(testDerivedArrayAttributeAttributeValue_);
-     }
+    if (valueChanged) {
+        auto stubAdapter = CommonAPI::Stub<TestFreedesktopInterfaceStubAdapter, TestFreedesktopInterfaceStubRemoteEvent>::stubAdapter_.lock();
+        if (stubAdapter)
+            stubAdapter->fireTestDerivedArrayAttributeAttributeChanged(testDerivedArrayAttributeAttributeValue_);
+    }
 }
 
 bool TestFreedesktopInterfaceStubDefault::trySetTestDerivedArrayAttributeAttribute(::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 _value) {
@@ -182,10 +202,12 @@ bool TestFreedesktopInterfaceStubDefault::trySetTestDerivedArrayAttributeAttribu
 }
 
 bool TestFreedesktopInterfaceStubDefault::validateTestDerivedArrayAttributeAttributeRequestedValue(const ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 &_value) {
-    return true;
+    (void)_value;
+	return true;
 }
 
 void TestFreedesktopInterfaceStubDefault::setTestDerivedArrayAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 _value) {
+    (void)_client;
     setTestDerivedArrayAttributeAttribute(_value);
 }
 
@@ -204,6 +226,7 @@ bool TestFreedesktopInterfaceStubDefault::RemoteEventHandler::onRemoteSetTestDer
 }
 
 bool TestFreedesktopInterfaceStubDefault::RemoteEventHandler::onRemoteSetTestDerivedArrayAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 _value) {
+    (void)_client;
     return onRemoteSetTestDerivedArrayAttributeAttribute(_value);
 }
 
@@ -218,4 +241,4 @@ TestFreedesktopInterfaceStubDefault::RemoteEventHandler::RemoteEventHandler(Test
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp
index c473858..d81fb94 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -11,10 +11,10 @@
 #define COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_DEFAULT_HPP_
 
 
-#include <v1_0/commonapi/tests/TestFreedesktopInterfaceStub.hpp>
+#include <v1/commonapi/tests/TestFreedesktopInterfaceStub.hpp>
 #include <sstream>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -92,16 +92,20 @@ protected:
 private:
     TestFreedesktopInterfaceStubDefault::RemoteEventHandler remoteEventHandler_;
 
-    uint32_t testPredefinedTypeAttributeAttributeValue_;
-    uint32_t testReadonlyAttributeAttributeValue_;
-    ::commonapi::tests::DerivedTypeCollection::TestStructExtended testDerivedStructAttributeAttributeValue_;
-    ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 testDerivedArrayAttributeAttributeValue_;
+    uint32_t testPredefinedTypeAttributeAttributeValue_ {};
+    uint32_t testReadonlyAttributeAttributeValue_ {};
+    ::commonapi::tests::DerivedTypeCollection::TestStructExtended testDerivedStructAttributeAttributeValue_ {};
+    ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 testDerivedArrayAttributeAttributeValue_ {};
 
     CommonAPI::Version interfaceVersion_;
 };
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_DEFAULT
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestInterface.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterface.hpp
index c4de980..ab6a78b 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/TestInterface.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterface.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -21,7 +21,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -44,9 +44,13 @@ CommonAPI::Version TestInterface::getInterfaceVersion() {
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 namespace CommonAPI {
 }
 
+
+// Compatibility
+namespace v1_0 = v1;
+
 #endif // COMMONAPI_TESTS_TEST_INTERFACE_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManager.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManager.hpp
new file mode 100644
index 0000000..792309c
--- /dev/null
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManager.hpp
@@ -0,0 +1,57 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#ifndef COMMONAPI_TESTS_TEST_INTERFACE_MANAGER_HPP_
+#define COMMONAPI_TESTS_TEST_INTERFACE_MANAGER_HPP_
+
+
+#include <set>
+
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+#include <CommonAPI/Types.hpp>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1 {
+namespace commonapi {
+namespace tests {
+
+class TestInterfaceManager {
+public:
+    virtual ~TestInterfaceManager() { }
+
+    static inline const char* getInterface();
+    static inline CommonAPI::Version getInterfaceVersion();
+};
+
+const char* TestInterfaceManager::getInterface() {
+    return ("commonapi.tests.TestInterfaceManager");
+}
+
+CommonAPI::Version TestInterfaceManager::getInterfaceVersion() {
+    return CommonAPI::Version(1, 0);
+}
+
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1
+
+namespace CommonAPI {
+}
+
+
+// Compatibility
+namespace v1_0 = v1;
+
+#endif // COMMONAPI_TESTS_TEST_INTERFACE_MANAGER_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxy.hpp
new file mode 100644
index 0000000..d302418
--- /dev/null
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxy.hpp
@@ -0,0 +1,131 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#ifndef COMMONAPI_TESTS_Test_Interface_Manager_PROXY_HPP_
+#define COMMONAPI_TESTS_Test_Interface_Manager_PROXY_HPP_
+
+#include <v1/commonapi/tests/TestInterfaceManagerProxyBase.hpp>
+
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1 {
+namespace commonapi {
+namespace tests {
+
+template <typename ... _AttributeExtensions>
+class TestInterfaceManagerProxy
+    : virtual public TestInterfaceManager, 
+      virtual public TestInterfaceManagerProxyBase,
+      virtual public _AttributeExtensions... {
+public:
+    TestInterfaceManagerProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
+    ~TestInterfaceManagerProxy();
+
+    typedef TestInterfaceManager InterfaceType;
+
+
+
+
+
+    virtual CommonAPI::ProxyManager& getProxyManagerTestInterface();
+
+    /**
+     * Returns the CommonAPI address of the remote partner this proxy communicates with.
+     */
+    virtual const CommonAPI::Address &getAddress() const;
+
+    /**
+     * Returns true if the remote partner for this proxy is currently known to be available.
+     */
+    virtual bool isAvailable() const;
+
+    /**
+     * Returns true if the remote partner for this proxy is available.
+     */
+    virtual bool isAvailableBlocking() const;
+
+    /**
+     * Returns the wrapper class that is used to (de-)register for notifications about
+     * the availability of the remote partner of this proxy.
+     */
+    virtual CommonAPI::ProxyStatusEvent& getProxyStatusEvent();
+
+    /**
+     * Returns the wrapper class that is used to access version information of the remote
+     * partner of this proxy.
+     */
+    virtual CommonAPI::InterfaceVersionAttribute& getInterfaceVersionAttribute();
+
+ private:
+    std::shared_ptr<TestInterfaceManagerProxyBase> delegate_;
+};
+
+typedef TestInterfaceManagerProxy<> TestInterfaceManagerProxyDefault;
+
+
+//
+// TestInterfaceManagerProxy Implementation
+//
+template <typename ... _AttributeExtensions>
+TestInterfaceManagerProxy<_AttributeExtensions...>::TestInterfaceManagerProxy(std::shared_ptr<CommonAPI::Proxy> delegate):
+        _AttributeExtensions(*(std::dynamic_pointer_cast<TestInterfaceManagerProxyBase>(delegate)))...,
+        delegate_(std::dynamic_pointer_cast<TestInterfaceManagerProxyBase>(delegate)) {
+}
+
+template <typename ... _AttributeExtensions>
+TestInterfaceManagerProxy<_AttributeExtensions...>::~TestInterfaceManagerProxy() {
+}
+
+
+template <typename ... _AttributeExtensions>
+const CommonAPI::Address &TestInterfaceManagerProxy<_AttributeExtensions...>::getAddress() const {
+    return delegate_->getAddress();
+}
+
+template <typename ... _AttributeExtensions>
+bool TestInterfaceManagerProxy<_AttributeExtensions...>::isAvailable() const {
+    return delegate_->isAvailable();
+}
+
+template <typename ... _AttributeExtensions>
+bool TestInterfaceManagerProxy<_AttributeExtensions...>::isAvailableBlocking() const {
+    return delegate_->isAvailableBlocking();
+}
+
+template <typename ... _AttributeExtensions>
+CommonAPI::ProxyStatusEvent& TestInterfaceManagerProxy<_AttributeExtensions...>::getProxyStatusEvent() {
+    return delegate_->getProxyStatusEvent();
+}
+
+template <typename ... _AttributeExtensions>
+CommonAPI::InterfaceVersionAttribute& TestInterfaceManagerProxy<_AttributeExtensions...>::getInterfaceVersionAttribute() {
+    return delegate_->getInterfaceVersionAttribute();
+}
+
+template <typename ... _AttributeExtensions>
+CommonAPI::ProxyManager& TestInterfaceManagerProxy<_AttributeExtensions...>::getProxyManagerTestInterface() {
+    return delegate_->getProxyManagerTestInterface();
+}
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1
+
+
+
+// Compatibility
+namespace v1_0 = v1;
+
+#endif // COMMONAPI_TESTS_Test_Interface_Manager_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxyBase.hpp
new file mode 100644
index 0000000..29740a5
--- /dev/null
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxyBase.hpp
@@ -0,0 +1,50 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#ifndef COMMONAPI_TESTS_Test_Interface_Manager_PROXY_BASE_HPP_
+#define COMMONAPI_TESTS_Test_Interface_Manager_PROXY_BASE_HPP_
+
+#include <v1/commonapi/tests/TestInterfaceManager.hpp>
+
+
+#include <v1/commonapi/tests/TestInterfaceStub.hpp>
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+
+#include <CommonAPI/ProxyManager.hpp>
+#include <CommonAPI/Proxy.hpp>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1 {
+namespace commonapi {
+namespace tests {
+
+class TestInterfaceManagerProxyBase
+    : virtual public CommonAPI::Proxy {
+public:
+
+
+
+
+    virtual CommonAPI::ProxyManager& getProxyManagerTestInterface() = 0;
+};
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
+
+#endif // COMMONAPI_TESTS_Test_Interface_Manager_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStub.hpp
new file mode 100644
index 0000000..7b341f8
--- /dev/null
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStub.hpp
@@ -0,0 +1,111 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#ifndef COMMONAPI_TESTS_Test_Interface_Manager_STUB_HPP_
+#define COMMONAPI_TESTS_Test_Interface_Manager_STUB_HPP_
+
+#include <functional>
+
+
+
+#include <v1/commonapi/tests/TestInterfaceStub.hpp>
+
+#include <v1/commonapi/tests/TestInterfaceManager.hpp>
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+
+#include <CommonAPI/Stub.hpp>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1 {
+namespace commonapi {
+namespace tests {
+
+/**
+ * Receives messages from remote and handles all dispatching of deserialized calls
+ * to a stub for the service TestInterfaceManager. Also provides means to send broadcasts
+ * and attribute-changed-notifications of observable attributes as defined by this service.
+ * An application developer should not need to bother with this class.
+ */
+class TestInterfaceManagerStubAdapter
+    : public virtual CommonAPI::StubAdapter, 
+      public virtual TestInterfaceManager {
+ public:
+
+
+    virtual bool registerManagedStubTestInterface(std::shared_ptr<::v1::commonapi::tests::TestInterfaceStub>, const std::string&) = 0;
+    virtual bool deregisterManagedStubTestInterface(const std::string&) = 0;
+    virtual std::set<std::string>& getTestInterfaceInstances() = 0;
+
+    virtual void deactivateManagedInstances() = 0;
+protected:
+    /**
+     * Defines properties for storing the ClientIds of clients / proxies that have
+     * subscribed to the selective broadcasts
+     */
+};
+
+/**
+ * Defines the necessary callbacks to handle remote set events related to the attributes
+ * defined in the IDL description for TestInterfaceManager.
+ * For each attribute two callbacks are defined:
+ * - a verification callback that allows to verify the requested value and to prevent setting
+ *   e.g. an invalid value ("onRemoteSet<AttributeName>").
+ * - an action callback to do local work after the attribute value has been changed
+ *   ("onRemote<AttributeName>Changed").
+ *
+ * This class and the one below are the ones an application developer needs to have
+ * a look at if he wants to implement a service.
+ */
+class TestInterfaceManagerStubRemoteEvent
+{
+public:
+    virtual ~TestInterfaceManagerStubRemoteEvent() { }
+
+};
+
+/**
+ * Defines the interface that must be implemented by any class that should provide
+ * the service TestInterfaceManager to remote clients.
+ * This class and the one above are the ones an application developer needs to have
+ * a look at if he wants to implement a service.
+ */
+class TestInterfaceManagerStub
+    : public virtual CommonAPI::Stub<TestInterfaceManagerStubAdapter, TestInterfaceManagerStubRemoteEvent>
+{
+public:
+
+    virtual ~TestInterfaceManagerStub() {}
+    virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0;
+
+
+
+    virtual bool registerManagedStubTestInterface(std::shared_ptr<::v1::commonapi::tests::TestInterfaceStub>, const std::string&) = 0;
+    virtual bool deregisterManagedStubTestInterface(const std::string&) = 0;
+    virtual std::set<std::string>& getTestInterfaceInstances() = 0;
+    using CommonAPI::Stub<TestInterfaceManagerStubAdapter, TestInterfaceManagerStubRemoteEvent>::initStubAdapter;
+    typedef CommonAPI::Stub<TestInterfaceManagerStubAdapter, TestInterfaceManagerStubRemoteEvent>::StubAdapterType StubAdapterType;
+    typedef CommonAPI::Stub<TestInterfaceManagerStubAdapter, TestInterfaceManagerStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType;
+    typedef TestInterfaceManagerStubRemoteEvent RemoteEventType;
+    typedef TestInterfaceManager StubInterface;
+};
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
+
+#endif // COMMONAPI_TESTS_Test_Interface_Manager_STUB_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.cpp
new file mode 100644
index 0000000..57442e0
--- /dev/null
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.cpp
@@ -0,0 +1,83 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#include <v1/commonapi/tests/TestInterfaceManagerStubDefault.hpp>
+#include <assert.h>
+
+namespace v1 {
+namespace commonapi {
+namespace tests {
+
+TestInterfaceManagerStubDefault::TestInterfaceManagerStubDefault():
+        remoteEventHandler_(this),
+        autoInstanceCounter_(0),
+        interfaceVersion_(TestInterfaceManager::getInterfaceVersion()) {
+}
+
+const CommonAPI::Version& TestInterfaceManagerStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> _client) {
+    (void)_client;
+    return interfaceVersion_;
+}
+
+TestInterfaceManagerStubRemoteEvent* TestInterfaceManagerStubDefault::initStubAdapter(const std::shared_ptr<TestInterfaceManagerStubAdapter> &_adapter) {
+    CommonAPI::Stub<TestInterfaceManagerStubAdapter, TestInterfaceManagerStubRemoteEvent>::stubAdapter_ = _adapter;
+    return &remoteEventHandler_;
+}
+
+
+
+
+bool TestInterfaceManagerStubDefault::registerManagedStubTestInterfaceAutoInstance(std::shared_ptr<::v1::commonapi::tests::TestInterfaceStub> _stub) {
+    autoInstanceCounter_++;
+    std::stringstream ss;
+    assert((CommonAPI::Stub<TestInterfaceManagerStubAdapter, TestInterfaceManagerStubRemoteEvent>::stubAdapter_.lock()) !=NULL);
+    auto stubAdapter = CommonAPI::Stub<TestInterfaceManagerStubAdapter, TestInterfaceManagerStubRemoteEvent>::stubAdapter_.lock();
+    if (stubAdapter) {
+        ss << stubAdapter->getAddress().getInstance() << ".i" << autoInstanceCounter_;
+        std::string instance = ss.str();
+        return stubAdapter->registerManagedStubTestInterface(_stub, instance);
+    } else {
+        return false;
+    }
+}
+bool TestInterfaceManagerStubDefault::registerManagedStubTestInterface(std::shared_ptr<::v1::commonapi::tests::TestInterfaceStub> _stub, const std::string &_instance) {
+    assert((CommonAPI::Stub<TestInterfaceManagerStubAdapter, TestInterfaceManagerStubRemoteEvent>::stubAdapter_.lock()) !=NULL);
+    auto stubAdapter = CommonAPI::Stub<TestInterfaceManagerStubAdapter, TestInterfaceManagerStubRemoteEvent>::stubAdapter_.lock();
+    if (stubAdapter) 
+        return stubAdapter->registerManagedStubTestInterface(_stub, _instance);
+    else
+        return false;
+}
+bool TestInterfaceManagerStubDefault::deregisterManagedStubTestInterface(const std::string &_instance) {
+    assert((CommonAPI::Stub<TestInterfaceManagerStubAdapter, TestInterfaceManagerStubRemoteEvent>::stubAdapter_.lock()) !=NULL);
+    auto stubAdapter = CommonAPI::Stub<TestInterfaceManagerStubAdapter, TestInterfaceManagerStubRemoteEvent>::stubAdapter_.lock();
+    if (stubAdapter) 
+        return stubAdapter->deregisterManagedStubTestInterface(_instance);
+    else
+        return false;
+}
+std::set<std::string>& TestInterfaceManagerStubDefault::getTestInterfaceInstances() {
+    assert((CommonAPI::Stub<TestInterfaceManagerStubAdapter, TestInterfaceManagerStubRemoteEvent>::stubAdapter_.lock()) !=NULL);
+    auto stubAdapter = CommonAPI::Stub<TestInterfaceManagerStubAdapter, TestInterfaceManagerStubRemoteEvent>::stubAdapter_.lock();
+    if (stubAdapter) {
+        return stubAdapter->getTestInterfaceInstances();
+    } else {
+        static std::set<std::string> emptySet = std::set<std::string>();
+        return emptySet;
+    }
+}
+
+TestInterfaceManagerStubDefault::RemoteEventHandler::RemoteEventHandler(TestInterfaceManagerStubDefault *_defaultStub)
+    : 
+      defaultStub_(_defaultStub) {
+}
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1
diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.hpp
new file mode 100644
index 0000000..1dfb361
--- /dev/null
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.hpp
@@ -0,0 +1,73 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#ifndef COMMONAPI_TESTS_Test_Interface_Manager_STUB_DEFAULT_HPP_
+#define COMMONAPI_TESTS_Test_Interface_Manager_STUB_DEFAULT_HPP_
+
+
+#include <v1/commonapi/tests/TestInterfaceManagerStub.hpp>
+#include <sstream>
+
+namespace v1 {
+namespace commonapi {
+namespace tests {
+
+/**
+ * Provides a default implementation for TestInterfaceManagerStubRemoteEvent and
+ * TestInterfaceManagerStub. Method callbacks have an empty implementation,
+ * remote set calls on attributes will always change the value of the attribute
+ * to the one received.
+ *
+ * Override this stub if you only want to provide a subset of the functionality
+ * that would be defined for this service, and/or if you do not need any non-default
+ * behaviour.
+ */
+class TestInterfaceManagerStubDefault
+    : public virtual TestInterfaceManagerStub {
+public:
+    TestInterfaceManagerStubDefault();
+
+    TestInterfaceManagerStubRemoteEvent* initStubAdapter(const std::shared_ptr<TestInterfaceManagerStubAdapter> &_adapter);
+
+    const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> _client);
+
+
+
+
+    bool registerManagedStubTestInterfaceAutoInstance(std::shared_ptr<::v1::commonapi::tests::TestInterfaceStub>);
+    bool registerManagedStubTestInterface(std::shared_ptr<::v1::commonapi::tests::TestInterfaceStub>, const std::string&);
+    bool deregisterManagedStubTestInterface(const std::string&);
+    std::set<std::string>& getTestInterfaceInstances();
+
+protected:
+    class RemoteEventHandler: public virtual TestInterfaceManagerStubRemoteEvent {
+    public:
+        RemoteEventHandler(TestInterfaceManagerStubDefault *_defaultStub);
+
+
+    private:
+        TestInterfaceManagerStubDefault *defaultStub_;
+    };
+private:
+    TestInterfaceManagerStubDefault::RemoteEventHandler remoteEventHandler_;
+    uint32_t autoInstanceCounter_;
+
+
+    CommonAPI::Version interfaceVersion_;
+};
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
+
+#endif // COMMONAPI_TESTS_Test_Interface_Manager_STUB_DEFAULT
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceProxy.hpp
index f284f07..f22aea7 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceProxy.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,7 +10,7 @@
 #ifndef COMMONAPI_TESTS_Test_Interface_PROXY_HPP_
 #define COMMONAPI_TESTS_Test_Interface_PROXY_HPP_
 
-#include <v1_0/commonapi/tests/TestInterfaceProxyBase.hpp>
+#include <v1/commonapi/tests/TestInterfaceProxyBase.hpp>
 
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
@@ -22,7 +22,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -30,7 +30,7 @@ template <typename ... _AttributeExtensions>
 class TestInterfaceProxy
     : virtual public TestInterface, 
       virtual public TestInterfaceProxyBase,
-      public _AttributeExtensions... {
+      virtual public _AttributeExtensions... {
 public:
     TestInterfaceProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
     ~TestInterfaceProxy();
@@ -94,7 +94,7 @@ public:
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> testEmptyMethodAsync(TestEmptyMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr);
+    virtual std::future<CommonAPI::CallStatus> testEmptyMethodAsync(TestEmptyMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr);
     /**
      * Calls testVoidPredefinedTypeMethod with synchronous semantics.
      * 
@@ -114,7 +114,7 @@ public:
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> testVoidPredefinedTypeMethodAsync(const uint32_t &_uint32Value, const std::string &_stringValue, TestVoidPredefinedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr);
+    virtual std::future<CommonAPI::CallStatus> testVoidPredefinedTypeMethodAsync(const uint32_t &_uint32Value, const std::string &_stringValue, TestVoidPredefinedTypeMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr);
     /**
      * Calls testPredefinedTypeMethod with synchronous semantics.
      * 
@@ -135,7 +135,7 @@ public:
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> testPredefinedTypeMethodAsync(const uint32_t &_uint32InValue, const std::string &_stringInValue, TestPredefinedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr);
+    virtual std::future<CommonAPI::CallStatus> testPredefinedTypeMethodAsync(const uint32_t &_uint32InValue, const std::string &_stringInValue, TestPredefinedTypeMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr);
     /**
      * Calls testVoidDerivedTypeMethod with synchronous semantics.
      * 
@@ -155,7 +155,7 @@ public:
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> testVoidDerivedTypeMethodAsync(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2Value, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapValue, TestVoidDerivedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr);
+    virtual std::future<CommonAPI::CallStatus> testVoidDerivedTypeMethodAsync(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2Value, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapValue, TestVoidDerivedTypeMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr);
     /**
      * Calls testDerivedTypeMethod with synchronous semantics.
      * 
@@ -176,7 +176,7 @@ public:
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> testDerivedTypeMethodAsync(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2InValue, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapInValue, TestDerivedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr);
+    virtual std::future<CommonAPI::CallStatus> testDerivedTypeMethodAsync(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2InValue, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapInValue, TestDerivedTypeMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr);
     /**
      * Calls TestArrayOfPolymorphicStructMethod with synchronous semantics.
      * 
@@ -196,7 +196,7 @@ public:
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> TestArrayOfPolymorphicStructMethodAsync(const std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>> &_inArray, TestArrayOfPolymorphicStructMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr);
+    virtual std::future<CommonAPI::CallStatus> TestArrayOfPolymorphicStructMethodAsync(const std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>> &_inArray, TestArrayOfPolymorphicStructMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr);
     /**
      * Calls TestMapOfPolymorphicStructMethod with synchronous semantics.
      * 
@@ -216,7 +216,7 @@ public:
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> TestMapOfPolymorphicStructMethodAsync(const ::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic &_inMap, TestMapOfPolymorphicStructMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr);
+    virtual std::future<CommonAPI::CallStatus> TestMapOfPolymorphicStructMethodAsync(const ::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic &_inMap, TestMapOfPolymorphicStructMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr);
     /**
      * Calls TestStructWithPolymorphicMemberMethod with synchronous semantics.
      * 
@@ -236,7 +236,7 @@ public:
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> TestStructWithPolymorphicMemberMethodAsync(const ::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember &_inStruct, TestStructWithPolymorphicMemberMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr);
+    virtual std::future<CommonAPI::CallStatus> TestStructWithPolymorphicMemberMethodAsync(const ::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember &_inStruct, TestStructWithPolymorphicMemberMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr);
     /**
      * Calls TestStructWithEnumKeyMapMember with synchronous semantics.
      * 
@@ -256,7 +256,7 @@ public:
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> TestStructWithEnumKeyMapMemberAsync(const ::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap &_inStruct, TestStructWithEnumKeyMapMemberAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr);
+    virtual std::future<CommonAPI::CallStatus> TestStructWithEnumKeyMapMemberAsync(const ::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap &_inStruct, TestStructWithEnumKeyMapMemberAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr);
 
 
     /**
@@ -403,20 +403,42 @@ std::future<CommonAPI::CallStatus> TestInterfaceProxy<_AttributeExtensions...>::
 }
 template <typename ... _AttributeExtensions>
 void TestInterfaceProxy<_AttributeExtensions...>::testVoidDerivedTypeMethod(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2Value, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapValue, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) {
+    if (!_testEnumExtended2Value.validate()) {
+        _internalCallStatus = CommonAPI::CallStatus::INVALID_VALUE;
+        return;
+    }
     delegate_->testVoidDerivedTypeMethod(_testEnumExtended2Value, _testMapValue, _internalCallStatus, _info);
 }
 
 template <typename ... _AttributeExtensions>
 std::future<CommonAPI::CallStatus> TestInterfaceProxy<_AttributeExtensions...>::testVoidDerivedTypeMethodAsync(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2Value, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapValue, TestVoidDerivedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
+    if (!_testEnumExtended2Value.validate()) {
+        _callback(CommonAPI::CallStatus::INVALID_VALUE);
+        std::promise<CommonAPI::CallStatus> promise;
+        promise.set_value(CommonAPI::CallStatus::INVALID_VALUE);
+        return promise.get_future();
+    }
     return delegate_->testVoidDerivedTypeMethodAsync(_testEnumExtended2Value, _testMapValue, _callback, _info);
 }
 template <typename ... _AttributeExtensions>
 void TestInterfaceProxy<_AttributeExtensions...>::testDerivedTypeMethod(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2InValue, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapInValue, CommonAPI::CallStatus &_internalCallStatus, ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2OutValue, ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapOutValue, const CommonAPI::CallInfo *_info) {
+    if (!_testEnumExtended2InValue.validate()) {
+        _internalCallStatus = CommonAPI::CallStatus::INVALID_VALUE;
+        return;
+    }
     delegate_->testDerivedTypeMethod(_testEnumExtended2InValue, _testMapInValue, _internalCallStatus, _testEnumExtended2OutValue, _testMapOutValue, _info);
 }
 
 template <typename ... _AttributeExtensions>
 std::future<CommonAPI::CallStatus> TestInterfaceProxy<_AttributeExtensions...>::testDerivedTypeMethodAsync(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2InValue, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapInValue, TestDerivedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
+    if (!_testEnumExtended2InValue.validate()) {
+        ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 testEnumExtended2OutValue = ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2::E_NEW2;
+        ::commonapi::tests::DerivedTypeCollection::TestMap testMapOutValue;
+        _callback(CommonAPI::CallStatus::INVALID_VALUE, testEnumExtended2OutValue, testMapOutValue);
+        std::promise<CommonAPI::CallStatus> promise;
+        promise.set_value(CommonAPI::CallStatus::INVALID_VALUE);
+        return promise.get_future();
+    }
     return delegate_->testDerivedTypeMethodAsync(_testEnumExtended2InValue, _testMapInValue, _callback, _info);
 }
 template <typename ... _AttributeExtensions>
@@ -484,18 +506,22 @@ CommonAPI::InterfaceVersionAttribute& TestInterfaceProxy<_AttributeExtensions...
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 namespace CommonAPI {
 template<template<typename > class _AttributeExtension>
-struct DefaultAttributeProxyHelper<::v1_0::commonapi::tests::TestInterfaceProxy,
+struct DefaultAttributeProxyHelper<::v1::commonapi::tests::TestInterfaceProxy,
     _AttributeExtension> {
-    typedef typename ::v1_0::commonapi::tests::TestInterfaceProxy<
-            ::v1_0::commonapi::tests::TestInterfaceExtensions::TestPredefinedTypeAttributeAttributeExtension<_AttributeExtension>, 
-            ::v1_0::commonapi::tests::TestInterfaceExtensions::TestDerivedStructAttributeAttributeExtension<_AttributeExtension>, 
-            ::v1_0::commonapi::tests::TestInterfaceExtensions::TestDerivedArrayAttributeAttributeExtension<_AttributeExtension>
+    typedef typename ::v1::commonapi::tests::TestInterfaceProxy<
+            ::v1::commonapi::tests::TestInterfaceExtensions::TestPredefinedTypeAttributeAttributeExtension<_AttributeExtension>, 
+            ::v1::commonapi::tests::TestInterfaceExtensions::TestDerivedStructAttributeAttributeExtension<_AttributeExtension>, 
+            ::v1::commonapi::tests::TestInterfaceExtensions::TestDerivedArrayAttributeAttributeExtension<_AttributeExtension>
     > class_t;
 };
 }
 
+
+// Compatibility
+namespace v1_0 = v1;
+
 #endif // COMMONAPI_TESTS_Test_Interface_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceProxyBase.hpp
index 45f0d2c..f719377 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceProxyBase.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,7 +10,7 @@
 #ifndef COMMONAPI_TESTS_Test_Interface_PROXY_BASE_HPP_
 #define COMMONAPI_TESTS_Test_Interface_PROXY_BASE_HPP_
 
-#include <v1_0/commonapi/tests/TestInterface.hpp>
+#include <v1/commonapi/tests/TestInterface.hpp>
 
 
 #include <commonapi/tests/DerivedTypeCollection.hpp>
@@ -37,7 +37,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -72,27 +72,31 @@ public:
     virtual TestBroadcastWithOutArgsSelectiveEvent& getTestBroadcastWithOutArgsSelectiveEvent() = 0;
 
     virtual void testEmptyMethod(CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info = nullptr) = 0;
-    virtual std::future<CommonAPI::CallStatus> testEmptyMethodAsync(TestEmptyMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr) = 0;
+    virtual std::future<CommonAPI::CallStatus> testEmptyMethodAsync(TestEmptyMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr) = 0;
     virtual void testVoidPredefinedTypeMethod(const uint32_t &_uint32Value, const std::string &_stringValue, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info = nullptr) = 0;
-    virtual std::future<CommonAPI::CallStatus> testVoidPredefinedTypeMethodAsync(const uint32_t &_uint32Value, const std::string &_stringValue, TestVoidPredefinedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr) = 0;
+    virtual std::future<CommonAPI::CallStatus> testVoidPredefinedTypeMethodAsync(const uint32_t &_uint32Value, const std::string &_stringValue, TestVoidPredefinedTypeMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr) = 0;
     virtual void testPredefinedTypeMethod(const uint32_t &_uint32InValue, const std::string &_stringInValue, CommonAPI::CallStatus &_internalCallStatus, uint32_t &_uint32OutValue, std::string &_stringOutValue, const CommonAPI::CallInfo *_info = nullptr) = 0;
-    virtual std::future<CommonAPI::CallStatus> testPredefinedTypeMethodAsync(const uint32_t &_uint32InValue, const std::string &_stringInValue, TestPredefinedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr) = 0;
+    virtual std::future<CommonAPI::CallStatus> testPredefinedTypeMethodAsync(const uint32_t &_uint32InValue, const std::string &_stringInValue, TestPredefinedTypeMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr) = 0;
     virtual void testVoidDerivedTypeMethod(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2Value, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapValue, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info = nullptr) = 0;
-    virtual std::future<CommonAPI::CallStatus> testVoidDerivedTypeMethodAsync(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2Value, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapValue, TestVoidDerivedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr) = 0;
+    virtual std::future<CommonAPI::CallStatus> testVoidDerivedTypeMethodAsync(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2Value, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapValue, TestVoidDerivedTypeMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr) = 0;
     virtual void testDerivedTypeMethod(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2InValue, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapInValue, CommonAPI::CallStatus &_internalCallStatus, ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2OutValue, ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapOutValue, const CommonAPI::CallInfo *_info = nullptr) = 0;
-    virtual std::future<CommonAPI::CallStatus> testDerivedTypeMethodAsync(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2InValue, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapInValue, TestDerivedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr) = 0;
+    virtual std::future<CommonAPI::CallStatus> testDerivedTypeMethodAsync(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2InValue, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapInValue, TestDerivedTypeMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr) = 0;
     virtual void TestArrayOfPolymorphicStructMethod(const std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>> &_inArray, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info = nullptr) = 0;
-    virtual std::future<CommonAPI::CallStatus> TestArrayOfPolymorphicStructMethodAsync(const std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>> &_inArray, TestArrayOfPolymorphicStructMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr) = 0;
+    virtual std::future<CommonAPI::CallStatus> TestArrayOfPolymorphicStructMethodAsync(const std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>> &_inArray, TestArrayOfPolymorphicStructMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr) = 0;
     virtual void TestMapOfPolymorphicStructMethod(const ::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic &_inMap, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info = nullptr) = 0;
-    virtual std::future<CommonAPI::CallStatus> TestMapOfPolymorphicStructMethodAsync(const ::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic &_inMap, TestMapOfPolymorphicStructMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr) = 0;
+    virtual std::future<CommonAPI::CallStatus> TestMapOfPolymorphicStructMethodAsync(const ::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic &_inMap, TestMapOfPolymorphicStructMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr) = 0;
     virtual void TestStructWithPolymorphicMemberMethod(const ::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember &_inStruct, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info = nullptr) = 0;
-    virtual std::future<CommonAPI::CallStatus> TestStructWithPolymorphicMemberMethodAsync(const ::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember &_inStruct, TestStructWithPolymorphicMemberMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr) = 0;
+    virtual std::future<CommonAPI::CallStatus> TestStructWithPolymorphicMemberMethodAsync(const ::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember &_inStruct, TestStructWithPolymorphicMemberMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr) = 0;
     virtual void TestStructWithEnumKeyMapMember(const ::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap &_inStruct, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info = nullptr) = 0;
-    virtual std::future<CommonAPI::CallStatus> TestStructWithEnumKeyMapMemberAsync(const ::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap &_inStruct, TestStructWithEnumKeyMapMemberAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr) = 0;
+    virtual std::future<CommonAPI::CallStatus> TestStructWithEnumKeyMapMemberAsync(const ::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap &_inStruct, TestStructWithEnumKeyMapMemberAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr) = 0;
 };
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_Test_Interface_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStub.hpp
index 2039044..0330129 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStub.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -17,7 +17,7 @@
 #include <commonapi/tests/DerivedTypeCollection.hpp>
 #include <commonapi/tests/PredefinedTypeCollection.hpp>
 
-#include <v1_0/commonapi/tests/TestInterface.hpp>
+#include <v1/commonapi/tests/TestInterface.hpp>
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -36,7 +36,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -47,8 +47,8 @@ namespace tests {
  * An application developer should not need to bother with this class.
  */
 class TestInterfaceStubAdapter
-    : virtual public CommonAPI::StubAdapter, 
-      public TestInterface {
+    : public virtual CommonAPI::StubAdapter, 
+      public virtual TestInterface {
  public:
     ///Notifies all remote listeners about a change of value of the attribute TestPredefinedTypeAttribute.
     virtual void fireTestPredefinedTypeAttributeAttributeChanged(const uint32_t& TestPredefinedTypeAttribute) = 0;
@@ -110,15 +110,15 @@ public:
     virtual ~TestInterfaceStubRemoteEvent() { }
 
     /// Verification callback for remote set requests on the attribute TestPredefinedTypeAttribute
-    virtual bool onRemoteSetTestPredefinedTypeAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t TestPredefinedTypeAttribute) = 0;
+    virtual bool onRemoteSetTestPredefinedTypeAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t _value) = 0;
     /// Action callback for remote set requests on the attribute TestPredefinedTypeAttribute
     virtual void onRemoteTestPredefinedTypeAttributeAttributeChanged() = 0;
     /// Verification callback for remote set requests on the attribute TestDerivedStructAttribute
-    virtual bool onRemoteSetTestDerivedStructAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestStructExtended TestDerivedStructAttribute) = 0;
+    virtual bool onRemoteSetTestDerivedStructAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestStructExtended _value) = 0;
     /// Action callback for remote set requests on the attribute TestDerivedStructAttribute
     virtual void onRemoteTestDerivedStructAttributeAttributeChanged() = 0;
     /// Verification callback for remote set requests on the attribute TestDerivedArrayAttribute
-    virtual bool onRemoteSetTestDerivedArrayAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 TestDerivedArrayAttribute) = 0;
+    virtual bool onRemoteSetTestDerivedArrayAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 _value) = 0;
     /// Action callback for remote set requests on the attribute TestDerivedArrayAttribute
     virtual void onRemoteTestDerivedArrayAttributeAttributeChanged() = 0;
 };
@@ -207,6 +207,10 @@ public:
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_Test_Interface_STUB_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStubDefault.cpp
index 90efb99..ebb5b5e 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStubDefault.cpp
@@ -1,16 +1,16 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#include <v1_0/commonapi/tests/TestInterfaceStubDefault.hpp>
+#include <v1/commonapi/tests/TestInterfaceStubDefault.hpp>
 #include <assert.h>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -20,6 +20,7 @@ TestInterfaceStubDefault::TestInterfaceStubDefault():
 }
 
 const CommonAPI::Version& TestInterfaceStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> _client) {
+    (void)_client;
     return interfaceVersion_;
 }
 
@@ -33,14 +34,17 @@ const uint32_t& TestInterfaceStubDefault::getTestPredefinedTypeAttributeAttribut
 }
 
 const uint32_t& TestInterfaceStubDefault::getTestPredefinedTypeAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) {
+    (void)_client;
     return getTestPredefinedTypeAttributeAttribute();
 }
 
 void TestInterfaceStubDefault::setTestPredefinedTypeAttributeAttribute(uint32_t _value) {
     const bool valueChanged = trySetTestPredefinedTypeAttributeAttribute(std::move(_value));
-    if (valueChanged && CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_ != NULL) {
-         CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_->fireTestPredefinedTypeAttributeAttributeChanged(testPredefinedTypeAttributeAttributeValue_);
-     }
+    if (valueChanged) {
+        auto stubAdapter = CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_.lock();
+        if (stubAdapter)
+            stubAdapter->fireTestPredefinedTypeAttributeAttributeChanged(testPredefinedTypeAttributeAttributeValue_);
+    }
 }
 
 bool TestInterfaceStubDefault::trySetTestPredefinedTypeAttributeAttribute(uint32_t _value) {
@@ -53,10 +57,12 @@ bool TestInterfaceStubDefault::trySetTestPredefinedTypeAttributeAttribute(uint32
 }
 
 bool TestInterfaceStubDefault::validateTestPredefinedTypeAttributeAttributeRequestedValue(const uint32_t &_value) {
-    return true;
+    (void)_value;
+	return true;
 }
 
 void TestInterfaceStubDefault::setTestPredefinedTypeAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t _value) {
+    (void)_client;
     setTestPredefinedTypeAttributeAttribute(_value);
 }
 
@@ -75,6 +81,7 @@ bool TestInterfaceStubDefault::RemoteEventHandler::onRemoteSetTestPredefinedType
 }
 
 bool TestInterfaceStubDefault::RemoteEventHandler::onRemoteSetTestPredefinedTypeAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t _value) {
+    (void)_client;
     return onRemoteSetTestPredefinedTypeAttributeAttribute(_value);
 }
 
@@ -83,14 +90,17 @@ const ::commonapi::tests::DerivedTypeCollection::TestStructExtended& TestInterfa
 }
 
 const ::commonapi::tests::DerivedTypeCollection::TestStructExtended& TestInterfaceStubDefault::getTestDerivedStructAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) {
+    (void)_client;
     return getTestDerivedStructAttributeAttribute();
 }
 
 void TestInterfaceStubDefault::setTestDerivedStructAttributeAttribute(::commonapi::tests::DerivedTypeCollection::TestStructExtended _value) {
     const bool valueChanged = trySetTestDerivedStructAttributeAttribute(std::move(_value));
-    if (valueChanged && CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_ != NULL) {
-         CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_->fireTestDerivedStructAttributeAttributeChanged(testDerivedStructAttributeAttributeValue_);
-     }
+    if (valueChanged) {
+        auto stubAdapter = CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_.lock();
+        if (stubAdapter)
+            stubAdapter->fireTestDerivedStructAttributeAttributeChanged(testDerivedStructAttributeAttributeValue_);
+    }
 }
 
 bool TestInterfaceStubDefault::trySetTestDerivedStructAttributeAttribute(::commonapi::tests::DerivedTypeCollection::TestStructExtended _value) {
@@ -103,10 +113,12 @@ bool TestInterfaceStubDefault::trySetTestDerivedStructAttributeAttribute(::commo
 }
 
 bool TestInterfaceStubDefault::validateTestDerivedStructAttributeAttributeRequestedValue(const ::commonapi::tests::DerivedTypeCollection::TestStructExtended &_value) {
-    return true;
+    (void)_value;
+	return true;
 }
 
 void TestInterfaceStubDefault::setTestDerivedStructAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestStructExtended _value) {
+    (void)_client;
     setTestDerivedStructAttributeAttribute(_value);
 }
 
@@ -125,6 +137,7 @@ bool TestInterfaceStubDefault::RemoteEventHandler::onRemoteSetTestDerivedStructA
 }
 
 bool TestInterfaceStubDefault::RemoteEventHandler::onRemoteSetTestDerivedStructAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestStructExtended _value) {
+    (void)_client;
     return onRemoteSetTestDerivedStructAttributeAttribute(_value);
 }
 
@@ -133,14 +146,17 @@ const ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64& TestInterfaceS
 }
 
 const ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64& TestInterfaceStubDefault::getTestDerivedArrayAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) {
+    (void)_client;
     return getTestDerivedArrayAttributeAttribute();
 }
 
 void TestInterfaceStubDefault::setTestDerivedArrayAttributeAttribute(::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 _value) {
     const bool valueChanged = trySetTestDerivedArrayAttributeAttribute(std::move(_value));
-    if (valueChanged && CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_ != NULL) {
-         CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_->fireTestDerivedArrayAttributeAttributeChanged(testDerivedArrayAttributeAttributeValue_);
-     }
+    if (valueChanged) {
+        auto stubAdapter = CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_.lock();
+        if (stubAdapter)
+            stubAdapter->fireTestDerivedArrayAttributeAttributeChanged(testDerivedArrayAttributeAttributeValue_);
+    }
 }
 
 bool TestInterfaceStubDefault::trySetTestDerivedArrayAttributeAttribute(::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 _value) {
@@ -153,10 +169,12 @@ bool TestInterfaceStubDefault::trySetTestDerivedArrayAttributeAttribute(::common
 }
 
 bool TestInterfaceStubDefault::validateTestDerivedArrayAttributeAttributeRequestedValue(const ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 &_value) {
-    return true;
+    (void)_value;
+	return true;
 }
 
 void TestInterfaceStubDefault::setTestDerivedArrayAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 _value) {
+    (void)_client;
     setTestDerivedArrayAttributeAttribute(_value);
 }
 
@@ -175,85 +193,130 @@ bool TestInterfaceStubDefault::RemoteEventHandler::onRemoteSetTestDerivedArrayAt
 }
 
 bool TestInterfaceStubDefault::RemoteEventHandler::onRemoteSetTestDerivedArrayAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 _value) {
+    (void)_client;
     return onRemoteSetTestDerivedArrayAttributeAttribute(_value);
 }
 
 
 void TestInterfaceStubDefault::testEmptyMethod(const std::shared_ptr<CommonAPI::ClientId> _client, testEmptyMethodReply_t _reply) {
+    (void)_client;
     _reply();
 }
 
 void TestInterfaceStubDefault::testVoidPredefinedTypeMethod(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t _uint32Value, std::string _stringValue, testVoidPredefinedTypeMethodReply_t _reply) {
+    (void)_client;
+    (void) _uint32Value;
+    (void) _stringValue;
     _reply();
 }
 
 void TestInterfaceStubDefault::testPredefinedTypeMethod(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t _uint32InValue, std::string _stringInValue, testPredefinedTypeMethodReply_t _reply) {
-    uint32_t uint32OutValue = 0;
+    (void)_client;
+    (void) _uint32InValue;
+    (void) _stringInValue;
+    uint32_t uint32OutValue = 0ul;
     std::string stringOutValue = "";
     _reply(uint32OutValue, stringOutValue);
 }
 
 void TestInterfaceStubDefault::testVoidDerivedTypeMethod(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 _testEnumExtended2Value, ::commonapi::tests::DerivedTypeCollection::TestMap _testMapValue, testVoidDerivedTypeMethodReply_t _reply) {
+    (void)_client;
+    (void) _testEnumExtended2Value;
+    (void) _testMapValue;
     _reply();
 }
 
 void TestInterfaceStubDefault::testDerivedTypeMethod(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 _testEnumExtended2InValue, ::commonapi::tests::DerivedTypeCollection::TestMap _testMapInValue, testDerivedTypeMethodReply_t _reply) {
-    ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 testEnumExtended2OutValue;
+    (void)_client;
+    (void) _testEnumExtended2InValue;
+    (void) _testMapInValue;
+    ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 testEnumExtended2OutValue = ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2::E_NEW2;
     ::commonapi::tests::DerivedTypeCollection::TestMap testMapOutValue;
+    if (!testEnumExtended2OutValue.validate()) {
+        return;
+    }
     _reply(testEnumExtended2OutValue, testMapOutValue);
 }
 
 void TestInterfaceStubDefault::TestArrayOfPolymorphicStructMethod(const std::shared_ptr<CommonAPI::ClientId> _client, std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>> _inArray, TestArrayOfPolymorphicStructMethodReply_t _reply) {
+    (void)_client;
+    (void) _inArray;
     _reply();
 }
 
 void TestInterfaceStubDefault::TestMapOfPolymorphicStructMethod(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic _inMap, TestMapOfPolymorphicStructMethodReply_t _reply) {
+    (void)_client;
+    (void) _inMap;
     _reply();
 }
 
 void TestInterfaceStubDefault::TestStructWithPolymorphicMemberMethod(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember _inStruct, TestStructWithPolymorphicMemberMethodReply_t _reply) {
+    (void)_client;
+    (void) _inStruct;
     _reply();
 }
 
 void TestInterfaceStubDefault::TestStructWithEnumKeyMapMember(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap _inStruct, TestStructWithEnumKeyMapMemberReply_t _reply) {
+    (void)_client;
+    (void) _inStruct;
     _reply();
 }
 
 
 void TestInterfaceStubDefault::fireTestPredefinedTypeBroadcastEvent(const uint32_t &_uint32Value, const std::string &_stringValue) {
-	assert((CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_) !=NULL);
-    CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_->fireTestPredefinedTypeBroadcastEvent(_uint32Value, _stringValue);
+    assert((CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_.lock()) !=NULL);
+    auto stubAdapter = CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_.lock();
+   	if (stubAdapter)
+        stubAdapter->fireTestPredefinedTypeBroadcastEvent(_uint32Value, _stringValue);
 }
 void TestInterfaceStubDefault::fireTestSelectiveBroadcastSelective(const std::shared_ptr<CommonAPI::ClientIdList> _receivers) {
-	assert((CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_) !=NULL);
-    CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_->sendTestSelectiveBroadcastSelective(_receivers);
+    assert((CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_.lock()) !=NULL);
+    auto stubAdapter = CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_.lock();
+    if (stubAdapter)
+        stubAdapter->sendTestSelectiveBroadcastSelective(_receivers);
 }
 void TestInterfaceStubDefault::onTestSelectiveBroadcastSelectiveSubscriptionChanged(const std::shared_ptr<CommonAPI::ClientId> _client, const CommonAPI::SelectiveBroadcastSubscriptionEvent _event) {
+    (void)_client;
+    (void)_event;
     // No operation in default
 }
 bool TestInterfaceStubDefault::onTestSelectiveBroadcastSelectiveSubscriptionRequested(const std::shared_ptr<CommonAPI::ClientId> _client) {
+    (void)_client;
     // Accept in default
     return true;
 }
 std::shared_ptr<CommonAPI::ClientIdList> const TestInterfaceStubDefault::getSubscribersForTestSelectiveBroadcastSelective() {
-	assert((CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_) !=NULL);
-    return(CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_->getSubscribersForTestSelectiveBroadcastSelective());
+    assert((CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_.lock()) !=NULL);
+    auto stubAdapter = CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_.lock();
+   	if (stubAdapter)
+        return(stubAdapter->getSubscribersForTestSelectiveBroadcastSelective());
+    else
+        return NULL;
 }
 
 void TestInterfaceStubDefault::fireTestBroadcastWithOutArgsSelective(const uint32_t &_uint32Value, const std::string &_stringValue, const std::shared_ptr<CommonAPI::ClientIdList> _receivers) {
-	assert((CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_) !=NULL);
-    CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_->sendTestBroadcastWithOutArgsSelective(_uint32Value, _stringValue, _receivers);
+    assert((CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_.lock()) !=NULL);
+    auto stubAdapter = CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_.lock();
+    if (stubAdapter)
+        stubAdapter->sendTestBroadcastWithOutArgsSelective(_uint32Value, _stringValue, _receivers);
 }
 void TestInterfaceStubDefault::onTestBroadcastWithOutArgsSelectiveSubscriptionChanged(const std::shared_ptr<CommonAPI::ClientId> _client, const CommonAPI::SelectiveBroadcastSubscriptionEvent _event) {
+    (void)_client;
+    (void)_event;
     // No operation in default
 }
 bool TestInterfaceStubDefault::onTestBroadcastWithOutArgsSelectiveSubscriptionRequested(const std::shared_ptr<CommonAPI::ClientId> _client) {
+    (void)_client;
     // Accept in default
     return true;
 }
 std::shared_ptr<CommonAPI::ClientIdList> const TestInterfaceStubDefault::getSubscribersForTestBroadcastWithOutArgsSelective() {
-	assert((CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_) !=NULL);
-    return(CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_->getSubscribersForTestBroadcastWithOutArgsSelective());
+    assert((CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_.lock()) !=NULL);
+    auto stubAdapter = CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>::stubAdapter_.lock();
+   	if (stubAdapter)
+        return(stubAdapter->getSubscribersForTestBroadcastWithOutArgsSelective());
+    else
+        return NULL;
 }
 
 
@@ -265,4 +328,4 @@ TestInterfaceStubDefault::RemoteEventHandler::RemoteEventHandler(TestInterfaceSt
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStubDefault.hpp
index aec9e54..a5ddbb3 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStubDefault.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -11,10 +11,10 @@
 #define COMMONAPI_TESTS_Test_Interface_STUB_DEFAULT_HPP_
 
 
-#include <v1_0/commonapi/tests/TestInterfaceStub.hpp>
+#include <v1/commonapi/tests/TestInterfaceStub.hpp>
 #include <sstream>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -108,15 +108,19 @@ protected:
 private:
     TestInterfaceStubDefault::RemoteEventHandler remoteEventHandler_;
 
-    uint32_t testPredefinedTypeAttributeAttributeValue_;
-    ::commonapi::tests::DerivedTypeCollection::TestStructExtended testDerivedStructAttributeAttributeValue_;
-    ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 testDerivedArrayAttributeAttributeValue_;
+    uint32_t testPredefinedTypeAttributeAttributeValue_ {};
+    ::commonapi::tests::DerivedTypeCollection::TestStructExtended testDerivedStructAttributeAttributeValue_ {};
+    ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 testDerivedArrayAttributeAttributeValue_ {};
 
     CommonAPI::Version interfaceVersion_;
 };
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_Test_Interface_STUB_DEFAULT
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterface.cpp b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterface.cpp
index f0c9365..46bfa98 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterface.cpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterface.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -9,7 +9,7 @@
 */
 #include "BranchInterface.hpp"
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -19,4 +19,4 @@ namespace managed {
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterface.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterface.hpp
index 2070910..4b95f46 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterface.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterface.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -23,7 +23,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -41,9 +41,22 @@ public:
             NOTOK = 1
         };
         
-        testBranchMethodError() = default;
+        testBranchMethodError()
+            : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(Literal::OK)) {}
         testBranchMethodError(const Literal &_value) 
             : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_value)) {}
+        testBranchMethodError(const int32_t &_value) 
+            : CommonAPI::Enumeration<int32_t>(_value) {}
+    
+        inline bool validate() const {
+            switch (value_) {
+            case static_cast<int32_t>(Literal::OK):
+            case static_cast<int32_t>(Literal::NOTOK):
+                return true;
+            default:
+                return false;
+            }
+        }
     
         inline bool operator==(const testBranchMethodError &_other) const { return (value_ == _other.value_); }
         inline bool operator!=(const testBranchMethodError &_other) const { return (value_ != _other.value_); }
@@ -73,9 +86,13 @@ CommonAPI::Version BranchInterface::getInterfaceVersion() {
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 namespace CommonAPI {
 }
 
+
+// Compatibility
+namespace v1_0 = v1;
+
 #endif // COMMONAPI_TESTS_MANAGED_BRANCH_INTERFACE_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceProxy.hpp
index bff2547..a8a4f49 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceProxy.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,7 +10,7 @@
 #ifndef COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_HPP_
 #define COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_HPP_
 
-#include <v1_0/commonapi/tests/managed/BranchInterfaceProxyBase.hpp>
+#include <v1/commonapi/tests/managed/BranchInterfaceProxyBase.hpp>
 
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
@@ -20,7 +20,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -29,7 +29,7 @@ template <typename ... _AttributeExtensions>
 class BranchInterfaceProxy
     : virtual public BranchInterface, 
       virtual public BranchInterfaceProxyBase,
-      public _AttributeExtensions... {
+      virtual public _AttributeExtensions... {
 public:
     BranchInterfaceProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
     ~BranchInterfaceProxy();
@@ -59,7 +59,7 @@ public:
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> testBranchMethodAsync(const int32_t &_inInt, const std::string &_inString, TestBranchMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr);
+    virtual std::future<CommonAPI::CallStatus> testBranchMethodAsync(const int32_t &_inInt, const std::string &_inString, TestBranchMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr);
 
 
     /**
@@ -148,7 +148,11 @@ CommonAPI::InterfaceVersionAttribute& BranchInterfaceProxy<_AttributeExtensions.
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 
+
+// Compatibility
+namespace v1_0 = v1;
+
 #endif // COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceProxyBase.hpp
index 4296bca..de4d3ef 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceProxyBase.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,7 +10,7 @@
 #ifndef COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_BASE_HPP_
 #define COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_BASE_HPP_
 
-#include <v1_0/commonapi/tests/managed/BranchInterface.hpp>
+#include <v1/commonapi/tests/managed/BranchInterface.hpp>
 
 
 
@@ -26,7 +26,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -40,12 +40,16 @@ public:
 
 
     virtual void testBranchMethod(const int32_t &_inInt, const std::string &_inString, CommonAPI::CallStatus &_internalCallStatus, BranchInterface::testBranchMethodError &_error, int32_t &_outInt, std::string &_outString, const CommonAPI::CallInfo *_info = nullptr) = 0;
-    virtual std::future<CommonAPI::CallStatus> testBranchMethodAsync(const int32_t &_inInt, const std::string &_inString, TestBranchMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr) = 0;
+    virtual std::future<CommonAPI::CallStatus> testBranchMethodAsync(const int32_t &_inInt, const std::string &_inString, TestBranchMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr) = 0;
 };
 
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStub.hpp
index 9b7a01d..b2cd06b 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStub.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -15,7 +15,7 @@
 
 
 
-#include <v1_0/commonapi/tests/managed/BranchInterface.hpp>
+#include <v1/commonapi/tests/managed/BranchInterface.hpp>
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -27,7 +27,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -39,8 +39,8 @@ namespace managed {
  * An application developer should not need to bother with this class.
  */
 class BranchInterfaceStubAdapter
-    : virtual public CommonAPI::StubAdapter, 
-      public BranchInterface {
+    : public virtual CommonAPI::StubAdapter, 
+      public virtual BranchInterface {
  public:
 
 
@@ -101,6 +101,10 @@ public:
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStubDefault.cpp
index 10b02a7..d8e59bd 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStubDefault.cpp
@@ -1,16 +1,16 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#include <v1_0/commonapi/tests/managed/BranchInterfaceStubDefault.hpp>
+#include <v1/commonapi/tests/managed/BranchInterfaceStubDefault.hpp>
 #include <assert.h>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -21,6 +21,7 @@ BranchInterfaceStubDefault::BranchInterfaceStubDefault():
 }
 
 const CommonAPI::Version& BranchInterfaceStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> _client) {
+    (void)_client;
     return interfaceVersion_;
 }
 
@@ -31,6 +32,9 @@ BranchInterfaceStubRemoteEvent* BranchInterfaceStubDefault::initStubAdapter(cons
 
 
 void BranchInterfaceStubDefault::testBranchMethod(const std::shared_ptr<CommonAPI::ClientId> _client, int32_t _inInt, std::string _inString, testBranchMethodReply_t _reply) {
+    (void)_client;
+    (void) _inInt;
+    (void) _inString;
     BranchInterface::testBranchMethodError error;
     int32_t outInt = 0;
     std::string outString = "";
@@ -48,4 +52,4 @@ BranchInterfaceStubDefault::RemoteEventHandler::RemoteEventHandler(BranchInterfa
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStubDefault.hpp
index 3cdd147..5e494f0 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStubDefault.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -11,10 +11,10 @@
 #define COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_DEFAULT_HPP_
 
 
-#include <v1_0/commonapi/tests/managed/BranchInterfaceStub.hpp>
+#include <v1/commonapi/tests/managed/BranchInterfaceStub.hpp>
 #include <sstream>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -62,6 +62,10 @@ private:
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_DEFAULT
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterface.cpp b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterface.cpp
index e2f172b..285a8d6 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterface.cpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterface.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -9,7 +9,7 @@
 */
 #include "LeafInterface.hpp"
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -19,4 +19,4 @@ namespace managed {
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterface.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterface.hpp
index ac7e377..a8332b4 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterface.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterface.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -23,7 +23,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -41,9 +41,22 @@ public:
             NOTOK = 1
         };
         
-        testLeafMethodError() = default;
+        testLeafMethodError()
+            : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(Literal::OK)) {}
         testLeafMethodError(const Literal &_value) 
             : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_value)) {}
+        testLeafMethodError(const int32_t &_value) 
+            : CommonAPI::Enumeration<int32_t>(_value) {}
+    
+        inline bool validate() const {
+            switch (value_) {
+            case static_cast<int32_t>(Literal::OK):
+            case static_cast<int32_t>(Literal::NOTOK):
+                return true;
+            default:
+                return false;
+            }
+        }
     
         inline bool operator==(const testLeafMethodError &_other) const { return (value_ == _other.value_); }
         inline bool operator!=(const testLeafMethodError &_other) const { return (value_ != _other.value_); }
@@ -73,9 +86,13 @@ CommonAPI::Version LeafInterface::getInterfaceVersion() {
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 namespace CommonAPI {
 }
 
+
+// Compatibility
+namespace v1_0 = v1;
+
 #endif // COMMONAPI_TESTS_MANAGED_LEAF_INTERFACE_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceProxy.hpp
index a0382f4..852a916 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceProxy.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,7 +10,7 @@
 #ifndef COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_HPP_
 #define COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_HPP_
 
-#include <v1_0/commonapi/tests/managed/LeafInterfaceProxyBase.hpp>
+#include <v1/commonapi/tests/managed/LeafInterfaceProxyBase.hpp>
 
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
@@ -20,7 +20,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -29,7 +29,7 @@ template <typename ... _AttributeExtensions>
 class LeafInterfaceProxy
     : virtual public LeafInterface, 
       virtual public LeafInterfaceProxyBase,
-      public _AttributeExtensions... {
+      virtual public _AttributeExtensions... {
 public:
     LeafInterfaceProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
     ~LeafInterfaceProxy();
@@ -59,7 +59,7 @@ public:
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> testLeafMethodAsync(const int32_t &_inInt, const std::string &_inString, TestLeafMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr);
+    virtual std::future<CommonAPI::CallStatus> testLeafMethodAsync(const int32_t &_inInt, const std::string &_inString, TestLeafMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr);
 
 
     /**
@@ -148,7 +148,11 @@ CommonAPI::InterfaceVersionAttribute& LeafInterfaceProxy<_AttributeExtensions...
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 
+
+// Compatibility
+namespace v1_0 = v1;
+
 #endif // COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceProxyBase.hpp
index f00bd30..bd4c9ff 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceProxyBase.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,7 +10,7 @@
 #ifndef COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_BASE_HPP_
 #define COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_BASE_HPP_
 
-#include <v1_0/commonapi/tests/managed/LeafInterface.hpp>
+#include <v1/commonapi/tests/managed/LeafInterface.hpp>
 
 
 
@@ -26,7 +26,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -40,12 +40,16 @@ public:
 
 
     virtual void testLeafMethod(const int32_t &_inInt, const std::string &_inString, CommonAPI::CallStatus &_internalCallStatus, LeafInterface::testLeafMethodError &_error, int32_t &_outInt, std::string &_outString, const CommonAPI::CallInfo *_info = nullptr) = 0;
-    virtual std::future<CommonAPI::CallStatus> testLeafMethodAsync(const int32_t &_inInt, const std::string &_inString, TestLeafMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr) = 0;
+    virtual std::future<CommonAPI::CallStatus> testLeafMethodAsync(const int32_t &_inInt, const std::string &_inString, TestLeafMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr) = 0;
 };
 
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStub.hpp
index 62e2a0a..43b58f9 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStub.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -15,7 +15,7 @@
 
 
 
-#include <v1_0/commonapi/tests/managed/LeafInterface.hpp>
+#include <v1/commonapi/tests/managed/LeafInterface.hpp>
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -27,7 +27,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -39,8 +39,8 @@ namespace managed {
  * An application developer should not need to bother with this class.
  */
 class LeafInterfaceStubAdapter
-    : virtual public CommonAPI::StubAdapter, 
-      public LeafInterface {
+    : public virtual CommonAPI::StubAdapter, 
+      public virtual LeafInterface {
  public:
 
 
@@ -101,6 +101,10 @@ public:
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStubDefault.cpp
index 89bad18..c30041d 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStubDefault.cpp
@@ -1,16 +1,16 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#include <v1_0/commonapi/tests/managed/LeafInterfaceStubDefault.hpp>
+#include <v1/commonapi/tests/managed/LeafInterfaceStubDefault.hpp>
 #include <assert.h>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -21,6 +21,7 @@ LeafInterfaceStubDefault::LeafInterfaceStubDefault():
 }
 
 const CommonAPI::Version& LeafInterfaceStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> _client) {
+    (void)_client;
     return interfaceVersion_;
 }
 
@@ -31,6 +32,9 @@ LeafInterfaceStubRemoteEvent* LeafInterfaceStubDefault::initStubAdapter(const st
 
 
 void LeafInterfaceStubDefault::testLeafMethod(const std::shared_ptr<CommonAPI::ClientId> _client, int32_t _inInt, std::string _inString, testLeafMethodReply_t _reply) {
+    (void)_client;
+    (void) _inInt;
+    (void) _inString;
     LeafInterface::testLeafMethodError error;
     int32_t outInt = 0;
     std::string outString = "";
@@ -48,4 +52,4 @@ LeafInterfaceStubDefault::RemoteEventHandler::RemoteEventHandler(LeafInterfaceSt
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStubDefault.hpp
index 9d9dd2b..b66a486 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStubDefault.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -11,10 +11,10 @@
 #define COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_DEFAULT_HPP_
 
 
-#include <v1_0/commonapi/tests/managed/LeafInterfaceStub.hpp>
+#include <v1/commonapi/tests/managed/LeafInterfaceStub.hpp>
 #include <sstream>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -62,6 +62,10 @@ private:
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_DEFAULT
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterface.cpp b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterface.cpp
index 42e6cea..b1f04dc 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterface.cpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterface.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -9,7 +9,7 @@
 */
 #include "RootInterface.hpp"
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -19,4 +19,4 @@ namespace managed {
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterface.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterface.hpp
index 72ab4f2..c505b5c 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterface.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterface.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -24,7 +24,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -42,9 +42,22 @@ public:
             NOTOK = 1
         };
         
-        testRootMethodError() = default;
+        testRootMethodError()
+            : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(Literal::OK)) {}
         testRootMethodError(const Literal &_value) 
             : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_value)) {}
+        testRootMethodError(const int32_t &_value) 
+            : CommonAPI::Enumeration<int32_t>(_value) {}
+    
+        inline bool validate() const {
+            switch (value_) {
+            case static_cast<int32_t>(Literal::OK):
+            case static_cast<int32_t>(Literal::NOTOK):
+                return true;
+            default:
+                return false;
+            }
+        }
     
         inline bool operator==(const testRootMethodError &_other) const { return (value_ == _other.value_); }
         inline bool operator!=(const testRootMethodError &_other) const { return (value_ != _other.value_); }
@@ -74,9 +87,13 @@ CommonAPI::Version RootInterface::getInterfaceVersion() {
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 namespace CommonAPI {
 }
 
+
+// Compatibility
+namespace v1_0 = v1;
+
 #endif // COMMONAPI_TESTS_MANAGED_ROOT_INTERFACE_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceProxy.hpp
index 04e4002..c2b8aa2 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceProxy.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,7 +10,7 @@
 #ifndef COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_HPP_
 #define COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_HPP_
 
-#include <v1_0/commonapi/tests/managed/RootInterfaceProxyBase.hpp>
+#include <v1/commonapi/tests/managed/RootInterfaceProxyBase.hpp>
 
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
@@ -20,7 +20,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -29,7 +29,7 @@ template <typename ... _AttributeExtensions>
 class RootInterfaceProxy
     : virtual public RootInterface, 
       virtual public RootInterfaceProxyBase,
-      public _AttributeExtensions... {
+      virtual public _AttributeExtensions... {
 public:
     RootInterfaceProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
     ~RootInterfaceProxy();
@@ -59,7 +59,7 @@ public:
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> testRootMethodAsync(const int32_t &_inInt, const std::string &_inString, TestRootMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr);
+    virtual std::future<CommonAPI::CallStatus> testRootMethodAsync(const int32_t &_inInt, const std::string &_inString, TestRootMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr);
 
     virtual CommonAPI::ProxyManager& getProxyManagerLeafInterface();
     virtual CommonAPI::ProxyManager& getProxyManagerBranchInterface();
@@ -158,7 +158,11 @@ CommonAPI::ProxyManager& RootInterfaceProxy<_AttributeExtensions...>::getProxyMa
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 
+
+// Compatibility
+namespace v1_0 = v1;
+
 #endif // COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceProxyBase.hpp
index 60d512c..70f7c49 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceProxyBase.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,11 +10,11 @@
 #ifndef COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_BASE_HPP_
 #define COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_BASE_HPP_
 
-#include <v1_0/commonapi/tests/managed/RootInterface.hpp>
+#include <v1/commonapi/tests/managed/RootInterface.hpp>
 
 
-#include <v1_0/commonapi/tests/managed/BranchInterfaceStub.hpp>
-#include <v1_0/commonapi/tests/managed/LeafInterfaceStub.hpp>
+#include <v1/commonapi/tests/managed/BranchInterfaceStub.hpp>
+#include <v1/commonapi/tests/managed/LeafInterfaceStub.hpp>
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -29,7 +29,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -43,7 +43,7 @@ public:
 
 
     virtual void testRootMethod(const int32_t &_inInt, const std::string &_inString, CommonAPI::CallStatus &_internalCallStatus, RootInterface::testRootMethodError &_error, int32_t &_outInt, std::string &_outString, const CommonAPI::CallInfo *_info = nullptr) = 0;
-    virtual std::future<CommonAPI::CallStatus> testRootMethodAsync(const int32_t &_inInt, const std::string &_inString, TestRootMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr) = 0;
+    virtual std::future<CommonAPI::CallStatus> testRootMethodAsync(const int32_t &_inInt, const std::string &_inString, TestRootMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr) = 0;
     virtual CommonAPI::ProxyManager& getProxyManagerLeafInterface() = 0;
     virtual CommonAPI::ProxyManager& getProxyManagerBranchInterface() = 0;
 };
@@ -51,6 +51,10 @@ public:
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStub.hpp
index f78527e..da4abbc 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStub.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -14,10 +14,10 @@
 
 
 
-#include <v1_0/commonapi/tests/managed/BranchInterfaceStub.hpp>
-#include <v1_0/commonapi/tests/managed/LeafInterfaceStub.hpp>
+#include <v1/commonapi/tests/managed/BranchInterfaceStub.hpp>
+#include <v1/commonapi/tests/managed/LeafInterfaceStub.hpp>
 
-#include <v1_0/commonapi/tests/managed/RootInterface.hpp>
+#include <v1/commonapi/tests/managed/RootInterface.hpp>
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -29,7 +29,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -41,15 +41,15 @@ namespace managed {
  * An application developer should not need to bother with this class.
  */
 class RootInterfaceStubAdapter
-    : virtual public CommonAPI::StubAdapter, 
-      public RootInterface {
+    : public virtual CommonAPI::StubAdapter, 
+      public virtual RootInterface {
  public:
 
 
-    virtual bool registerManagedStubLeafInterface(std::shared_ptr<LeafInterfaceStub>, const std::string&) = 0;
+    virtual bool registerManagedStubLeafInterface(std::shared_ptr<::v1::commonapi::tests::managed::LeafInterfaceStub>, const std::string&) = 0;
     virtual bool deregisterManagedStubLeafInterface(const std::string&) = 0;
     virtual std::set<std::string>& getLeafInterfaceInstances() = 0;
-    virtual bool registerManagedStubBranchInterface(std::shared_ptr<BranchInterfaceStub>, const std::string&) = 0;
+    virtual bool registerManagedStubBranchInterface(std::shared_ptr<::v1::commonapi::tests::managed::BranchInterfaceStub>, const std::string&) = 0;
     virtual bool deregisterManagedStubBranchInterface(const std::string&) = 0;
     virtual std::set<std::string>& getBranchInterfaceInstances() = 0;
 
@@ -99,10 +99,10 @@ public:
     /// This is the method that will be called on remote calls on the method testRootMethod.
     virtual void testRootMethod(const std::shared_ptr<CommonAPI::ClientId> _client, int32_t _inInt, std::string _inString, testRootMethodReply_t _reply) = 0;
 
-    virtual bool registerManagedStubLeafInterface(std::shared_ptr<LeafInterfaceStub>, const std::string&) = 0;
+    virtual bool registerManagedStubLeafInterface(std::shared_ptr<::v1::commonapi::tests::managed::LeafInterfaceStub>, const std::string&) = 0;
     virtual bool deregisterManagedStubLeafInterface(const std::string&) = 0;
     virtual std::set<std::string>& getLeafInterfaceInstances() = 0;
-    virtual bool registerManagedStubBranchInterface(std::shared_ptr<BranchInterfaceStub>, const std::string&) = 0;
+    virtual bool registerManagedStubBranchInterface(std::shared_ptr<::v1::commonapi::tests::managed::BranchInterfaceStub>, const std::string&) = 0;
     virtual bool deregisterManagedStubBranchInterface(const std::string&) = 0;
     virtual std::set<std::string>& getBranchInterfaceInstances() = 0;
     using CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::initStubAdapter;
@@ -115,6 +115,10 @@ public:
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStubDefault.cpp
new file mode 100644
index 0000000..9a06017
--- /dev/null
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStubDefault.cpp
@@ -0,0 +1,134 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#include <v1/commonapi/tests/managed/RootInterfaceStubDefault.hpp>
+#include <assert.h>
+
+namespace v1 {
+namespace commonapi {
+namespace tests {
+namespace managed {
+
+RootInterfaceStubDefault::RootInterfaceStubDefault():
+        remoteEventHandler_(this),
+        autoInstanceCounter_(0),
+        interfaceVersion_(RootInterface::getInterfaceVersion()) {
+}
+
+const CommonAPI::Version& RootInterfaceStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> _client) {
+    (void)_client;
+    return interfaceVersion_;
+}
+
+RootInterfaceStubRemoteEvent* RootInterfaceStubDefault::initStubAdapter(const std::shared_ptr<RootInterfaceStubAdapter> &_adapter) {
+    CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_ = _adapter;
+    return &remoteEventHandler_;
+}
+
+
+void RootInterfaceStubDefault::testRootMethod(const std::shared_ptr<CommonAPI::ClientId> _client, int32_t _inInt, std::string _inString, testRootMethodReply_t _reply) {
+    (void)_client;
+    (void) _inInt;
+    (void) _inString;
+    RootInterface::testRootMethodError error;
+    int32_t outInt = 0;
+    std::string outString = "";
+    _reply(error, outInt, outString);
+}
+
+
+
+bool RootInterfaceStubDefault::registerManagedStubLeafInterfaceAutoInstance(std::shared_ptr<::v1::commonapi::tests::managed::LeafInterfaceStub> _stub) {
+    autoInstanceCounter_++;
+    std::stringstream ss;
+    assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_.lock()) !=NULL);
+    auto stubAdapter = CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_.lock();
+    if (stubAdapter) {
+        ss << stubAdapter->getAddress().getInstance() << ".i" << autoInstanceCounter_;
+        std::string instance = ss.str();
+        return stubAdapter->registerManagedStubLeafInterface(_stub, instance);
+    } else {
+        return false;
+    }
+}
+bool RootInterfaceStubDefault::registerManagedStubLeafInterface(std::shared_ptr<::v1::commonapi::tests::managed::LeafInterfaceStub> _stub, const std::string &_instance) {
+    assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_.lock()) !=NULL);
+    auto stubAdapter = CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_.lock();
+    if (stubAdapter) 
+        return stubAdapter->registerManagedStubLeafInterface(_stub, _instance);
+    else
+        return false;
+}
+bool RootInterfaceStubDefault::deregisterManagedStubLeafInterface(const std::string &_instance) {
+    assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_.lock()) !=NULL);
+    auto stubAdapter = CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_.lock();
+    if (stubAdapter) 
+        return stubAdapter->deregisterManagedStubLeafInterface(_instance);
+    else
+        return false;
+}
+std::set<std::string>& RootInterfaceStubDefault::getLeafInterfaceInstances() {
+    assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_.lock()) !=NULL);
+    auto stubAdapter = CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_.lock();
+    if (stubAdapter) {
+        return stubAdapter->getLeafInterfaceInstances();
+    } else {
+        static std::set<std::string> emptySet = std::set<std::string>();
+        return emptySet;
+    }
+}
+bool RootInterfaceStubDefault::registerManagedStubBranchInterfaceAutoInstance(std::shared_ptr<::v1::commonapi::tests::managed::BranchInterfaceStub> _stub) {
+    autoInstanceCounter_++;
+    std::stringstream ss;
+    assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_.lock()) !=NULL);
+    auto stubAdapter = CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_.lock();
+    if (stubAdapter) {
+        ss << stubAdapter->getAddress().getInstance() << ".i" << autoInstanceCounter_;
+        std::string instance = ss.str();
+        return stubAdapter->registerManagedStubBranchInterface(_stub, instance);
+    } else {
+        return false;
+    }
+}
+bool RootInterfaceStubDefault::registerManagedStubBranchInterface(std::shared_ptr<::v1::commonapi::tests::managed::BranchInterfaceStub> _stub, const std::string &_instance) {
+    assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_.lock()) !=NULL);
+    auto stubAdapter = CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_.lock();
+    if (stubAdapter) 
+        return stubAdapter->registerManagedStubBranchInterface(_stub, _instance);
+    else
+        return false;
+}
+bool RootInterfaceStubDefault::deregisterManagedStubBranchInterface(const std::string &_instance) {
+    assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_.lock()) !=NULL);
+    auto stubAdapter = CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_.lock();
+    if (stubAdapter) 
+        return stubAdapter->deregisterManagedStubBranchInterface(_instance);
+    else
+        return false;
+}
+std::set<std::string>& RootInterfaceStubDefault::getBranchInterfaceInstances() {
+    assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_.lock()) !=NULL);
+    auto stubAdapter = CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_.lock();
+    if (stubAdapter) {
+        return stubAdapter->getBranchInterfaceInstances();
+    } else {
+        static std::set<std::string> emptySet = std::set<std::string>();
+        return emptySet;
+    }
+}
+
+RootInterfaceStubDefault::RemoteEventHandler::RemoteEventHandler(RootInterfaceStubDefault *_defaultStub)
+    : 
+      defaultStub_(_defaultStub) {
+}
+
+} // namespace managed
+} // namespace tests
+} // namespace commonapi
+} // namespace v1
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStubDefault.hpp
index ae51dab..c207d38 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStubDefault.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -11,10 +11,10 @@
 #define COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_DEFAULT_HPP_
 
 
-#include <v1_0/commonapi/tests/managed/RootInterfaceStub.hpp>
+#include <v1/commonapi/tests/managed/RootInterfaceStub.hpp>
 #include <sstream>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -42,12 +42,12 @@ public:
     virtual void testRootMethod(const std::shared_ptr<CommonAPI::ClientId> _client, int32_t _inInt, std::string _inString, testRootMethodReply_t _reply);
 
 
-    bool registerManagedStubLeafInterfaceAutoInstance(std::shared_ptr<LeafInterfaceStub>);
-    bool registerManagedStubLeafInterface(std::shared_ptr<LeafInterfaceStub>, const std::string&);
+    bool registerManagedStubLeafInterfaceAutoInstance(std::shared_ptr<::v1::commonapi::tests::managed::LeafInterfaceStub>);
+    bool registerManagedStubLeafInterface(std::shared_ptr<::v1::commonapi::tests::managed::LeafInterfaceStub>, const std::string&);
     bool deregisterManagedStubLeafInterface(const std::string&);
     std::set<std::string>& getLeafInterfaceInstances();
-    bool registerManagedStubBranchInterfaceAutoInstance(std::shared_ptr<BranchInterfaceStub>);
-    bool registerManagedStubBranchInterface(std::shared_ptr<BranchInterfaceStub>, const std::string&);
+    bool registerManagedStubBranchInterfaceAutoInstance(std::shared_ptr<::v1::commonapi::tests::managed::BranchInterfaceStub>);
+    bool registerManagedStubBranchInterface(std::shared_ptr<::v1::commonapi::tests::managed::BranchInterfaceStub>, const std::string&);
     bool deregisterManagedStubBranchInterface(const std::string&);
     std::set<std::string>& getBranchInterfaceInstances();
 
@@ -71,6 +71,10 @@ private:
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_DEFAULT
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRoot.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRoot.hpp
index 9a7a6b8..57c1225 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRoot.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRoot.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -22,7 +22,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -47,9 +47,13 @@ CommonAPI::Version SecondRoot::getInterfaceVersion() {
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 namespace CommonAPI {
 }
 
+
+// Compatibility
+namespace v1_0 = v1;
+
 #endif // COMMONAPI_TESTS_MANAGED_SECOND_ROOT_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootProxy.hpp
index 5c2a9e8..0aec7bb 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootProxy.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootProxy.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,7 +10,7 @@
 #ifndef COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_HPP_
 #define COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_HPP_
 
-#include <v1_0/commonapi/tests/managed/SecondRootProxyBase.hpp>
+#include <v1/commonapi/tests/managed/SecondRootProxyBase.hpp>
 
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
@@ -20,7 +20,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -29,7 +29,7 @@ template <typename ... _AttributeExtensions>
 class SecondRootProxy
     : virtual public SecondRoot, 
       virtual public SecondRootProxyBase,
-      public _AttributeExtensions... {
+      virtual public _AttributeExtensions... {
 public:
     SecondRootProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
     ~SecondRootProxy();
@@ -123,7 +123,11 @@ CommonAPI::ProxyManager& SecondRootProxy<_AttributeExtensions...>::getProxyManag
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 
+
+// Compatibility
+namespace v1_0 = v1;
+
 #endif // COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootProxyBase.hpp
index 9fc8c35..11dda50 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootProxyBase.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootProxyBase.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,10 +10,10 @@
 #ifndef COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_BASE_HPP_
 #define COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_BASE_HPP_
 
-#include <v1_0/commonapi/tests/managed/SecondRoot.hpp>
+#include <v1/commonapi/tests/managed/SecondRoot.hpp>
 
 
-#include <v1_0/commonapi/tests/managed/LeafInterfaceStub.hpp>
+#include <v1/commonapi/tests/managed/LeafInterfaceStub.hpp>
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -25,7 +25,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -43,6 +43,10 @@ public:
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStub.hpp
index 01cb65d..16526e5 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootStub.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStub.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -14,9 +14,9 @@
 
 
 
-#include <v1_0/commonapi/tests/managed/LeafInterfaceStub.hpp>
+#include <v1/commonapi/tests/managed/LeafInterfaceStub.hpp>
 
-#include <v1_0/commonapi/tests/managed/SecondRoot.hpp>
+#include <v1/commonapi/tests/managed/SecondRoot.hpp>
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -27,7 +27,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -39,12 +39,12 @@ namespace managed {
  * An application developer should not need to bother with this class.
  */
 class SecondRootStubAdapter
-    : virtual public CommonAPI::StubAdapter, 
-      public SecondRoot {
+    : public virtual CommonAPI::StubAdapter, 
+      public virtual SecondRoot {
  public:
 
 
-    virtual bool registerManagedStubLeafInterface(std::shared_ptr<LeafInterfaceStub>, const std::string&) = 0;
+    virtual bool registerManagedStubLeafInterface(std::shared_ptr<::v1::commonapi::tests::managed::LeafInterfaceStub>, const std::string&) = 0;
     virtual bool deregisterManagedStubLeafInterface(const std::string&) = 0;
     virtual std::set<std::string>& getLeafInterfaceInstances() = 0;
 
@@ -91,7 +91,7 @@ public:
 
 
 
-    virtual bool registerManagedStubLeafInterface(std::shared_ptr<LeafInterfaceStub>, const std::string&) = 0;
+    virtual bool registerManagedStubLeafInterface(std::shared_ptr<::v1::commonapi::tests::managed::LeafInterfaceStub>, const std::string&) = 0;
     virtual bool deregisterManagedStubLeafInterface(const std::string&) = 0;
     virtual std::set<std::string>& getLeafInterfaceInstances() = 0;
     using CommonAPI::Stub<SecondRootStubAdapter, SecondRootStubRemoteEvent>::initStubAdapter;
@@ -104,6 +104,10 @@ public:
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_MANAGED_Second_Root_STUB_HPP_
diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStubDefault.cpp
new file mode 100644
index 0000000..8bd5886
--- /dev/null
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStubDefault.cpp
@@ -0,0 +1,85 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#include <v1/commonapi/tests/managed/SecondRootStubDefault.hpp>
+#include <assert.h>
+
+namespace v1 {
+namespace commonapi {
+namespace tests {
+namespace managed {
+
+SecondRootStubDefault::SecondRootStubDefault():
+        remoteEventHandler_(this),
+        autoInstanceCounter_(0),
+        interfaceVersion_(SecondRoot::getInterfaceVersion()) {
+}
+
+const CommonAPI::Version& SecondRootStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> _client) {
+    (void)_client;
+    return interfaceVersion_;
+}
+
+SecondRootStubRemoteEvent* SecondRootStubDefault::initStubAdapter(const std::shared_ptr<SecondRootStubAdapter> &_adapter) {
+    CommonAPI::Stub<SecondRootStubAdapter, SecondRootStubRemoteEvent>::stubAdapter_ = _adapter;
+    return &remoteEventHandler_;
+}
+
+
+
+
+bool SecondRootStubDefault::registerManagedStubLeafInterfaceAutoInstance(std::shared_ptr<::v1::commonapi::tests::managed::LeafInterfaceStub> _stub) {
+    autoInstanceCounter_++;
+    std::stringstream ss;
+    assert((CommonAPI::Stub<SecondRootStubAdapter, SecondRootStubRemoteEvent>::stubAdapter_.lock()) !=NULL);
+    auto stubAdapter = CommonAPI::Stub<SecondRootStubAdapter, SecondRootStubRemoteEvent>::stubAdapter_.lock();
+    if (stubAdapter) {
+        ss << stubAdapter->getAddress().getInstance() << ".i" << autoInstanceCounter_;
+        std::string instance = ss.str();
+        return stubAdapter->registerManagedStubLeafInterface(_stub, instance);
+    } else {
+        return false;
+    }
+}
+bool SecondRootStubDefault::registerManagedStubLeafInterface(std::shared_ptr<::v1::commonapi::tests::managed::LeafInterfaceStub> _stub, const std::string &_instance) {
+    assert((CommonAPI::Stub<SecondRootStubAdapter, SecondRootStubRemoteEvent>::stubAdapter_.lock()) !=NULL);
+    auto stubAdapter = CommonAPI::Stub<SecondRootStubAdapter, SecondRootStubRemoteEvent>::stubAdapter_.lock();
+    if (stubAdapter) 
+        return stubAdapter->registerManagedStubLeafInterface(_stub, _instance);
+    else
+        return false;
+}
+bool SecondRootStubDefault::deregisterManagedStubLeafInterface(const std::string &_instance) {
+    assert((CommonAPI::Stub<SecondRootStubAdapter, SecondRootStubRemoteEvent>::stubAdapter_.lock()) !=NULL);
+    auto stubAdapter = CommonAPI::Stub<SecondRootStubAdapter, SecondRootStubRemoteEvent>::stubAdapter_.lock();
+    if (stubAdapter) 
+        return stubAdapter->deregisterManagedStubLeafInterface(_instance);
+    else
+        return false;
+}
+std::set<std::string>& SecondRootStubDefault::getLeafInterfaceInstances() {
+    assert((CommonAPI::Stub<SecondRootStubAdapter, SecondRootStubRemoteEvent>::stubAdapter_.lock()) !=NULL);
+    auto stubAdapter = CommonAPI::Stub<SecondRootStubAdapter, SecondRootStubRemoteEvent>::stubAdapter_.lock();
+    if (stubAdapter) {
+        return stubAdapter->getLeafInterfaceInstances();
+    } else {
+        static std::set<std::string> emptySet = std::set<std::string>();
+        return emptySet;
+    }
+}
+
+SecondRootStubDefault::RemoteEventHandler::RemoteEventHandler(SecondRootStubDefault *_defaultStub)
+    : 
+      defaultStub_(_defaultStub) {
+}
+
+} // namespace managed
+} // namespace tests
+} // namespace commonapi
+} // namespace v1
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStubDefault.hpp
index c56d7ac..e1b9ba2 100644
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootStubDefault.hpp
+++ b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStubDefault.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -11,10 +11,10 @@
 #define COMMONAPI_TESTS_MANAGED_Second_Root_STUB_DEFAULT_HPP_
 
 
-#include <v1_0/commonapi/tests/managed/SecondRootStub.hpp>
+#include <v1/commonapi/tests/managed/SecondRootStub.hpp>
 #include <sstream>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -41,8 +41,8 @@ public:
 
 
 
-    bool registerManagedStubLeafInterfaceAutoInstance(std::shared_ptr<LeafInterfaceStub>);
-    bool registerManagedStubLeafInterface(std::shared_ptr<LeafInterfaceStub>, const std::string&);
+    bool registerManagedStubLeafInterfaceAutoInstance(std::shared_ptr<::v1::commonapi::tests::managed::LeafInterfaceStub>);
+    bool registerManagedStubLeafInterface(std::shared_ptr<::v1::commonapi::tests::managed::LeafInterfaceStub>, const std::string&);
     bool deregisterManagedStubLeafInterface(const std::string&);
     std::set<std::string>& getLeafInterfaceInstances();
 
@@ -66,6 +66,10 @@ private:
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // COMMONAPI_TESTS_MANAGED_Second_Root_STUB_DEFAULT
diff --git a/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterface.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterface.hpp
index 5106b3e..8a09882 100644
--- a/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterface.hpp
+++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterface.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -21,7 +21,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace fake {
 namespace legacy {
 namespace service {
@@ -46,9 +46,13 @@ CommonAPI::Version LegacyInterface::getInterfaceVersion() {
 } // namespace service
 } // namespace legacy
 } // namespace fake
-} // namespace v1_0
+} // namespace v1
 
 namespace CommonAPI {
 }
 
+
+// Compatibility
+namespace v1_0 = v1;
+
 #endif // FAKE_LEGACY_SERVICE_LEGACY_INTERFACE_HPP_
diff --git a/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceProxy.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceProxy.hpp
index 94c54c1..d2173da 100644
--- a/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceProxy.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,7 +10,7 @@
 #ifndef FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_HPP_
 #define FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_HPP_
 
-#include <v1_0/fake/legacy/service/LegacyInterfaceProxyBase.hpp>
+#include <v1/fake/legacy/service/LegacyInterfaceProxyBase.hpp>
 
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
@@ -20,7 +20,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace fake {
 namespace legacy {
 namespace service {
@@ -29,7 +29,7 @@ template <typename ... _AttributeExtensions>
 class LegacyInterfaceProxy
     : virtual public LegacyInterface, 
       virtual public LegacyInterfaceProxyBase,
-      public _AttributeExtensions... {
+      virtual public _AttributeExtensions... {
 public:
     LegacyInterfaceProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
     ~LegacyInterfaceProxy();
@@ -59,7 +59,7 @@ public:
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> TestMethodAsync(const int32_t &_input, TestMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr);
+    virtual std::future<CommonAPI::CallStatus> TestMethodAsync(const int32_t &_input, TestMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr);
     /**
      * Calls OtherTestMethod with synchronous semantics.
      * 
@@ -79,7 +79,7 @@ public:
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> OtherTestMethodAsync(OtherTestMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr);
+    virtual std::future<CommonAPI::CallStatus> OtherTestMethodAsync(OtherTestMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr);
     /**
      * Calls finish with synchronous semantics.
      * 
@@ -98,7 +98,7 @@ public:
      * The std::future returned by this method will be fulfilled at arrival of the reply.
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
-    virtual std::future<CommonAPI::CallStatus> finishAsync(FinishAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr);
+    virtual std::future<CommonAPI::CallStatus> finishAsync(FinishAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr);
 
 
     /**
@@ -205,7 +205,11 @@ CommonAPI::InterfaceVersionAttribute& LegacyInterfaceProxy<_AttributeExtensions.
 } // namespace service
 } // namespace legacy
 } // namespace fake
-} // namespace v1_0
+} // namespace v1
 
 
+
+// Compatibility
+namespace v1_0 = v1;
+
 #endif // FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceProxyBase.hpp
index 86f4f54..dae25c5 100644
--- a/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceProxyBase.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,7 +10,7 @@
 #ifndef FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_BASE_HPP_
 #define FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_BASE_HPP_
 
-#include <v1_0/fake/legacy/service/LegacyInterface.hpp>
+#include <v1/fake/legacy/service/LegacyInterface.hpp>
 
 
 
@@ -26,7 +26,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace fake {
 namespace legacy {
 namespace service {
@@ -42,16 +42,20 @@ public:
 
 
     virtual void TestMethod(const int32_t &_input, CommonAPI::CallStatus &_internalCallStatus, int32_t &_val1, int32_t &_val2, const CommonAPI::CallInfo *_info = nullptr) = 0;
-    virtual std::future<CommonAPI::CallStatus> TestMethodAsync(const int32_t &_input, TestMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr) = 0;
+    virtual std::future<CommonAPI::CallStatus> TestMethodAsync(const int32_t &_input, TestMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr) = 0;
     virtual void OtherTestMethod(CommonAPI::CallStatus &_internalCallStatus, std::string &_greeting, int32_t &_identifier, const CommonAPI::CallInfo *_info = nullptr) = 0;
-    virtual std::future<CommonAPI::CallStatus> OtherTestMethodAsync(OtherTestMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr) = 0;
+    virtual std::future<CommonAPI::CallStatus> OtherTestMethodAsync(OtherTestMethodAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr) = 0;
     virtual void finish(CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info = nullptr) = 0;
-    virtual std::future<CommonAPI::CallStatus> finishAsync(FinishAsyncCallback _callback, const CommonAPI::CallInfo *_info = nullptr) = 0;
+    virtual std::future<CommonAPI::CallStatus> finishAsync(FinishAsyncCallback _callback = nullptr, const CommonAPI::CallInfo *_info = nullptr) = 0;
 };
 
 } // namespace service
 } // namespace legacy
 } // namespace fake
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceStub.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStub.hpp
index e95255b..0824f31 100644
--- a/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStub.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -15,7 +15,7 @@
 
 
 
-#include <v1_0/fake/legacy/service/LegacyInterface.hpp>
+#include <v1/fake/legacy/service/LegacyInterface.hpp>
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -27,7 +27,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace fake {
 namespace legacy {
 namespace service {
@@ -39,8 +39,8 @@ namespace service {
  * An application developer should not need to bother with this class.
  */
 class LegacyInterfaceStubAdapter
-    : virtual public CommonAPI::StubAdapter, 
-      public LegacyInterface {
+    : public virtual CommonAPI::StubAdapter, 
+      public virtual LegacyInterface {
  public:
 
 
@@ -107,6 +107,10 @@ public:
 } // namespace service
 } // namespace legacy
 } // namespace fake
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_HPP_
diff --git a/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStubDefault.cpp
index aebd241..6a8bae2 100644
--- a/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStubDefault.cpp
@@ -1,16 +1,16 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#include <v1_0/fake/legacy/service/LegacyInterfaceStubDefault.hpp>
+#include <v1/fake/legacy/service/LegacyInterfaceStubDefault.hpp>
 #include <assert.h>
 
-namespace v1_0 {
+namespace v1 {
 namespace fake {
 namespace legacy {
 namespace service {
@@ -21,6 +21,7 @@ LegacyInterfaceStubDefault::LegacyInterfaceStubDefault():
 }
 
 const CommonAPI::Version& LegacyInterfaceStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> _client) {
+    (void)_client;
     return interfaceVersion_;
 }
 
@@ -31,18 +32,22 @@ LegacyInterfaceStubRemoteEvent* LegacyInterfaceStubDefault::initStubAdapter(cons
 
 
 void LegacyInterfaceStubDefault::TestMethod(const std::shared_ptr<CommonAPI::ClientId> _client, int32_t _input, TestMethodReply_t _reply) {
+    (void)_client;
+    (void) _input;
     int32_t val1 = 0;
     int32_t val2 = 0;
     _reply(val1, val2);
 }
 
 void LegacyInterfaceStubDefault::OtherTestMethod(const std::shared_ptr<CommonAPI::ClientId> _client, OtherTestMethodReply_t _reply) {
+    (void)_client;
     std::string greeting = "";
     int32_t identifier = 0;
     _reply(greeting, identifier);
 }
 
 void LegacyInterfaceStubDefault::finish(const std::shared_ptr<CommonAPI::ClientId> _client, finishReply_t _reply) {
+    (void)_client;
     _reply();
 }
 
@@ -57,4 +62,4 @@ LegacyInterfaceStubDefault::RemoteEventHandler::RemoteEventHandler(LegacyInterfa
 } // namespace service
 } // namespace legacy
 } // namespace fake
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStubDefault.hpp
index 50754c7..4f06bbd 100644
--- a/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStubDefault.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.core 3.1.4.v201511201311.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -11,10 +11,10 @@
 #define FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_DEFAULT_HPP_
 
 
-#include <v1_0/fake/legacy/service/LegacyInterfaceStub.hpp>
+#include <v1/fake/legacy/service/LegacyInterfaceStub.hpp>
 #include <sstream>
 
-namespace v1_0 {
+namespace v1 {
 namespace fake {
 namespace legacy {
 namespace service {
@@ -64,6 +64,10 @@ private:
 } // namespace service
 } // namespace legacy
 } // namespace fake
-} // namespace v1_0
+} // namespace v1
+
+
+// Compatibility
+namespace v1_0 = v1;
 
 #endif // FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_DEFAULT
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceStubDefault.cpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceStubDefault.cpp
deleted file mode 100644
index 9fc6c40..0000000
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceStubDefault.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
-* Used org.franca.core 0.9.1.201412191134.
-*
-* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-* If a copy of the MPL was not distributed with this file, You can obtain one at
-* http://mozilla.org/MPL/2.0/.
-*/
-#include <v1_0/commonapi/tests/managed/RootInterfaceStubDefault.hpp>
-#include <assert.h>
-
-namespace v1_0 {
-namespace commonapi {
-namespace tests {
-namespace managed {
-
-RootInterfaceStubDefault::RootInterfaceStubDefault():
-        remoteEventHandler_(this),
-        autoInstanceCounter_(0),
-        interfaceVersion_(RootInterface::getInterfaceVersion()) {
-}
-
-const CommonAPI::Version& RootInterfaceStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> _client) {
-    return interfaceVersion_;
-}
-
-RootInterfaceStubRemoteEvent* RootInterfaceStubDefault::initStubAdapter(const std::shared_ptr<RootInterfaceStubAdapter> &_adapter) {
-    CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_ = _adapter;
-    return &remoteEventHandler_;
-}
-
-
-void RootInterfaceStubDefault::testRootMethod(const std::shared_ptr<CommonAPI::ClientId> _client, int32_t _inInt, std::string _inString, testRootMethodReply_t _reply) {
-    RootInterface::testRootMethodError error;
-    int32_t outInt = 0;
-    std::string outString = "";
-    _reply(error, outInt, outString);
-}
-
-
-
-bool RootInterfaceStubDefault::registerManagedStubLeafInterfaceAutoInstance(std::shared_ptr<LeafInterfaceStub> _stub) {
-    autoInstanceCounter_++;
-    std::stringstream ss;
-    ss << CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_->getAddress().getInstance() << ".i" << autoInstanceCounter_;
-    std::string instance = ss.str();
-    assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_) !=NULL);
-    return CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_->registerManagedStubLeafInterface(_stub, instance);
-}
-bool RootInterfaceStubDefault::registerManagedStubLeafInterface(std::shared_ptr<LeafInterfaceStub> _stub, const std::string &_instance) {
-	assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_) !=NULL);
-    return CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_->registerManagedStubLeafInterface(_stub, _instance);
-}
-bool RootInterfaceStubDefault::deregisterManagedStubLeafInterface(const std::string &_instance) {
-	assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_) !=NULL);
-    return CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_->deregisterManagedStubLeafInterface(_instance);
-}
-std::set<std::string>& RootInterfaceStubDefault::getLeafInterfaceInstances() {
-	assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_) !=NULL);
-    return CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_->getLeafInterfaceInstances();
-}
-bool RootInterfaceStubDefault::registerManagedStubBranchInterfaceAutoInstance(std::shared_ptr<BranchInterfaceStub> _stub) {
-    autoInstanceCounter_++;
-    std::stringstream ss;
-    ss << CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_->getAddress().getInstance() << ".i" << autoInstanceCounter_;
-    std::string instance = ss.str();
-    assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_) !=NULL);
-    return CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_->registerManagedStubBranchInterface(_stub, instance);
-}
-bool RootInterfaceStubDefault::registerManagedStubBranchInterface(std::shared_ptr<BranchInterfaceStub> _stub, const std::string &_instance) {
-	assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_) !=NULL);
-    return CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_->registerManagedStubBranchInterface(_stub, _instance);
-}
-bool RootInterfaceStubDefault::deregisterManagedStubBranchInterface(const std::string &_instance) {
-	assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_) !=NULL);
-    return CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_->deregisterManagedStubBranchInterface(_instance);
-}
-std::set<std::string>& RootInterfaceStubDefault::getBranchInterfaceInstances() {
-	assert((CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_) !=NULL);
-    return CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>::stubAdapter_->getBranchInterfaceInstances();
-}
-
-RootInterfaceStubDefault::RemoteEventHandler::RemoteEventHandler(RootInterfaceStubDefault *_defaultStub)
-    : 
-      defaultStub_(_defaultStub) {
-}
-
-} // namespace managed
-} // namespace tests
-} // namespace commonapi
-} // namespace v1_0
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootStubDefault.cpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootStubDefault.cpp
deleted file mode 100644
index 452aadc..0000000
--- a/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootStubDefault.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
-* Used org.franca.core 0.9.1.201412191134.
-*
-* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-* If a copy of the MPL was not distributed with this file, You can obtain one at
-* http://mozilla.org/MPL/2.0/.
-*/
-#include <v1_0/commonapi/tests/managed/SecondRootStubDefault.hpp>
-#include <assert.h>
-
-namespace v1_0 {
-namespace commonapi {
-namespace tests {
-namespace managed {
-
-SecondRootStubDefault::SecondRootStubDefault():
-        remoteEventHandler_(this),
-        autoInstanceCounter_(0),
-        interfaceVersion_(SecondRoot::getInterfaceVersion()) {
-}
-
-const CommonAPI::Version& SecondRootStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> _client) {
-    return interfaceVersion_;
-}
-
-SecondRootStubRemoteEvent* SecondRootStubDefault::initStubAdapter(const std::shared_ptr<SecondRootStubAdapter> &_adapter) {
-    CommonAPI::Stub<SecondRootStubAdapter, SecondRootStubRemoteEvent>::stubAdapter_ = _adapter;
-    return &remoteEventHandler_;
-}
-
-
-
-
-bool SecondRootStubDefault::registerManagedStubLeafInterfaceAutoInstance(std::shared_ptr<LeafInterfaceStub> _stub) {
-    autoInstanceCounter_++;
-    std::stringstream ss;
-    ss << CommonAPI::Stub<SecondRootStubAdapter, SecondRootStubRemoteEvent>::stubAdapter_->getAddress().getInstance() << ".i" << autoInstanceCounter_;
-    std::string instance = ss.str();
-    assert((CommonAPI::Stub<SecondRootStubAdapter, SecondRootStubRemoteEvent>::stubAdapter_) !=NULL);
-    return CommonAPI::Stub<SecondRootStubAdapter, SecondRootStubRemoteEvent>::stubAdapter_->registerManagedStubLeafInterface(_stub, instance);
-}
-bool SecondRootStubDefault::registerManagedStubLeafInterface(std::shared_ptr<LeafInterfaceStub> _stub, const std::string &_instance) {
-	assert((CommonAPI::Stub<SecondRootStubAdapter, SecondRootStubRemoteEvent>::stubAdapter_) !=NULL);
-    return CommonAPI::Stub<SecondRootStubAdapter, SecondRootStubRemoteEvent>::stubAdapter_->registerManagedStubLeafInterface(_stub, _instance);
-}
-bool SecondRootStubDefault::deregisterManagedStubLeafInterface(const std::string &_instance) {
-	assert((CommonAPI::Stub<SecondRootStubAdapter, SecondRootStubRemoteEvent>::stubAdapter_) !=NULL);
-    return CommonAPI::Stub<SecondRootStubAdapter, SecondRootStubRemoteEvent>::stubAdapter_->deregisterManagedStubLeafInterface(_instance);
-}
-std::set<std::string>& SecondRootStubDefault::getLeafInterfaceInstances() {
-	assert((CommonAPI::Stub<SecondRootStubAdapter, SecondRootStubRemoteEvent>::stubAdapter_) !=NULL);
-    return CommonAPI::Stub<SecondRootStubAdapter, SecondRootStubRemoteEvent>::stubAdapter_->getLeafInterfaceInstances();
-}
-
-SecondRootStubDefault::RemoteEventHandler::RemoteEventHandler(SecondRootStubDefault *_defaultStub)
-    : 
-      defaultStub_(_defaultStub) {
-}
-
-} // namespace managed
-} // namespace tests
-} // namespace commonapi
-} // namespace v1_0
diff --git a/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.cpp b/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.cpp
index 102ab6f..34c8d55 100644
--- a/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.cpp
@@ -1,13 +1,12 @@
-
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
-* Used org.franca.core 0.9.1.201412191134.
-*
-* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-* If a copy of the MPL was not distributed with this file, You can obtain one at
-* http://mozilla.org/MPL/2.0/.
-*/
+        /*
+        * This file was generated by the CommonAPI Generators.
+        * Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+        * Used org.franca.core 0.9.1.201412191134.
+        *
+        * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+        * If a copy of the MPL was not distributed with this file, You can obtain one at
+        * http://mozilla.org/MPL/2.0/.
+        */
 #include "DerivedTypeCollectionDBusDeployment.hpp"
 
 namespace commonapi {
diff --git a/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp b/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp
index 289f537..b963cc7 100644
--- a/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -8,8 +8,8 @@
 * http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef COMMONAPI_DBUS_DERIVEDTYPECOLLECTION_DEPLOYMENT_HPP_
-#define COMMONAPI_DBUS_DERIVEDTYPECOLLECTION_DEPLOYMENT_HPP_
+#ifndef COMMONAPI_TESTS_DERIVED_TYPE_COLLECTION_DBUS_DEPLOYMENT_HPP_
+#define COMMONAPI_TESTS_DERIVED_TYPE_COLLECTION_DBUS_DEPLOYMENT_HPP_
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -99,4 +99,4 @@ typedef CommonAPI::DBus::StructDeployment<
 } // namespace tests
 } // namespace commonapi
 
-#endif // COMMONAPI_DBUS_DERIVEDTYPECOLLECTION_DEPLOYMENT_HPP_
+#endif // COMMONAPI_TESTS_DERIVED_TYPE_COLLECTION_DBUS_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.cpp b/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.cpp
new file mode 100644
index 0000000..1e846e6
--- /dev/null
+++ b/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.cpp
@@ -0,0 +1,20 @@
+        /*
+        * This file was generated by the CommonAPI Generators.
+        * Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+        * Used org.franca.core 0.9.1.201412191134.
+        *
+        * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+        * If a copy of the MPL was not distributed with this file, You can obtain one at
+        * http://mozilla.org/MPL/2.0/.
+        */
+#include "PredefinedTypeCollectionDBusDeployment.hpp"
+
+namespace commonapi {
+namespace tests {
+namespace PredefinedTypeCollection_ {
+
+// typecollection-specific deployments
+
+} // namespace PredefinedTypeCollection_
+} // namespace tests
+} // namespace commonapi
diff --git a/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.hpp b/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.hpp
new file mode 100644
index 0000000..5d04aa4
--- /dev/null
+++ b/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.hpp
@@ -0,0 +1,58 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+
+#ifndef COMMONAPI_TESTS_PREDEFINED_TYPE_COLLECTION_DBUS_DEPLOYMENT_HPP_
+#define COMMONAPI_TESTS_PREDEFINED_TYPE_COLLECTION_DBUS_DEPLOYMENT_HPP_
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+#include <CommonAPI/DBus/DBusDeployment.hpp>
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace commonapi {
+namespace tests {
+namespace PredefinedTypeCollection_ {
+
+// typecollection-specific deployment types
+typedef CommonAPI::EmptyDeployment TestUInt8Deployment_t;
+
+typedef CommonAPI::EmptyDeployment TestUInt16Deployment_t;
+
+typedef CommonAPI::EmptyDeployment TestUInt32Deployment_t;
+
+typedef CommonAPI::EmptyDeployment TestUInt64Deployment_t;
+
+typedef CommonAPI::EmptyDeployment TestInt8Deployment_t;
+
+typedef CommonAPI::EmptyDeployment TestInt16Deployment_t;
+
+typedef CommonAPI::EmptyDeployment TestInt32Deployment_t;
+
+typedef CommonAPI::EmptyDeployment TestInt64Deployment_t;
+
+typedef CommonAPI::EmptyDeployment TestBooleanDeployment_t;
+
+typedef CommonAPI::EmptyDeployment TestByteBufferDeployment_t;
+
+typedef CommonAPI::EmptyDeployment TestDoubleDeployment_t;
+
+typedef CommonAPI::EmptyDeployment TestFloatDeployment_t;
+
+typedef CommonAPI::DBus::StringDeployment TestStringDeployment_t;
+
+
+// typecollection-specific deployments
+
+} // namespace PredefinedTypeCollection_
+} // namespace tests
+} // namespace commonapi
+
+#endif // COMMONAPI_TESTS_PREDEFINED_TYPE_COLLECTION_DBUS_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusDeployment.cpp
index a267c64..5350a38 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusDeployment.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -9,7 +9,7 @@
 */
 #include "ExtendedInterfaceDBusDeployment.hpp"
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace ExtendedInterface_ {
@@ -25,4 +25,4 @@ namespace ExtendedInterface_ {
 } // namespace ExtendedInterface_
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusDeployment.hpp
index aa20be0..3cae58f 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -19,7 +19,7 @@
 #include <CommonAPI/DBus/DBusDeployment.hpp>
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace ExtendedInterface_ {
@@ -38,6 +38,6 @@ namespace ExtendedInterface_ {
 } // namespace ExtendedInterface_
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_DBUS_EXTENDEDINTERFACE_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusProxy.cpp
new file mode 100644
index 0000000..1dacb44
--- /dev/null
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusProxy.cpp
@@ -0,0 +1,83 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#include <v1/commonapi/tests/ExtendedInterfaceDBusProxy.hpp>
+
+namespace v1 {
+namespace commonapi {
+namespace tests {
+
+std::shared_ptr<CommonAPI::DBus::DBusProxy> createExtendedInterfaceDBusProxy(
+	const CommonAPI::DBus::DBusAddress &_address,
+	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection) {
+	return std::make_shared<ExtendedInterfaceDBusProxy>(_address, _connection);
+}
+
+INITIALIZER(registerExtendedInterfaceDBusProxy) {
+     CommonAPI::DBus::Factory::get()->registerProxyCreateMethod(
+		ExtendedInterface::getInterface(),
+		&createExtendedInterfaceDBusProxy);
+}
+
+ExtendedInterfaceDBusProxy::ExtendedInterfaceDBusProxy(
+	const CommonAPI::DBus::DBusAddress &_address,
+	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection)
+	:	CommonAPI::DBus::DBusProxy(_address, _connection),
+		TestInterfaceDBusProxy(_address, _connection)
+{
+}
+
+
+    
+    void ExtendedInterfaceDBusProxy::TestIntMethodExtended(const uint32_t &_inInt, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            >
+        	>::callMethodWithReply(
+        *this,
+        "TestIntMethodExtended",
+        "u",
+(_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+deploy_inInt,
+_internalCallStatus);
+}
+    std::future<CommonAPI::CallStatus> ExtendedInterfaceDBusProxy::TestIntMethodExtendedAsync(const uint32_t &_inInt, TestIntMethodExtendedAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        return CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            >
+        	>::callMethodAsync(
+        *this,
+        "TestIntMethodExtended",
+        "u",
+        (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+        deploy_inInt,
+        [_callback] (CommonAPI::CallStatus _internalCallStatus) {
+        	if (_callback)
+        		_callback(_internalCallStatus);
+        },
+        std::make_tuple());
+    }
+
+
+void ExtendedInterfaceDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
+          ownVersionMajor = 1;
+          ownVersionMinor = 0;
+      }
+
+      } // namespace tests
+      } // namespace commonapi
+      } // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusProxy.hpp
index a3358bf..f4ba72f 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusProxy.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,8 +10,9 @@
 #ifndef COMMONAPI_TESTS_Extended_Interface_DBUS_PROXY_HPP_
 #define COMMONAPI_TESTS_Extended_Interface_DBUS_PROXY_HPP_
 
-#include <v1_0/commonapi/tests/ExtendedInterfaceProxyBase.hpp>
-#include <v1_0/commonapi/tests/TestInterfaceDBusProxy.hpp>
+#include <v1/commonapi/tests/ExtendedInterfaceProxyBase.hpp>
+#include <v1/commonapi/tests/TestInterfaceDBusProxy.hpp>
+#include "v1/commonapi/tests/ExtendedInterfaceDBusDeployment.hpp"
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -20,12 +21,13 @@
 #include <CommonAPI/DBus/DBusAddress.hpp>
 #include <CommonAPI/DBus/DBusFactory.hpp>
 #include <CommonAPI/DBus/DBusProxy.hpp>
+#include <CommonAPI/DBus/DBusAddressTranslator.hpp>
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
 #include <string>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -48,14 +50,14 @@ public:
     virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
 
 private:
-    
+   
 
 
 };
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_TESTS_Extended_Interface_DBUS_PROXY_HPP_
 
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp
index 40578de..cb579a5 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp
@@ -1,16 +1,16 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#include <v1_0/commonapi/tests/ExtendedInterface.hpp>
-#include <v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp>
+#include <v1/commonapi/tests/ExtendedInterface.hpp>
+#include <v1/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -47,62 +47,62 @@ const char* ExtendedInterfaceDBusStubAdapterInternal::getMethodsDBusIntrospectio
 }
 
 CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        ExtendedInterfaceStub,
+        ::v1::commonapi::tests::ExtendedInterfaceStub,
         CommonAPI::Version
         > ExtendedInterfaceDBusStubAdapterInternal::getExtendedInterfaceInterfaceVersionStubDispatcher(&ExtendedInterfaceStub::getInterfaceVersion, "uu");
 
 
 #ifdef WIN32
 CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        ExtendedInterfaceStub,
+        ::v1::commonapi::tests::ExtendedInterfaceStub,
         uint32_t
         > ExtendedInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher(
-            &ExtendedInterfaceStub::getTestPredefinedTypeAttributeAttribute
+            &::v1::commonapi::tests::ExtendedInterfaceStub::getTestPredefinedTypeAttributeAttribute
             , "u"
             );
 CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        ExtendedInterfaceStub,
+        ::v1::commonapi::tests::ExtendedInterfaceStub,
         uint32_t
         > ExtendedInterfaceDBusStubAdapterInternal::setTestPredefinedTypeAttributeAttributeStubDispatcher(
-                &ExtendedInterfaceStub::getTestPredefinedTypeAttributeAttribute,
+                &::v1::commonapi::tests::ExtendedInterfaceStub::getTestPredefinedTypeAttributeAttribute,
                 &ExtendedInterfaceStubRemoteEvent::onRemoteSetTestPredefinedTypeAttributeAttribute,
                 &ExtendedInterfaceStubRemoteEvent::onRemoteTestPredefinedTypeAttributeAttributeChanged
                 ,&ExtendedInterfaceStubAdapter::fireTestPredefinedTypeAttributeAttributeChanged
                 ,"u"
                 );
 CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        ExtendedInterfaceStub,
+        ::v1::commonapi::tests::ExtendedInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
         ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t
         > ExtendedInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher(
-            &ExtendedInterfaceStub::getTestDerivedStructAttributeAttribute
+            &::v1::commonapi::tests::ExtendedInterfaceStub::getTestDerivedStructAttributeAttribute
             , "(sqi)"
             );
 CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        ExtendedInterfaceStub,
+        ::v1::commonapi::tests::ExtendedInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
         ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t
         > ExtendedInterfaceDBusStubAdapterInternal::setTestDerivedStructAttributeAttributeStubDispatcher(
-                &ExtendedInterfaceStub::getTestDerivedStructAttributeAttribute,
+                &::v1::commonapi::tests::ExtendedInterfaceStub::getTestDerivedStructAttributeAttribute,
                 &ExtendedInterfaceStubRemoteEvent::onRemoteSetTestDerivedStructAttributeAttribute,
                 &ExtendedInterfaceStubRemoteEvent::onRemoteTestDerivedStructAttributeAttributeChanged
                 ,&ExtendedInterfaceStubAdapter::fireTestDerivedStructAttributeAttributeChanged
                 ,"(sqi)"
                 );
 CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        ExtendedInterfaceStub,
+        ::v1::commonapi::tests::ExtendedInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
         ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t
         > ExtendedInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher(
-            &ExtendedInterfaceStub::getTestDerivedArrayAttributeAttribute
+            &::v1::commonapi::tests::ExtendedInterfaceStub::getTestDerivedArrayAttributeAttribute
             , "at"
             );
 CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        ExtendedInterfaceStub,
+        ::v1::commonapi::tests::ExtendedInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
         ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t
         > ExtendedInterfaceDBusStubAdapterInternal::setTestDerivedArrayAttributeAttributeStubDispatcher(
-                &ExtendedInterfaceStub::getTestDerivedArrayAttributeAttribute,
+                &::v1::commonapi::tests::ExtendedInterfaceStub::getTestDerivedArrayAttributeAttribute,
                 &ExtendedInterfaceStubRemoteEvent::onRemoteSetTestDerivedArrayAttributeAttribute,
                 &ExtendedInterfaceStubRemoteEvent::onRemoteTestDerivedArrayAttributeAttributeChanged
                 ,&ExtendedInterfaceStubAdapter::fireTestDerivedArrayAttributeAttributeChanged
@@ -112,7 +112,7 @@ CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
 
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     std::tuple<uint32_t>,
     std::tuple<>,
     std::tuple<CommonAPI::EmptyDeployment>,
@@ -126,7 +126,7 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
 #ifdef WIN32
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     std::tuple<>,
     std::tuple<>,
     std::tuple<>,
@@ -138,7 +138,7 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
                 	std::make_tuple());
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     std::tuple<uint32_t, std::string>,
     std::tuple<>,
     std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>,
@@ -150,7 +150,7 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
                 	std::make_tuple());
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     std::tuple<uint32_t, std::string>,
     std::tuple<uint32_t, std::string>,
     std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>,
@@ -162,7 +162,7 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
                 	std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)));
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>,
     std::tuple<>,
     std::tuple<CommonAPI::EmptyDeployment, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t>,
@@ -174,7 +174,7 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
                 	std::make_tuple());
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>,
     std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>,
     std::tuple<CommonAPI::EmptyDeployment, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t>,
@@ -186,7 +186,7 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
                 	std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr)));
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     std::tuple<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>>,
     std::tuple<>,
     std::tuple<CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t>>,
@@ -198,7 +198,7 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
                 	std::make_tuple());
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic>,
     std::tuple<>,
     std::tuple<::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t>,
@@ -210,7 +210,7 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
                 	std::make_tuple());
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember>,
     std::tuple<>,
     std::tuple<::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t>,
@@ -222,7 +222,7 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
                 	std::make_tuple());
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap>,
     std::tuple<>,
     std::tuple<::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t>,
@@ -238,27 +238,27 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
 
 #ifdef WIN32
 CommonAPI::DBus::DBusMethodWithReplyAdapterDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     ExtendedInterfaceStubAdapter,
     std::tuple<>,
     std::tuple<bool>
     > ExtendedInterfaceDBusStubAdapterInternal::subscribeTestSelectiveBroadcastSelectiveStubDispatcher(&ExtendedInterfaceStubAdapter::subscribeForTestSelectiveBroadcastSelective, "b");
 
 CommonAPI::DBus::DBusMethodWithReplyAdapterDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     ExtendedInterfaceStubAdapter,
     std::tuple<>,
     std::tuple<>
     > ExtendedInterfaceDBusStubAdapterInternal::unsubscribeTestSelectiveBroadcastSelectiveStubDispatcher(&ExtendedInterfaceStubAdapter::unsubscribeFromTestSelectiveBroadcastSelective, "");
 CommonAPI::DBus::DBusMethodWithReplyAdapterDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     ExtendedInterfaceStubAdapter,
     std::tuple<>,
     std::tuple<bool>
     > ExtendedInterfaceDBusStubAdapterInternal::subscribeTestBroadcastWithOutArgsSelectiveStubDispatcher(&ExtendedInterfaceStubAdapter::subscribeForTestBroadcastWithOutArgsSelective, "b");
 
 CommonAPI::DBus::DBusMethodWithReplyAdapterDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     ExtendedInterfaceStubAdapter,
     std::tuple<>,
     std::tuple<>
@@ -330,10 +330,10 @@ ExtendedInterfaceDBusStubAdapterInternal::ExtendedInterfaceDBusStubAdapterIntern
     #endif
 }
 
-const bool ExtendedInterfaceDBusStubAdapterInternal::hasFreedesktopProperties() {
+bool ExtendedInterfaceDBusStubAdapterInternal::hasFreedesktopProperties() {
     return false;
 }
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp
index acbce43..26fc51b 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,14 +10,15 @@
 #ifndef COMMONAPI_TESTS_Extended_Interface_DBUS_STUB_ADAPTER_HPP_
 #define COMMONAPI_TESTS_Extended_Interface_DBUS_STUB_ADAPTER_HPP_
 
-#include <v1_0/commonapi/tests/ExtendedInterfaceStub.hpp>
-#include <v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.hpp>
-#include "v1_0/commonapi/tests/ExtendedInterfaceDBusDeployment.hpp"        
+#include <v1/commonapi/tests/ExtendedInterfaceStub.hpp>
+#include <v1/commonapi/tests/TestInterfaceDBusStubAdapter.hpp>
+#include "v1/commonapi/tests/ExtendedInterfaceDBusDeployment.hpp"        
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
 #endif
 
+#include <CommonAPI/DBus/DBusAddressTranslator.hpp>
 #include <CommonAPI/DBus/DBusFactory.hpp>
 #include <CommonAPI/DBus/DBusStubAdapterHelper.hpp>
 #include <CommonAPI/DBus/DBusStubAdapter.hpp>
@@ -25,7 +26,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -44,7 +45,11 @@ public:
 
     ~ExtendedInterfaceDBusStubAdapterInternal();
 
-    virtual const bool hasFreedesktopProperties();
+    virtual bool hasFreedesktopProperties();
+
+    inline static const char* getInterface() {
+        return ExtendedInterface::getInterface();
+    }
 
 
 
@@ -75,37 +80,37 @@ public:
     }
 
 static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        ExtendedInterfaceStub,
+        ::v1::commonapi::tests::ExtendedInterfaceStub,
         CommonAPI::Version
         > getExtendedInterfaceInterfaceVersionStubDispatcher;
 
 
 #ifdef WIN32
 static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        ExtendedInterfaceStub,
+        ::v1::commonapi::tests::ExtendedInterfaceStub,
         uint32_t                
         > getTestPredefinedTypeAttributeAttributeStubDispatcher;
 static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        ExtendedInterfaceStub,
+        ::v1::commonapi::tests::ExtendedInterfaceStub,
         uint32_t                    
         > setTestPredefinedTypeAttributeAttributeStubDispatcher;
 static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        ExtendedInterfaceStub,
+        ::v1::commonapi::tests::ExtendedInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
         ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t                
         > getTestDerivedStructAttributeAttributeStubDispatcher;
 static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        ExtendedInterfaceStub,
+        ::v1::commonapi::tests::ExtendedInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
         ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t                    
         > setTestDerivedStructAttributeAttributeStubDispatcher;
 static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        ExtendedInterfaceStub,
+        ::v1::commonapi::tests::ExtendedInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
         ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t                
         > getTestDerivedArrayAttributeAttributeStubDispatcher;
 static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        ExtendedInterfaceStub,
+        ::v1::commonapi::tests::ExtendedInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
         ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t                    
         > setTestDerivedArrayAttributeAttributeStubDispatcher;
@@ -113,7 +118,7 @@ static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
 
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     std::tuple<uint32_t>,
     std::tuple<>,
     std::tuple<CommonAPI::EmptyDeployment>,
@@ -124,7 +129,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
 #ifdef WIN32
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     std::tuple<>,
     std::tuple<>,
     std::tuple<>,
@@ -133,7 +138,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     > testEmptyMethodStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     std::tuple<uint32_t, std::string>,
     std::tuple<>,
     std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>,
@@ -142,7 +147,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     > testVoidPredefinedTypeMethodStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     std::tuple<uint32_t, std::string>,
     std::tuple<uint32_t, std::string>,
     std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>,
@@ -151,7 +156,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     > testPredefinedTypeMethodStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>,
     std::tuple<>,
     std::tuple<CommonAPI::EmptyDeployment, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t>,
@@ -160,7 +165,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     > testVoidDerivedTypeMethodStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>,
     std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>,
     std::tuple<CommonAPI::EmptyDeployment, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t>,
@@ -169,7 +174,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     > testDerivedTypeMethodStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     std::tuple<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>>,
     std::tuple<>,
     std::tuple<CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t>>,
@@ -178,7 +183,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     > testArrayOfPolymorphicStructMethodStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic>,
     std::tuple<>,
     std::tuple<::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t>,
@@ -187,7 +192,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     > testMapOfPolymorphicStructMethodStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember>,
     std::tuple<>,
     std::tuple<::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t>,
@@ -196,7 +201,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     > testStructWithPolymorphicMemberMethodStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap>,
     std::tuple<>,
     std::tuple<::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t>,
@@ -208,27 +213,27 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
 
 #ifdef WIN32
 static CommonAPI::DBus::DBusMethodWithReplyAdapterDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     ExtendedInterfaceStubAdapter,
     std::tuple<>,
     std::tuple<bool>
     > subscribeTestSelectiveBroadcastSelectiveStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyAdapterDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     ExtendedInterfaceStubAdapter,
  std::tuple<>,
     std::tuple<>
     > unsubscribeTestSelectiveBroadcastSelectiveStubDispatcher;
 static CommonAPI::DBus::DBusMethodWithReplyAdapterDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     ExtendedInterfaceStubAdapter,
     std::tuple<>,
     std::tuple<bool>
     > subscribeTestBroadcastWithOutArgsSelectiveStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyAdapterDispatcher<
-    ExtendedInterfaceStub,
+    ::v1::commonapi::tests::ExtendedInterfaceStub,
     ExtendedInterfaceStubAdapter,
  std::tuple<>,
     std::tuple<>
@@ -264,6 +269,6 @@ public:
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_TESTS_Extended_Interface_DBUS_STUB_ADAPTER_HPP_
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.cpp
index c96b62e..2d53d35 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -9,7 +9,7 @@
 */
 #include "TestFreedesktopDerivedInterfaceDBusDeployment.hpp"
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace TestFreedesktopDerivedInterface_ {
@@ -25,4 +25,4 @@ namespace TestFreedesktopDerivedInterface_ {
 } // namespace TestFreedesktopDerivedInterface_
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.hpp
index bdb1c56..6169af6 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -19,7 +19,7 @@
 #include <CommonAPI/DBus/DBusDeployment.hpp>
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace TestFreedesktopDerivedInterface_ {
@@ -38,6 +38,6 @@ namespace TestFreedesktopDerivedInterface_ {
 } // namespace TestFreedesktopDerivedInterface_
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_DBUS_TESTFREEDESKTOPDERIVEDINTERFACE_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp
index d46a6cc..09aac22 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp
@@ -1,15 +1,15 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#include <v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp>
+#include <v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -20,7 +20,7 @@ std::shared_ptr<CommonAPI::DBus::DBusProxy> createTestFreedesktopDerivedInterfac
 }
 
 INITIALIZER(registerTestFreedesktopDerivedInterfaceDBusProxy) {
-	CommonAPI::DBus::Factory::get()->registerProxyCreateMethod(
+     CommonAPI::DBus::Factory::get()->registerProxyCreateMethod(
 		TestFreedesktopDerivedInterface::getInterface(),
 		&createTestFreedesktopDerivedInterfaceDBusProxy);
 }
@@ -30,22 +30,22 @@ TestFreedesktopDerivedInterfaceDBusProxy::TestFreedesktopDerivedInterfaceDBusPro
 	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection)
 	:	CommonAPI::DBus::DBusProxy(_address, _connection),
 		TestFreedesktopInterfaceDBusProxy(_address, _connection)
-,		testAttributedFromDerivedInterface_(*this, "onTestAttributedFromDerivedInterfaceAttributeChanged", "setTestAttributedFromDerivedInterfaceAttribute", "u", "getTestAttributedFromDerivedInterfaceAttribute", static_cast<CommonAPI::EmptyDeployment*>(nullptr))
+,		testAttributedFromDerivedInterface_(*this, getAddress().getInterface(), "TestAttributedFromDerivedInterface", static_cast<CommonAPI::EmptyDeployment*>(nullptr))
 {
 }
 
-        TestFreedesktopDerivedInterfaceDBusProxy::TestAttributedFromDerivedInterfaceAttribute& TestFreedesktopDerivedInterfaceDBusProxy::getTestAttributedFromDerivedInterfaceAttribute() {
-            return testAttributedFromDerivedInterface_;
-        }
+      TestFreedesktopDerivedInterfaceDBusProxy::TestAttributedFromDerivedInterfaceAttribute& TestFreedesktopDerivedInterfaceDBusProxy::getTestAttributedFromDerivedInterfaceAttribute() {
+          return testAttributedFromDerivedInterface_;
+      }
 
+    
 
 
+void TestFreedesktopDerivedInterfaceDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
+          ownVersionMajor = 1;
+          ownVersionMinor = 0;
+      }
 
-        void TestFreedesktopDerivedInterfaceDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
-            ownVersionMajor = 1;
-            ownVersionMinor = 0;
-        }
-
-        } // namespace tests
-        } // namespace commonapi
-        } // namespace v1_0
+      } // namespace tests
+      } // namespace commonapi
+      } // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp
index 24cfb5c..e7bd68a 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,8 +10,9 @@
 #ifndef COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_PROXY_HPP_
 #define COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_PROXY_HPP_
 
-#include <v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp>
-#include <v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp>
+#include <v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp>
+#include <v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp>
+#include "v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.hpp"
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -20,13 +21,15 @@
 #include <CommonAPI/DBus/DBusAddress.hpp>
 #include <CommonAPI/DBus/DBusFactory.hpp>
 #include <CommonAPI/DBus/DBusProxy.hpp>
+#include <CommonAPI/DBus/DBusAddressTranslator.hpp>
 #include <CommonAPI/DBus/DBusAttribute.hpp>
+#include <CommonAPI/DBus/DBusFreedesktopAttribute.hpp>
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
 #include <string>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -48,15 +51,15 @@ public:
     virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
 
 private:
-    
-    CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusAttribute<TestAttributedFromDerivedInterfaceAttribute>> testAttributedFromDerivedInterface_;
+   
+    CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopAttribute<TestAttributedFromDerivedInterfaceAttribute>> testAttributedFromDerivedInterface_;
 
 
 };
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_PROXY_HPP_
 
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp
index 75505eb..77577e1 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp
@@ -1,16 +1,16 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#include <v1_0/commonapi/tests/TestFreedesktopDerivedInterface.hpp>
-#include <v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp>
+#include <v1/commonapi/tests/TestFreedesktopDerivedInterface.hpp>
+#include <v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -38,106 +38,88 @@ void TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::deactivateManagedIn
 const char* TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const {
     static const std::string introspectionData =
         std::string(TestFreedesktopInterfaceDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData()) +
-        "<method name=\"getTestAttributedFromDerivedInterfaceAttribute\">\n"
-            "<arg name=\"value\" type=\"u\" direction=\"out\" />"
-        "</method>\n"
-        "<method name=\"setTestAttributedFromDerivedInterfaceAttribute\">\n"
-            "<arg name=\"requestedValue\" type=\"u\" direction=\"in\" />\n"
-            "<arg name=\"setValue\" type=\"u\" direction=\"out\" />\n"
-        "</method>\n"
-        "<signal name=\"onTestAttributedFromDerivedInterfaceAttributeChanged\">\n"
-            "<arg name=\"changedValue\" type=\"u\" />\n"
-        "</signal>\n"
+        "<property name=\"TestAttributedFromDerivedInterface\" type=\"u\" access=\"readwrite\" />\n"
 
     ;
     return introspectionData.c_str();
 }
 
 CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopDerivedInterfaceStub,
+        ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub,
         CommonAPI::Version
         > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestFreedesktopDerivedInterfaceInterfaceVersionStubDispatcher(&TestFreedesktopDerivedInterfaceStub::getInterfaceVersion, "uu");
 
-CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopDerivedInterfaceStub,
+CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub,
         uint32_t
         > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestAttributedFromDerivedInterfaceAttributeStubDispatcher(
-            &TestFreedesktopDerivedInterfaceStub::getTestAttributedFromDerivedInterfaceAttribute
-            , "u"
+            &::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub::getTestAttributedFromDerivedInterfaceAttribute
             );
-CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        TestFreedesktopDerivedInterfaceStub,
+CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub,
         uint32_t
         > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestAttributedFromDerivedInterfaceAttributeStubDispatcher(
-                &TestFreedesktopDerivedInterfaceStub::getTestAttributedFromDerivedInterfaceAttribute,
+                &::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub::getTestAttributedFromDerivedInterfaceAttribute,
                 &TestFreedesktopDerivedInterfaceStubRemoteEvent::onRemoteSetTestAttributedFromDerivedInterfaceAttribute,
                 &TestFreedesktopDerivedInterfaceStubRemoteEvent::onRemoteTestAttributedFromDerivedInterfaceAttributeChanged
                 ,&TestFreedesktopDerivedInterfaceStubAdapter::fireTestAttributedFromDerivedInterfaceAttributeChanged
-                ,"u"
                 );
 
 #ifdef WIN32
-CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopDerivedInterfaceStub,
+CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub,
         uint32_t
         > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher(
-            &TestFreedesktopDerivedInterfaceStub::getTestPredefinedTypeAttributeAttribute
-            , "u"
+            &::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub::getTestPredefinedTypeAttributeAttribute
             );
-CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        TestFreedesktopDerivedInterfaceStub,
+CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub,
         uint32_t
         > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestPredefinedTypeAttributeAttributeStubDispatcher(
-                &TestFreedesktopDerivedInterfaceStub::getTestPredefinedTypeAttributeAttribute,
+                &::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub::getTestPredefinedTypeAttributeAttribute,
                 &TestFreedesktopDerivedInterfaceStubRemoteEvent::onRemoteSetTestPredefinedTypeAttributeAttribute,
                 &TestFreedesktopDerivedInterfaceStubRemoteEvent::onRemoteTestPredefinedTypeAttributeAttributeChanged
                 ,&TestFreedesktopDerivedInterfaceStubAdapter::fireTestPredefinedTypeAttributeAttributeChanged
-                ,"u"
                 );
-CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopDerivedInterfaceStub,
+CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub,
         uint32_t
         > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestReadonlyAttributeAttributeStubDispatcher(
-            &TestFreedesktopDerivedInterfaceStub::getTestReadonlyAttributeAttribute
-            , "u"
+            &::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub::getTestReadonlyAttributeAttribute
             );
-CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopDerivedInterfaceStub,
+CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
         ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t
         > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher(
-            &TestFreedesktopDerivedInterfaceStub::getTestDerivedStructAttributeAttribute
-            , "(sqi)"
+            &::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub::getTestDerivedStructAttributeAttribute
             );
-CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        TestFreedesktopDerivedInterfaceStub,
+CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
         ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t
         > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestDerivedStructAttributeAttributeStubDispatcher(
-                &TestFreedesktopDerivedInterfaceStub::getTestDerivedStructAttributeAttribute,
+                &::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub::getTestDerivedStructAttributeAttribute,
                 &TestFreedesktopDerivedInterfaceStubRemoteEvent::onRemoteSetTestDerivedStructAttributeAttribute,
                 &TestFreedesktopDerivedInterfaceStubRemoteEvent::onRemoteTestDerivedStructAttributeAttributeChanged
                 ,&TestFreedesktopDerivedInterfaceStubAdapter::fireTestDerivedStructAttributeAttributeChanged
-                ,"(sqi)"
                 );
-CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopDerivedInterfaceStub,
+CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
         ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t
         > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher(
-            &TestFreedesktopDerivedInterfaceStub::getTestDerivedArrayAttributeAttribute
-            , "at"
+            &::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub::getTestDerivedArrayAttributeAttribute
             );
-CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        TestFreedesktopDerivedInterfaceStub,
+CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
         ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t
         > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestDerivedArrayAttributeAttributeStubDispatcher(
-                &TestFreedesktopDerivedInterfaceStub::getTestDerivedArrayAttributeAttribute,
+                &::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub::getTestDerivedArrayAttributeAttribute,
                 &TestFreedesktopDerivedInterfaceStubRemoteEvent::onRemoteSetTestDerivedArrayAttributeAttribute,
                 &TestFreedesktopDerivedInterfaceStubRemoteEvent::onRemoteTestDerivedArrayAttributeAttributeChanged
                 ,&TestFreedesktopDerivedInterfaceStubAdapter::fireTestDerivedArrayAttributeAttributeChanged
-                ,"at"
                 );
 #endif
 
@@ -146,15 +128,14 @@ CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
 #endif
 
 void TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::fireTestAttributedFromDerivedInterfaceAttributeChanged(const uint32_t& value) {
-    CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<
-    uint32_t
-    >>
-        ::sendSignal(
+    CommonAPI::DBus::DBusStubFreedesktopPropertiesSignalHelper<
+        uint32_t,
+        CommonAPI::EmptyDeployment
+    > ::sendPropertiesChangedSignal(
             *this,
-            "onTestAttributedFromDerivedInterfaceAttributeChanged",
-            "u",
-            value
-    
+            "TestAttributedFromDerivedInterface",
+            value,
+            static_cast<CommonAPI::EmptyDeployment*>(nullptr)
     );
 }
 
@@ -178,20 +159,50 @@ TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::TestFreedesktopDerivedIn
       TestFreedesktopDerivedInterfaceDBusStubAdapterHelper(_address, _connection, std::dynamic_pointer_cast<TestFreedesktopDerivedInterfaceStub>(_stub), false),
       TestFreedesktopInterfaceDBusStubAdapterInternal(_address, _connection, _stub),
       stubDispatcherTable_({
-            { { "getTestAttributedFromDerivedInterfaceAttribute", "" }, &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestAttributedFromDerivedInterfaceAttributeStubDispatcher }
-            , { { "setTestAttributedFromDerivedInterfaceAttribute", "u" }, &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestAttributedFromDerivedInterfaceAttributeStubDispatcher }
             #ifdef WIN32
-            ,
-            { { "getTestPredefinedTypeAttributeAttribute", "" }, &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher }
-            , { { "setTestPredefinedTypeAttributeAttribute", "u" }, &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestPredefinedTypeAttributeAttributeStubDispatcher },
-            { { "getTestReadonlyAttributeAttribute", "" }, &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestReadonlyAttributeAttributeStubDispatcher },
-            { { "getTestDerivedStructAttributeAttribute", "" }, &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher }
-            , { { "setTestDerivedStructAttributeAttribute", "(sqi)" }, &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestDerivedStructAttributeAttributeStubDispatcher },
-            { { "getTestDerivedArrayAttributeAttribute", "" }, &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher }
-            , { { "setTestDerivedArrayAttributeAttribute", "at" }, &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestDerivedArrayAttributeAttributeStubDispatcher }
             #endif
             }),
-        stubAttributeTable_() {
+        stubAttributeTable_({
+        {
+            "TestAttributedFromDerivedInterface",
+            {
+                &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestAttributedFromDerivedInterfaceAttributeStubDispatcher,
+                &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestAttributedFromDerivedInterfaceAttributeStubDispatcher
+            }
+        }
+        #ifdef WIN32
+        ,
+        {
+            "TestPredefinedTypeAttribute",
+            {
+                &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher,
+                &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestPredefinedTypeAttributeAttributeStubDispatcher
+            }
+        },
+        {
+            "TestReadonlyAttribute",
+            {
+                &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestReadonlyAttributeAttributeStubDispatcher,
+                NULL
+            }
+        },
+        {
+            "TestDerivedStructAttribute",
+            {
+                &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher,
+                &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestDerivedStructAttributeAttributeStubDispatcher
+            }
+        },
+        {
+            "TestDerivedArrayAttribute",
+            {
+                &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher,
+                &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestDerivedArrayAttributeAttributeStubDispatcher
+            }
+        }
+        #endif
+        }
+        ) {
 
     #ifdef WIN32
     stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestFreedesktopDerivedInterfaceInterfaceVersionStubDispatcher });
@@ -212,10 +223,10 @@ TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::TestFreedesktopDerivedIn
     #endif
 }
 
-const bool TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::hasFreedesktopProperties() {
-    return false;
+bool TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::hasFreedesktopProperties() {
+    return true;
 }
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp
index 7b940ef..52f645e 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,22 +10,24 @@
 #ifndef COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_STUB_ADAPTER_HPP_
 #define COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_STUB_ADAPTER_HPP_
 
-#include <v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp>
-#include <v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp>
-#include "v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.hpp"        
+#include <v1/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp>
+#include <v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp>
+#include "v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.hpp"        
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
 #endif
 
+#include <CommonAPI/DBus/DBusAddressTranslator.hpp>
 #include <CommonAPI/DBus/DBusFactory.hpp>
 #include <CommonAPI/DBus/DBusStubAdapterHelper.hpp>
 #include <CommonAPI/DBus/DBusStubAdapter.hpp>
+#include <CommonAPI/DBus/DBusFreedesktopStubAdapterHelper.hpp>
 #include <CommonAPI/DBus/DBusDeployment.hpp>
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -44,7 +46,11 @@ public:
 
     ~TestFreedesktopDerivedInterfaceDBusStubAdapterInternal();
 
-    virtual const bool hasFreedesktopProperties();
+    virtual bool hasFreedesktopProperties();
+
+    inline static const char* getInterface() {
+        return TestFreedesktopDerivedInterface::getInterface();
+    }
 
     void fireTestAttributedFromDerivedInterfaceAttributeChanged(const uint32_t& value);
 
@@ -76,49 +82,49 @@ public:
     }
 
 static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopDerivedInterfaceStub,
+        ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub,
         CommonAPI::Version
         > getTestFreedesktopDerivedInterfaceInterfaceVersionStubDispatcher;
 
-static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopDerivedInterfaceStub,
+static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub,
         uint32_t                
         > getTestAttributedFromDerivedInterfaceAttributeStubDispatcher;
-static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        TestFreedesktopDerivedInterfaceStub,
+static CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub,
         uint32_t                    
         > setTestAttributedFromDerivedInterfaceAttributeStubDispatcher;
 
 #ifdef WIN32
-static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopDerivedInterfaceStub,
+static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub,
         uint32_t                
         > getTestPredefinedTypeAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        TestFreedesktopDerivedInterfaceStub,
+static CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub,
         uint32_t                    
         > setTestPredefinedTypeAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopDerivedInterfaceStub,
+static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub,
         uint32_t                
         > getTestReadonlyAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopDerivedInterfaceStub,
+static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
         ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t                
         > getTestDerivedStructAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        TestFreedesktopDerivedInterfaceStub,
+static CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
         ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t                    
         > setTestDerivedStructAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopDerivedInterfaceStub,
+static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
         ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t                
         > getTestDerivedArrayAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        TestFreedesktopDerivedInterfaceStub,
+static CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopDerivedInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
         ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t                    
         > setTestDerivedArrayAttributeAttributeStubDispatcher;
@@ -161,6 +167,6 @@ public:
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_STUB_ADAPTER_HPP_
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.cpp
index f2f2a15..7c2dabd 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -9,7 +9,7 @@
 */
 #include "TestFreedesktopInterfaceDBusDeployment.hpp"
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace TestFreedesktopInterface_ {
@@ -25,4 +25,4 @@ namespace TestFreedesktopInterface_ {
 } // namespace TestFreedesktopInterface_
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp
index c5df423..eb509d2 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -11,6 +11,7 @@
 #ifndef COMMONAPI_DBUS_TESTFREEDESKTOPINTERFACE_DEPLOYMENT_HPP_
 #define COMMONAPI_DBUS_TESTFREEDESKTOPINTERFACE_DEPLOYMENT_HPP_
 
+#include <commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp>        
 
 #include <commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp>
 
@@ -20,7 +21,7 @@
 #include <CommonAPI/DBus/DBusDeployment.hpp>
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace TestFreedesktopInterface_ {
@@ -39,6 +40,6 @@ namespace TestFreedesktopInterface_ {
 } // namespace TestFreedesktopInterface_
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_DBUS_TESTFREEDESKTOPINTERFACE_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp
new file mode 100644
index 0000000..79f9fb1
--- /dev/null
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp
@@ -0,0 +1,62 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#include <v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp>
+
+namespace v1 {
+namespace commonapi {
+namespace tests {
+
+std::shared_ptr<CommonAPI::DBus::DBusProxy> createTestFreedesktopInterfaceDBusProxy(
+	const CommonAPI::DBus::DBusAddress &_address,
+	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection) {
+	return std::make_shared<TestFreedesktopInterfaceDBusProxy>(_address, _connection);
+}
+
+INITIALIZER(registerTestFreedesktopInterfaceDBusProxy) {
+     CommonAPI::DBus::Factory::get()->registerProxyCreateMethod(
+		TestFreedesktopInterface::getInterface(),
+		&createTestFreedesktopInterfaceDBusProxy);
+}
+
+TestFreedesktopInterfaceDBusProxy::TestFreedesktopInterfaceDBusProxy(
+	const CommonAPI::DBus::DBusAddress &_address,
+	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection)
+	:	CommonAPI::DBus::DBusProxy(_address, _connection)
+,		testPredefinedTypeAttribute_(*this, getAddress().getInterface(), "TestPredefinedTypeAttribute", static_cast<CommonAPI::EmptyDeployment*>(nullptr)),
+		testReadonlyAttribute_(*this, getAddress().getInterface(), "TestReadonlyAttribute", static_cast<CommonAPI::EmptyDeployment*>(nullptr)),
+		testDerivedStructAttribute_(*this, getAddress().getInterface(), "TestDerivedStructAttribute", static_cast<::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t*>(nullptr)),
+		testDerivedArrayAttribute_(*this, getAddress().getInterface(), "TestDerivedArrayAttribute", static_cast<::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t*>(nullptr))
+{
+}
+
+      TestFreedesktopInterfaceDBusProxy::TestPredefinedTypeAttributeAttribute& TestFreedesktopInterfaceDBusProxy::getTestPredefinedTypeAttributeAttribute() {
+          return testPredefinedTypeAttribute_;
+      }
+      TestFreedesktopInterfaceDBusProxy::TestReadonlyAttributeAttribute& TestFreedesktopInterfaceDBusProxy::getTestReadonlyAttributeAttribute() {
+          return testReadonlyAttribute_;
+      }
+      TestFreedesktopInterfaceDBusProxy::TestDerivedStructAttributeAttribute& TestFreedesktopInterfaceDBusProxy::getTestDerivedStructAttributeAttribute() {
+          return testDerivedStructAttribute_;
+      }
+      TestFreedesktopInterfaceDBusProxy::TestDerivedArrayAttributeAttribute& TestFreedesktopInterfaceDBusProxy::getTestDerivedArrayAttributeAttribute() {
+          return testDerivedArrayAttribute_;
+      }
+
+    
+
+
+void TestFreedesktopInterfaceDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
+          ownVersionMajor = 1;
+          ownVersionMinor = 0;
+      }
+
+      } // namespace tests
+      } // namespace commonapi
+      } // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp
index d2a3aa2..be3c892 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,8 +10,8 @@
 #ifndef COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_PROXY_HPP_
 #define COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_PROXY_HPP_
 
-#include <v1_0/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp>
-#include <commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp>
+#include <v1/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp>
+#include "v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp"
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -20,13 +20,15 @@
 #include <CommonAPI/DBus/DBusAddress.hpp>
 #include <CommonAPI/DBus/DBusFactory.hpp>
 #include <CommonAPI/DBus/DBusProxy.hpp>
+#include <CommonAPI/DBus/DBusAddressTranslator.hpp>
 #include <CommonAPI/DBus/DBusAttribute.hpp>
+#include <CommonAPI/DBus/DBusFreedesktopAttribute.hpp>
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
 #include <string>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -51,18 +53,18 @@ public:
     virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
 
 private:
-    
-    CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusAttribute<TestPredefinedTypeAttributeAttribute>> testPredefinedTypeAttribute_;
-    CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusReadonlyAttribute<TestReadonlyAttributeAttribute>> testReadonlyAttribute_;
-    CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusAttribute<TestDerivedStructAttributeAttribute, ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t>> testDerivedStructAttribute_;
-    CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusAttribute<TestDerivedArrayAttributeAttribute, ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t>> testDerivedArrayAttribute_;
+   
+    CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopAttribute<TestPredefinedTypeAttributeAttribute>> testPredefinedTypeAttribute_;
+    CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<TestReadonlyAttributeAttribute>> testReadonlyAttribute_;
+    CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopAttribute<TestDerivedStructAttributeAttribute, ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t>> testDerivedStructAttribute_;
+    CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopAttribute<TestDerivedArrayAttributeAttribute, ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t>> testDerivedArrayAttribute_;
 
 
 };
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_PROXY_HPP_
 
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp
new file mode 100644
index 0000000..ed77a4e
--- /dev/null
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp
@@ -0,0 +1,220 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#include <v1/commonapi/tests/TestFreedesktopInterface.hpp>
+#include <v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp>
+
+namespace v1 {
+namespace commonapi {
+namespace tests {
+
+std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> createTestFreedesktopInterfaceDBusStubAdapter(
+                   const CommonAPI::DBus::DBusAddress &_address,
+                   const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection,
+                   const std::shared_ptr<CommonAPI::StubBase> &_stub) {
+    return std::make_shared<TestFreedesktopInterfaceDBusStubAdapter>(_address, _connection, _stub);
+}
+
+INITIALIZER(registerTestFreedesktopInterfaceDBusStubAdapter) {
+    CommonAPI::DBus::Factory::get()->registerStubAdapterCreateMethod(
+    	TestFreedesktopInterface::getInterface(), &createTestFreedesktopInterfaceDBusStubAdapter);
+}
+
+TestFreedesktopInterfaceDBusStubAdapterInternal::~TestFreedesktopInterfaceDBusStubAdapterInternal() {
+    deactivateManagedInstances();
+    TestFreedesktopInterfaceDBusStubAdapterHelper::deinit();
+}
+
+void TestFreedesktopInterfaceDBusStubAdapterInternal::deactivateManagedInstances() {
+
+}
+
+const char* TestFreedesktopInterfaceDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const {
+    static const std::string introspectionData =
+        "<method name=\"getInterfaceVersion\">\n"
+            "<arg name=\"value\" type=\"uu\" direction=\"out\" />"
+        "</method>\n"
+        "<property name=\"TestPredefinedTypeAttribute\" type=\"u\" access=\"readwrite\" />\n"
+        "<property name=\"TestReadonlyAttribute\" type=\"u\" access=\"read\" />\n"
+        "<property name=\"TestDerivedStructAttribute\" type=\"(sqi)\" access=\"readwrite\" />\n"
+        "<property name=\"TestDerivedArrayAttribute\" type=\"at\" access=\"readwrite\" />\n"
+
+    ;
+    return introspectionData.c_str();
+}
+
+CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopInterfaceStub,
+        CommonAPI::Version
+        > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestFreedesktopInterfaceInterfaceVersionStubDispatcher(&TestFreedesktopInterfaceStub::getInterfaceVersion, "uu");
+
+CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopInterfaceStub,
+        uint32_t
+        > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher(
+            &::v1::commonapi::tests::TestFreedesktopInterfaceStub::getTestPredefinedTypeAttributeAttribute
+            );
+CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopInterfaceStub,
+        uint32_t
+        > TestFreedesktopInterfaceDBusStubAdapterInternal::setTestPredefinedTypeAttributeAttributeStubDispatcher(
+                &::v1::commonapi::tests::TestFreedesktopInterfaceStub::getTestPredefinedTypeAttributeAttribute,
+                &TestFreedesktopInterfaceStubRemoteEvent::onRemoteSetTestPredefinedTypeAttributeAttribute,
+                &TestFreedesktopInterfaceStubRemoteEvent::onRemoteTestPredefinedTypeAttributeAttributeChanged
+                ,&TestFreedesktopInterfaceStubAdapter::fireTestPredefinedTypeAttributeAttributeChanged
+                );
+CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopInterfaceStub,
+        uint32_t
+        > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestReadonlyAttributeAttributeStubDispatcher(
+            &::v1::commonapi::tests::TestFreedesktopInterfaceStub::getTestReadonlyAttributeAttribute
+            );
+CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopInterfaceStub,
+        ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
+        ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t
+        > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher(
+            &::v1::commonapi::tests::TestFreedesktopInterfaceStub::getTestDerivedStructAttributeAttribute
+            );
+CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopInterfaceStub,
+        ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
+        ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t
+        > TestFreedesktopInterfaceDBusStubAdapterInternal::setTestDerivedStructAttributeAttributeStubDispatcher(
+                &::v1::commonapi::tests::TestFreedesktopInterfaceStub::getTestDerivedStructAttributeAttribute,
+                &TestFreedesktopInterfaceStubRemoteEvent::onRemoteSetTestDerivedStructAttributeAttribute,
+                &TestFreedesktopInterfaceStubRemoteEvent::onRemoteTestDerivedStructAttributeAttributeChanged
+                ,&TestFreedesktopInterfaceStubAdapter::fireTestDerivedStructAttributeAttributeChanged
+                );
+CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopInterfaceStub,
+        ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
+        ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t
+        > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher(
+            &::v1::commonapi::tests::TestFreedesktopInterfaceStub::getTestDerivedArrayAttributeAttribute
+            );
+CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopInterfaceStub,
+        ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
+        ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t
+        > TestFreedesktopInterfaceDBusStubAdapterInternal::setTestDerivedArrayAttributeAttributeStubDispatcher(
+                &::v1::commonapi::tests::TestFreedesktopInterfaceStub::getTestDerivedArrayAttributeAttribute,
+                &TestFreedesktopInterfaceStubRemoteEvent::onRemoteSetTestDerivedArrayAttributeAttribute,
+                &TestFreedesktopInterfaceStubRemoteEvent::onRemoteTestDerivedArrayAttributeAttributeChanged
+                ,&TestFreedesktopInterfaceStubAdapter::fireTestDerivedArrayAttributeAttributeChanged
+                );
+
+
+
+
+void TestFreedesktopInterfaceDBusStubAdapterInternal::fireTestPredefinedTypeAttributeAttributeChanged(const uint32_t& value) {
+    CommonAPI::DBus::DBusStubFreedesktopPropertiesSignalHelper<
+        uint32_t,
+        CommonAPI::EmptyDeployment
+    > ::sendPropertiesChangedSignal(
+            *this,
+            "TestPredefinedTypeAttribute",
+            value,
+            static_cast<CommonAPI::EmptyDeployment*>(nullptr)
+    );
+}
+void TestFreedesktopInterfaceDBusStubAdapterInternal::fireTestReadonlyAttributeAttributeChanged(const uint32_t& value) {
+    CommonAPI::DBus::DBusStubFreedesktopPropertiesSignalHelper<
+        uint32_t,
+        CommonAPI::EmptyDeployment
+    > ::sendPropertiesChangedSignal(
+            *this,
+            "TestReadonlyAttribute",
+            value,
+            static_cast<CommonAPI::EmptyDeployment*>(nullptr)
+    );
+}
+void TestFreedesktopInterfaceDBusStubAdapterInternal::fireTestDerivedStructAttributeAttributeChanged(const ::commonapi::tests::DerivedTypeCollection::TestStructExtended& value) {
+    CommonAPI::DBus::DBusStubFreedesktopPropertiesSignalHelper<
+        ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
+        ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t
+    > ::sendPropertiesChangedSignal(
+            *this,
+            "TestDerivedStructAttribute",
+            value,
+            static_cast<::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t*>(nullptr)
+    );
+}
+void TestFreedesktopInterfaceDBusStubAdapterInternal::fireTestDerivedArrayAttributeAttributeChanged(const ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64& value) {
+    CommonAPI::DBus::DBusStubFreedesktopPropertiesSignalHelper<
+        ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
+        ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t
+    > ::sendPropertiesChangedSignal(
+            *this,
+            "TestDerivedArrayAttribute",
+            value,
+            static_cast<::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t*>(nullptr)
+    );
+}
+
+
+
+const TestFreedesktopInterfaceDBusStubAdapterHelper::StubDispatcherTable& TestFreedesktopInterfaceDBusStubAdapterInternal::getStubDispatcherTable() {
+    return stubDispatcherTable_;
+}
+
+const CommonAPI::DBus::StubAttributeTable& TestFreedesktopInterfaceDBusStubAdapterInternal::getStubAttributeTable() {
+    return stubAttributeTable_;
+}
+
+TestFreedesktopInterfaceDBusStubAdapterInternal::TestFreedesktopInterfaceDBusStubAdapterInternal(
+        const CommonAPI::DBus::DBusAddress &_address,
+        const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection,
+        const std::shared_ptr<CommonAPI::StubBase> &_stub)
+	: CommonAPI::DBus::DBusStubAdapter(_address, _connection,false),
+      TestFreedesktopInterfaceDBusStubAdapterHelper(_address, _connection, std::dynamic_pointer_cast<TestFreedesktopInterfaceStub>(_stub), false),
+      stubDispatcherTable_({
+            }),
+        stubAttributeTable_({
+        {
+            "TestPredefinedTypeAttribute",
+            {
+                &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher,
+                &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::setTestPredefinedTypeAttributeAttributeStubDispatcher
+            }
+        },
+        {
+            "TestReadonlyAttribute",
+            {
+                &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::getTestReadonlyAttributeAttributeStubDispatcher,
+                NULL
+            }
+        },
+        {
+            "TestDerivedStructAttribute",
+            {
+                &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher,
+                &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::setTestDerivedStructAttributeAttributeStubDispatcher
+            }
+        },
+        {
+            "TestDerivedArrayAttribute",
+            {
+                &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher,
+                &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::setTestDerivedArrayAttributeAttributeStubDispatcher
+            }
+        }
+        }
+        ) {
+
+    stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::getTestFreedesktopInterfaceInterfaceVersionStubDispatcher });
+}
+
+bool TestFreedesktopInterfaceDBusStubAdapterInternal::hasFreedesktopProperties() {
+    return true;
+}
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp
index 0705da8..dbbfa5a 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,21 +10,24 @@
 #ifndef COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_STUB_ADAPTER_HPP_
 #define COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_STUB_ADAPTER_HPP_
 
-#include <v1_0/commonapi/tests/TestFreedesktopInterfaceStub.hpp>
-#include "v1_0/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp"        
+#include <v1/commonapi/tests/TestFreedesktopInterfaceStub.hpp>
+#include "v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp"        
+#include <commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp>        
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
 #endif
 
+#include <CommonAPI/DBus/DBusAddressTranslator.hpp>
 #include <CommonAPI/DBus/DBusFactory.hpp>
 #include <CommonAPI/DBus/DBusStubAdapterHelper.hpp>
 #include <CommonAPI/DBus/DBusStubAdapter.hpp>
+#include <CommonAPI/DBus/DBusFreedesktopStubAdapterHelper.hpp>
 #include <CommonAPI/DBus/DBusDeployment.hpp>
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -42,7 +45,11 @@ public:
 
     ~TestFreedesktopInterfaceDBusStubAdapterInternal();
 
-    virtual const bool hasFreedesktopProperties();
+    virtual bool hasFreedesktopProperties();
+
+    inline static const char* getInterface() {
+        return TestFreedesktopInterface::getInterface();
+    }
 
     void fireTestPredefinedTypeAttributeAttributeChanged(const uint32_t& value);
     void fireTestReadonlyAttributeAttributeChanged(const uint32_t& value);
@@ -58,39 +65,39 @@ public:
     
 
 static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopInterfaceStub,
+        ::v1::commonapi::tests::TestFreedesktopInterfaceStub,
         CommonAPI::Version
         > getTestFreedesktopInterfaceInterfaceVersionStubDispatcher;
 
-static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopInterfaceStub,
+static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopInterfaceStub,
         uint32_t                
         > getTestPredefinedTypeAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        TestFreedesktopInterfaceStub,
+static CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopInterfaceStub,
         uint32_t                    
         > setTestPredefinedTypeAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopInterfaceStub,
+static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopInterfaceStub,
         uint32_t                
         > getTestReadonlyAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopInterfaceStub,
+static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
         ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t                
         > getTestDerivedStructAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        TestFreedesktopInterfaceStub,
+static CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
         ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t                    
         > setTestDerivedStructAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopInterfaceStub,
+static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
         ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t                
         > getTestDerivedArrayAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        TestFreedesktopInterfaceStub,
+static CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestFreedesktopInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
         ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t                    
         > setTestDerivedArrayAttributeAttributeStubDispatcher;
@@ -129,6 +136,6 @@ public:
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_STUB_ADAPTER_HPP_
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusDeployment.cpp
index e9d2049..76d5d69 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusDeployment.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -9,7 +9,7 @@
 */
 #include "TestInterfaceDBusDeployment.hpp"
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace TestInterface_ {
@@ -25,4 +25,4 @@ namespace TestInterface_ {
 } // namespace TestInterface_
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusDeployment.hpp
index a857619..38acd4c 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -11,6 +11,7 @@
 #ifndef COMMONAPI_DBUS_TESTINTERFACE_DEPLOYMENT_HPP_
 #define COMMONAPI_DBUS_TESTINTERFACE_DEPLOYMENT_HPP_
 
+#include <commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp>        
 
 #include <commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp>
 
@@ -20,7 +21,7 @@
 #include <CommonAPI/DBus/DBusDeployment.hpp>
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace TestInterface_ {
@@ -39,6 +40,6 @@ namespace TestInterface_ {
 } // namespace TestInterface_
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_DBUS_TESTINTERFACE_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusProxy.cpp
new file mode 100644
index 0000000..e4eeee7
--- /dev/null
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusProxy.cpp
@@ -0,0 +1,426 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#include <v1/commonapi/tests/TestInterfaceDBusProxy.hpp>
+
+namespace v1 {
+namespace commonapi {
+namespace tests {
+
+std::shared_ptr<CommonAPI::DBus::DBusProxy> createTestInterfaceDBusProxy(
+	const CommonAPI::DBus::DBusAddress &_address,
+	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection) {
+	return std::make_shared<TestInterfaceDBusProxy>(_address, _connection);
+}
+
+INITIALIZER(registerTestInterfaceDBusProxy) {
+     CommonAPI::DBus::Factory::get()->registerProxyCreateMethod(
+		TestInterface::getInterface(),
+		&createTestInterfaceDBusProxy);
+}
+
+TestInterfaceDBusProxy::TestInterfaceDBusProxy(
+	const CommonAPI::DBus::DBusAddress &_address,
+	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection)
+	:	CommonAPI::DBus::DBusProxy(_address, _connection)
+,		testPredefinedTypeAttribute_(*this, "onTestPredefinedTypeAttributeAttributeChanged", "setTestPredefinedTypeAttributeAttribute", "u", "getTestPredefinedTypeAttributeAttribute", static_cast<CommonAPI::EmptyDeployment*>(nullptr)),
+		testDerivedStructAttribute_(*this, "onTestDerivedStructAttributeAttributeChanged", "setTestDerivedStructAttributeAttribute", "(sqi)", "getTestDerivedStructAttributeAttribute", static_cast<::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t*>(nullptr)),
+		testDerivedArrayAttribute_(*this, "onTestDerivedArrayAttributeAttributeChanged", "setTestDerivedArrayAttributeAttribute", "at", "getTestDerivedArrayAttributeAttribute", static_cast<::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t*>(nullptr))
+,		testPredefinedTypeBroadcast_(*this, "TestPredefinedTypeBroadcast", "us", std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<CommonAPI::DBus::StringDeployment*>(nullptr))),
+		testSelectiveBroadcastSelective_(*this, "TestSelectiveBroadcast", "", std::make_tuple()),
+		testBroadcastWithOutArgsSelective_(*this, "TestBroadcastWithOutArgs", "us", std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)))
+{
+}
+
+      TestInterfaceDBusProxy::TestPredefinedTypeAttributeAttribute& TestInterfaceDBusProxy::getTestPredefinedTypeAttributeAttribute() {
+          return testPredefinedTypeAttribute_;
+      }
+      TestInterfaceDBusProxy::TestDerivedStructAttributeAttribute& TestInterfaceDBusProxy::getTestDerivedStructAttributeAttribute() {
+          return testDerivedStructAttribute_;
+      }
+      TestInterfaceDBusProxy::TestDerivedArrayAttributeAttribute& TestInterfaceDBusProxy::getTestDerivedArrayAttributeAttribute() {
+          return testDerivedArrayAttribute_;
+      }
+
+TestInterfaceDBusProxy::TestPredefinedTypeBroadcastEvent& TestInterfaceDBusProxy::getTestPredefinedTypeBroadcastEvent() {
+    return testPredefinedTypeBroadcast_;
+}
+TestInterfaceDBusProxy::TestSelectiveBroadcastSelectiveEvent& TestInterfaceDBusProxy::getTestSelectiveBroadcastSelectiveEvent() {
+    return testSelectiveBroadcastSelective_;
+}
+TestInterfaceDBusProxy::TestBroadcastWithOutArgsSelectiveEvent& TestInterfaceDBusProxy::getTestBroadcastWithOutArgsSelectiveEvent() {
+    return testBroadcastWithOutArgsSelective_;
+}
+    
+    void TestInterfaceDBusProxy::testEmptyMethod(CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) {
+        CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            >
+        	>::callMethodWithReply(
+        *this,
+        "testEmptyMethod",
+        "",
+(_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+_internalCallStatus);
+}
+    std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::testEmptyMethodAsync(TestEmptyMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
+        return CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            >
+        	>::callMethodAsync(
+        *this,
+        "testEmptyMethod",
+        "",
+        (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+        [_callback] (CommonAPI::CallStatus _internalCallStatus) {
+        	if (_callback)
+        		_callback(_internalCallStatus);
+        },
+        std::make_tuple());
+    }
+    void TestInterfaceDBusProxy::testVoidPredefinedTypeMethod(const uint32_t &_uint32Value, const std::string &_stringValue, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_uint32Value(_uint32Value, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_stringValue(_stringValue, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
+        CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment >,
+            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            >
+        	>::callMethodWithReply(
+        *this,
+        "testVoidPredefinedTypeMethod",
+        "us",
+(_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+deploy_uint32Value, deploy_stringValue,
+_internalCallStatus);
+}
+    std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::testVoidPredefinedTypeMethodAsync(const uint32_t &_uint32Value, const std::string &_stringValue, TestVoidPredefinedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_uint32Value(_uint32Value, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_stringValue(_stringValue, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
+        return CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment >,
+            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            >
+        	>::callMethodAsync(
+        *this,
+        "testVoidPredefinedTypeMethod",
+        "us",
+        (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+        deploy_uint32Value, deploy_stringValue,
+        [_callback] (CommonAPI::CallStatus _internalCallStatus) {
+        	if (_callback)
+        		_callback(_internalCallStatus);
+        },
+        std::make_tuple());
+    }
+    void TestInterfaceDBusProxy::testPredefinedTypeMethod(const uint32_t &_uint32InValue, const std::string &_stringInValue, CommonAPI::CallStatus &_internalCallStatus, uint32_t &_uint32OutValue, std::string &_stringOutValue, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_uint32InValue(_uint32InValue, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_stringInValue(_stringInValue, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
+        CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_uint32OutValue(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_stringOutValue(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
+        CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment >,
+            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<uint32_t,CommonAPI::EmptyDeployment>,
+            CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>
+            >
+        	>::callMethodWithReply(
+        *this,
+        "testPredefinedTypeMethod",
+        "us",
+(_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+deploy_uint32InValue, deploy_stringInValue,
+_internalCallStatus,
+deploy_uint32OutValue, deploy_stringOutValue);
+_uint32OutValue = deploy_uint32OutValue.getValue();
+_stringOutValue = deploy_stringOutValue.getValue();
+}
+    std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::testPredefinedTypeMethodAsync(const uint32_t &_uint32InValue, const std::string &_stringInValue, TestPredefinedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_uint32InValue(_uint32InValue, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_stringInValue(_stringInValue, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
+        CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_uint32OutValue(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_stringOutValue(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
+        return CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment >,
+            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<uint32_t,CommonAPI::EmptyDeployment>,
+            CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>
+            >
+        	>::callMethodAsync(
+        *this,
+        "testPredefinedTypeMethod",
+        "us",
+        (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+        deploy_uint32InValue, deploy_stringInValue,
+        [_callback] (CommonAPI::CallStatus _internalCallStatus, CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> _uint32OutValue, CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> _stringOutValue) {
+        	if (_callback)
+        		_callback(_internalCallStatus, _uint32OutValue.getValue(), _stringOutValue.getValue());
+        },
+        std::make_tuple(deploy_uint32OutValue, deploy_stringOutValue));
+    }
+    void TestInterfaceDBusProxy::testVoidDerivedTypeMethod(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2Value, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapValue, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment> deploy_testEnumExtended2Value(_testEnumExtended2Value, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> deploy_testMapValue(_testMapValue, static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr));
+        CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment >,
+            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            >
+        	>::callMethodWithReply(
+        *this,
+        "testVoidDerivedTypeMethod",
+        "ia{ua(sq)}",
+(_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+deploy_testEnumExtended2Value, deploy_testMapValue,
+_internalCallStatus);
+}
+    std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::testVoidDerivedTypeMethodAsync(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2Value, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapValue, TestVoidDerivedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment> deploy_testEnumExtended2Value(_testEnumExtended2Value, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> deploy_testMapValue(_testMapValue, static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr));
+        return CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment >,
+            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            >
+        	>::callMethodAsync(
+        *this,
+        "testVoidDerivedTypeMethod",
+        "ia{ua(sq)}",
+        (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+        deploy_testEnumExtended2Value, deploy_testMapValue,
+        [_callback] (CommonAPI::CallStatus _internalCallStatus) {
+        	if (_callback)
+        		_callback(_internalCallStatus);
+        },
+        std::make_tuple());
+    }
+    void TestInterfaceDBusProxy::testDerivedTypeMethod(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2InValue, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapInValue, CommonAPI::CallStatus &_internalCallStatus, ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2OutValue, ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapOutValue, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment> deploy_testEnumExtended2InValue(_testEnumExtended2InValue, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> deploy_testMapInValue(_testMapInValue, static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr));
+        CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment> deploy_testEnumExtended2OutValue(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> deploy_testMapOutValue(static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr));
+        CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment >,
+            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2,CommonAPI::EmptyDeployment>,
+            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap,::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t>
+            >
+        	>::callMethodWithReply(
+        *this,
+        "testDerivedTypeMethod",
+        "ia{ua(sq)}",
+(_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+deploy_testEnumExtended2InValue, deploy_testMapInValue,
+_internalCallStatus,
+deploy_testEnumExtended2OutValue, deploy_testMapOutValue);
+_testEnumExtended2OutValue = deploy_testEnumExtended2OutValue.getValue();
+_testMapOutValue = deploy_testMapOutValue.getValue();
+}
+    std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::testDerivedTypeMethodAsync(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2InValue, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapInValue, TestDerivedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment> deploy_testEnumExtended2InValue(_testEnumExtended2InValue, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> deploy_testMapInValue(_testMapInValue, static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr));
+        CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment> deploy_testEnumExtended2OutValue(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> deploy_testMapOutValue(static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr));
+        return CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment >,
+            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2,CommonAPI::EmptyDeployment>,
+            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap,::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t>
+            >
+        	>::callMethodAsync(
+        *this,
+        "testDerivedTypeMethod",
+        "ia{ua(sq)}",
+        (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+        deploy_testEnumExtended2InValue, deploy_testMapInValue,
+        [_callback] (CommonAPI::CallStatus _internalCallStatus, CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment> _testEnumExtended2OutValue, CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> _testMapOutValue) {
+        	if (_callback)
+        		_callback(_internalCallStatus, _testEnumExtended2OutValue.getValue(), _testMapOutValue.getValue());
+        },
+        std::make_tuple(deploy_testEnumExtended2OutValue, deploy_testMapOutValue));
+    }
+    void TestInterfaceDBusProxy::TestArrayOfPolymorphicStructMethod(const std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>> &_inArray, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>, CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t>> deploy_inArray(_inArray, static_cast<CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t>*>(nullptr));
+        CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>, CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t> >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            >
+        	>::callMethodWithReply(
+        *this,
+        "TestArrayOfPolymorphicStructMethod",
+        "a(uv)",
+(_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+deploy_inArray,
+_internalCallStatus);
+}
+    std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::TestArrayOfPolymorphicStructMethodAsync(const std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>> &_inArray, TestArrayOfPolymorphicStructMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>, CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t>> deploy_inArray(_inArray, static_cast<CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t>*>(nullptr));
+        return CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>, CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t> >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            >
+        	>::callMethodAsync(
+        *this,
+        "TestArrayOfPolymorphicStructMethod",
+        "a(uv)",
+        (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+        deploy_inArray,
+        [_callback] (CommonAPI::CallStatus _internalCallStatus) {
+        	if (_callback)
+        		_callback(_internalCallStatus);
+        },
+        std::make_tuple());
+    }
+    void TestInterfaceDBusProxy::TestMapOfPolymorphicStructMethod(const ::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic &_inMap, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic, ::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t> deploy_inMap(_inMap, static_cast<::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t*>(nullptr));
+        CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic, ::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            >
+        	>::callMethodWithReply(
+        *this,
+        "TestMapOfPolymorphicStructMethod",
+        "a{y(uv)}",
+(_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+deploy_inMap,
+_internalCallStatus);
+}
+    std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::TestMapOfPolymorphicStructMethodAsync(const ::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic &_inMap, TestMapOfPolymorphicStructMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic, ::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t> deploy_inMap(_inMap, static_cast<::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t*>(nullptr));
+        return CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic, ::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            >
+        	>::callMethodAsync(
+        *this,
+        "TestMapOfPolymorphicStructMethod",
+        "a{y(uv)}",
+        (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+        deploy_inMap,
+        [_callback] (CommonAPI::CallStatus _internalCallStatus) {
+        	if (_callback)
+        		_callback(_internalCallStatus);
+        },
+        std::make_tuple());
+    }
+    void TestInterfaceDBusProxy::TestStructWithPolymorphicMemberMethod(const ::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember &_inStruct, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember, ::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t> deploy_inStruct(_inStruct, static_cast<::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t*>(nullptr));
+        CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember, ::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            >
+        	>::callMethodWithReply(
+        *this,
+        "TestStructWithPolymorphicMemberMethod",
+        "(u(uv))",
+(_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+deploy_inStruct,
+_internalCallStatus);
+}
+    std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::TestStructWithPolymorphicMemberMethodAsync(const ::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember &_inStruct, TestStructWithPolymorphicMemberMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember, ::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t> deploy_inStruct(_inStruct, static_cast<::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t*>(nullptr));
+        return CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember, ::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            >
+        	>::callMethodAsync(
+        *this,
+        "TestStructWithPolymorphicMemberMethod",
+        "(u(uv))",
+        (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+        deploy_inStruct,
+        [_callback] (CommonAPI::CallStatus _internalCallStatus) {
+        	if (_callback)
+        		_callback(_internalCallStatus);
+        },
+        std::make_tuple());
+    }
+    void TestInterfaceDBusProxy::TestStructWithEnumKeyMapMember(const ::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap &_inStruct, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap, ::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t> deploy_inStruct(_inStruct, static_cast<::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t*>(nullptr));
+        CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap, ::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            >
+        	>::callMethodWithReply(
+        *this,
+        "TestStructWithEnumKeyMapMember",
+        "(a{is})",
+(_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+deploy_inStruct,
+_internalCallStatus);
+}
+    std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::TestStructWithEnumKeyMapMemberAsync(const ::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap &_inStruct, TestStructWithEnumKeyMapMemberAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap, ::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t> deploy_inStruct(_inStruct, static_cast<::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t*>(nullptr));
+        return CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap, ::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            >
+        	>::callMethodAsync(
+        *this,
+        "TestStructWithEnumKeyMapMember",
+        "(a{is})",
+        (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+        deploy_inStruct,
+        [_callback] (CommonAPI::CallStatus _internalCallStatus) {
+        	if (_callback)
+        		_callback(_internalCallStatus);
+        },
+        std::make_tuple());
+    }
+
+
+void TestInterfaceDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
+          ownVersionMajor = 1;
+          ownVersionMinor = 0;
+      }
+
+      } // namespace tests
+      } // namespace commonapi
+      } // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusProxy.hpp
index 7ac21db..c7c1389 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusProxy.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,8 +10,8 @@
 #ifndef COMMONAPI_TESTS_Test_Interface_DBUS_PROXY_HPP_
 #define COMMONAPI_TESTS_Test_Interface_DBUS_PROXY_HPP_
 
-#include <v1_0/commonapi/tests/TestInterfaceProxyBase.hpp>
-#include <commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp>
+#include <v1/commonapi/tests/TestInterfaceProxyBase.hpp>
+#include "v1/commonapi/tests/TestInterfaceDBusDeployment.hpp"
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -20,6 +20,7 @@
 #include <CommonAPI/DBus/DBusAddress.hpp>
 #include <CommonAPI/DBus/DBusFactory.hpp>
 #include <CommonAPI/DBus/DBusProxy.hpp>
+#include <CommonAPI/DBus/DBusAddressTranslator.hpp>
 #include <CommonAPI/DBus/DBusAttribute.hpp>
 #include <CommonAPI/DBus/DBusEvent.hpp>
 #include <CommonAPI/Types.hpp>
@@ -29,7 +30,7 @@
 
 #include <string>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -74,7 +75,7 @@ public:
     virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
 
 private:
-    
+   
     CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusAttribute<TestPredefinedTypeAttributeAttribute>> testPredefinedTypeAttribute_;
     CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusAttribute<TestDerivedStructAttributeAttribute, ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t>> testDerivedStructAttribute_;
     CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusAttribute<TestDerivedArrayAttributeAttribute, ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t>> testDerivedArrayAttribute_;
@@ -87,7 +88,7 @@ private:
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_TESTS_Test_Interface_DBUS_PROXY_HPP_
 
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusStubAdapter.cpp
index 52eed4e..67a8b07 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusStubAdapter.cpp
@@ -1,16 +1,16 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#include <v1_0/commonapi/tests/TestInterface.hpp>
-#include <v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.hpp>
+#include <v1/commonapi/tests/TestInterface.hpp>
+#include <v1/commonapi/tests/TestInterfaceDBusStubAdapter.hpp>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -120,60 +120,60 @@ const char* TestInterfaceDBusStubAdapterInternal::getMethodsDBusIntrospectionXml
 }
 
 CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestInterfaceStub,
+        ::v1::commonapi::tests::TestInterfaceStub,
         CommonAPI::Version
         > TestInterfaceDBusStubAdapterInternal::getTestInterfaceInterfaceVersionStubDispatcher(&TestInterfaceStub::getInterfaceVersion, "uu");
 
 CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestInterfaceStub,
+        ::v1::commonapi::tests::TestInterfaceStub,
         uint32_t
         > TestInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher(
-            &TestInterfaceStub::getTestPredefinedTypeAttributeAttribute
+            &::v1::commonapi::tests::TestInterfaceStub::getTestPredefinedTypeAttributeAttribute
             , "u"
             );
 CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        TestInterfaceStub,
+        ::v1::commonapi::tests::TestInterfaceStub,
         uint32_t
         > TestInterfaceDBusStubAdapterInternal::setTestPredefinedTypeAttributeAttributeStubDispatcher(
-                &TestInterfaceStub::getTestPredefinedTypeAttributeAttribute,
+                &::v1::commonapi::tests::TestInterfaceStub::getTestPredefinedTypeAttributeAttribute,
                 &TestInterfaceStubRemoteEvent::onRemoteSetTestPredefinedTypeAttributeAttribute,
                 &TestInterfaceStubRemoteEvent::onRemoteTestPredefinedTypeAttributeAttributeChanged
                 ,&TestInterfaceStubAdapter::fireTestPredefinedTypeAttributeAttributeChanged
                 ,"u"
                 );
 CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestInterfaceStub,
+        ::v1::commonapi::tests::TestInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
         ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t
         > TestInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher(
-            &TestInterfaceStub::getTestDerivedStructAttributeAttribute
+            &::v1::commonapi::tests::TestInterfaceStub::getTestDerivedStructAttributeAttribute
             , "(sqi)"
             );
 CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        TestInterfaceStub,
+        ::v1::commonapi::tests::TestInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
         ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t
         > TestInterfaceDBusStubAdapterInternal::setTestDerivedStructAttributeAttributeStubDispatcher(
-                &TestInterfaceStub::getTestDerivedStructAttributeAttribute,
+                &::v1::commonapi::tests::TestInterfaceStub::getTestDerivedStructAttributeAttribute,
                 &TestInterfaceStubRemoteEvent::onRemoteSetTestDerivedStructAttributeAttribute,
                 &TestInterfaceStubRemoteEvent::onRemoteTestDerivedStructAttributeAttributeChanged
                 ,&TestInterfaceStubAdapter::fireTestDerivedStructAttributeAttributeChanged
                 ,"(sqi)"
                 );
 CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestInterfaceStub,
+        ::v1::commonapi::tests::TestInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
         ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t
         > TestInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher(
-            &TestInterfaceStub::getTestDerivedArrayAttributeAttribute
+            &::v1::commonapi::tests::TestInterfaceStub::getTestDerivedArrayAttributeAttribute
             , "at"
             );
 CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        TestInterfaceStub,
+        ::v1::commonapi::tests::TestInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
         ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t
         > TestInterfaceDBusStubAdapterInternal::setTestDerivedArrayAttributeAttributeStubDispatcher(
-                &TestInterfaceStub::getTestDerivedArrayAttributeAttribute,
+                &::v1::commonapi::tests::TestInterfaceStub::getTestDerivedArrayAttributeAttribute,
                 &TestInterfaceStubRemoteEvent::onRemoteSetTestDerivedArrayAttributeAttribute,
                 &TestInterfaceStubRemoteEvent::onRemoteTestDerivedArrayAttributeAttributeChanged
                 ,&TestInterfaceStubAdapter::fireTestDerivedArrayAttributeAttributeChanged
@@ -183,7 +183,7 @@ CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
 
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     std::tuple<>,
     std::tuple<>,
     std::tuple<>,
@@ -195,7 +195,7 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
                 	std::make_tuple());
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     std::tuple<uint32_t, std::string>,
     std::tuple<>,
     std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>,
@@ -207,7 +207,7 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
                 	std::make_tuple());
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     std::tuple<uint32_t, std::string>,
     std::tuple<uint32_t, std::string>,
     std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>,
@@ -219,7 +219,7 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
                 	std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)));
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>,
     std::tuple<>,
     std::tuple<CommonAPI::EmptyDeployment, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t>,
@@ -231,7 +231,7 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
                 	std::make_tuple());
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>,
     std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>,
     std::tuple<CommonAPI::EmptyDeployment, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t>,
@@ -243,7 +243,7 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
                 	std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr)));
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     std::tuple<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>>,
     std::tuple<>,
     std::tuple<CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t>>,
@@ -255,7 +255,7 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
                 	std::make_tuple());
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic>,
     std::tuple<>,
     std::tuple<::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t>,
@@ -267,7 +267,7 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
                 	std::make_tuple());
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember>,
     std::tuple<>,
     std::tuple<::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t>,
@@ -279,7 +279,7 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
                 	std::make_tuple());
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap>,
     std::tuple<>,
     std::tuple<::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t>,
@@ -349,14 +349,14 @@ void TestInterfaceDBusStubAdapterInternal::fireTestPredefinedTypeBroadcastEvent(
     );
 }
 CommonAPI::DBus::DBusMethodWithReplyAdapterDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     TestInterfaceStubAdapter,
     std::tuple<>,
     std::tuple<bool>
     > TestInterfaceDBusStubAdapterInternal::subscribeTestSelectiveBroadcastSelectiveStubDispatcher(&TestInterfaceStubAdapter::subscribeForTestSelectiveBroadcastSelective, "b");
 
 CommonAPI::DBus::DBusMethodWithReplyAdapterDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     TestInterfaceStubAdapter,
     std::tuple<>,
     std::tuple<>
@@ -410,14 +410,14 @@ std::shared_ptr<CommonAPI::ClientIdList> const TestInterfaceDBusStubAdapterInter
     return subscribersForTestSelectiveBroadcastSelective_;
 }
 CommonAPI::DBus::DBusMethodWithReplyAdapterDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     TestInterfaceStubAdapter,
     std::tuple<>,
     std::tuple<bool>
     > TestInterfaceDBusStubAdapterInternal::subscribeTestBroadcastWithOutArgsSelectiveStubDispatcher(&TestInterfaceStubAdapter::subscribeForTestBroadcastWithOutArgsSelective, "b");
 
 CommonAPI::DBus::DBusMethodWithReplyAdapterDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     TestInterfaceStubAdapter,
     std::tuple<>,
     std::tuple<>
@@ -522,10 +522,10 @@ TestInterfaceDBusStubAdapterInternal::TestInterfaceDBusStubAdapterInternal(
     stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &commonapi::tests::TestInterfaceDBusStubAdapterInternal::getTestInterfaceInterfaceVersionStubDispatcher });
 }
 
-const bool TestInterfaceDBusStubAdapterInternal::hasFreedesktopProperties() {
+bool TestInterfaceDBusStubAdapterInternal::hasFreedesktopProperties() {
     return false;
 }
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusStubAdapter.hpp
index 2a3ad56..e2a7787 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusStubAdapter.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,13 +10,15 @@
 #ifndef COMMONAPI_TESTS_Test_Interface_DBUS_STUB_ADAPTER_HPP_
 #define COMMONAPI_TESTS_Test_Interface_DBUS_STUB_ADAPTER_HPP_
 
-#include <v1_0/commonapi/tests/TestInterfaceStub.hpp>
-#include "v1_0/commonapi/tests/TestInterfaceDBusDeployment.hpp"        
+#include <v1/commonapi/tests/TestInterfaceStub.hpp>
+#include "v1/commonapi/tests/TestInterfaceDBusDeployment.hpp"        
+#include <commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp>        
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
 #endif
 
+#include <CommonAPI/DBus/DBusAddressTranslator.hpp>
 #include <CommonAPI/DBus/DBusFactory.hpp>
 #include <CommonAPI/DBus/DBusStubAdapterHelper.hpp>
 #include <CommonAPI/DBus/DBusStubAdapter.hpp>
@@ -24,7 +26,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 
@@ -42,7 +44,11 @@ public:
 
     ~TestInterfaceDBusStubAdapterInternal();
 
-    virtual const bool hasFreedesktopProperties();
+    virtual bool hasFreedesktopProperties();
+
+    inline static const char* getInterface() {
+        return TestInterface::getInterface();
+    }
 
     void fireTestPredefinedTypeAttributeAttributeChanged(const uint32_t& value);
     void fireTestDerivedStructAttributeAttributeChanged(const ::commonapi::tests::DerivedTypeCollection::TestStructExtended& value);
@@ -68,35 +74,35 @@ public:
     
 
 static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestInterfaceStub,
+        ::v1::commonapi::tests::TestInterfaceStub,
         CommonAPI::Version
         > getTestInterfaceInterfaceVersionStubDispatcher;
 
 static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestInterfaceStub,
+        ::v1::commonapi::tests::TestInterfaceStub,
         uint32_t                
         > getTestPredefinedTypeAttributeAttributeStubDispatcher;
 static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        TestInterfaceStub,
+        ::v1::commonapi::tests::TestInterfaceStub,
         uint32_t                    
         > setTestPredefinedTypeAttributeAttributeStubDispatcher;
 static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestInterfaceStub,
+        ::v1::commonapi::tests::TestInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
         ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t                
         > getTestDerivedStructAttributeAttributeStubDispatcher;
 static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        TestInterfaceStub,
+        ::v1::commonapi::tests::TestInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
         ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t                    
         > setTestDerivedStructAttributeAttributeStubDispatcher;
 static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestInterfaceStub,
+        ::v1::commonapi::tests::TestInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
         ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t                
         > getTestDerivedArrayAttributeAttributeStubDispatcher;
 static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        TestInterfaceStub,
+        ::v1::commonapi::tests::TestInterfaceStub,
         ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
         ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t                    
         > setTestDerivedArrayAttributeAttributeStubDispatcher;
@@ -104,7 +110,7 @@ static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
 
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     std::tuple<>,
     std::tuple<>,
     std::tuple<>,
@@ -113,7 +119,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     > testEmptyMethodStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     std::tuple<uint32_t, std::string>,
     std::tuple<>,
     std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>,
@@ -122,7 +128,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     > testVoidPredefinedTypeMethodStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     std::tuple<uint32_t, std::string>,
     std::tuple<uint32_t, std::string>,
     std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>,
@@ -131,7 +137,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     > testPredefinedTypeMethodStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>,
     std::tuple<>,
     std::tuple<CommonAPI::EmptyDeployment, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t>,
@@ -140,7 +146,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     > testVoidDerivedTypeMethodStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>,
     std::tuple<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, ::commonapi::tests::DerivedTypeCollection::TestMap>,
     std::tuple<CommonAPI::EmptyDeployment, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t>,
@@ -149,7 +155,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     > testDerivedTypeMethodStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     std::tuple<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>>,
     std::tuple<>,
     std::tuple<CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t>>,
@@ -158,7 +164,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     > testArrayOfPolymorphicStructMethodStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic>,
     std::tuple<>,
     std::tuple<::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t>,
@@ -167,7 +173,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     > testMapOfPolymorphicStructMethodStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember>,
     std::tuple<>,
     std::tuple<::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t>,
@@ -176,7 +182,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     > testStructWithPolymorphicMemberMethodStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     std::tuple<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap>,
     std::tuple<>,
     std::tuple<::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t>,
@@ -186,27 +192,27 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
 
 
 static CommonAPI::DBus::DBusMethodWithReplyAdapterDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     TestInterfaceStubAdapter,
     std::tuple<>,
     std::tuple<bool>
     > subscribeTestSelectiveBroadcastSelectiveStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyAdapterDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     TestInterfaceStubAdapter,
  std::tuple<>,
     std::tuple<>
     > unsubscribeTestSelectiveBroadcastSelectiveStubDispatcher;
 static CommonAPI::DBus::DBusMethodWithReplyAdapterDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     TestInterfaceStubAdapter,
     std::tuple<>,
     std::tuple<bool>
     > subscribeTestBroadcastWithOutArgsSelectiveStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyAdapterDispatcher<
-    TestInterfaceStub,
+    ::v1::commonapi::tests::TestInterfaceStub,
     TestInterfaceStubAdapter,
  std::tuple<>,
     std::tuple<>
@@ -242,6 +248,6 @@ public:
 
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_TESTS_Test_Interface_DBUS_STUB_ADAPTER_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.cpp
new file mode 100644
index 0000000..8cfbdf1
--- /dev/null
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.cpp
@@ -0,0 +1,28 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#include "TestInterfaceManagerDBusDeployment.hpp"
+
+namespace v1 {
+namespace commonapi {
+namespace tests {
+namespace TestInterfaceManager_ {
+
+// Type-specific deployments
+
+// Attribute-specific deployments
+
+// Argument-specific deployments
+
+// Broadcast-specific deployments
+ 
+} // namespace TestInterfaceManager_
+} // namespace tests
+} // namespace commonapi
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.hpp
new file mode 100644
index 0000000..d1ea4b5
--- /dev/null
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.hpp
@@ -0,0 +1,43 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+
+#ifndef COMMONAPI_DBUS_TESTINTERFACEMANAGER_DEPLOYMENT_HPP_
+#define COMMONAPI_DBUS_TESTINTERFACEMANAGER_DEPLOYMENT_HPP_
+
+
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+#include <CommonAPI/DBus/DBusDeployment.hpp>
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1 {
+namespace commonapi {
+namespace tests {
+namespace TestInterfaceManager_ {
+
+// Interface-specific deployment types
+
+// Type-specific deployments
+
+// Attribute-specific deployments
+
+// Argument-specific deployments
+
+// Broadcast-specific deployments
+
+
+} // namespace TestInterfaceManager_
+} // namespace tests
+} // namespace commonapi
+} // namespace v1
+
+#endif // COMMONAPI_DBUS_TESTINTERFACEMANAGER_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.cpp
new file mode 100644
index 0000000..594c9f3
--- /dev/null
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.cpp
@@ -0,0 +1,50 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#include <v1/commonapi/tests/TestInterfaceManagerDBusProxy.hpp>
+
+namespace v1 {
+namespace commonapi {
+namespace tests {
+
+std::shared_ptr<CommonAPI::DBus::DBusProxy> createTestInterfaceManagerDBusProxy(
+	const CommonAPI::DBus::DBusAddress &_address,
+	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection) {
+	return std::make_shared<TestInterfaceManagerDBusProxy>(_address, _connection);
+}
+
+INITIALIZER(registerTestInterfaceManagerDBusProxy) {
+     CommonAPI::DBus::Factory::get()->registerProxyCreateMethod(
+		TestInterfaceManager::getInterface(),
+		&createTestInterfaceManagerDBusProxy);
+}
+
+TestInterfaceManagerDBusProxy::TestInterfaceManagerDBusProxy(
+	const CommonAPI::DBus::DBusAddress &_address,
+	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection)
+	:	CommonAPI::DBus::DBusProxy(_address, _connection)
+,		proxyManagerTestInterface_(*this, "commonapi.tests.TestInterface")
+{
+}
+
+
+    
+
+CommonAPI::ProxyManager& TestInterfaceManagerDBusProxy::getProxyManagerTestInterface() {
+return proxyManagerTestInterface_;
+      }
+
+void TestInterfaceManagerDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
+          ownVersionMajor = 1;
+          ownVersionMinor = 0;
+      }
+
+      } // namespace tests
+      } // namespace commonapi
+      } // namespace v1
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.hpp
new file mode 100644
index 0000000..ca52bac
--- /dev/null
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.hpp
@@ -0,0 +1,63 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#ifndef COMMONAPI_TESTS_Test_Interface_Manager_DBUS_PROXY_HPP_
+#define COMMONAPI_TESTS_Test_Interface_Manager_DBUS_PROXY_HPP_
+
+#include <v1/commonapi/tests/TestInterfaceManagerProxyBase.hpp>
+#include "v1/commonapi/tests/TestInterfaceManagerDBusDeployment.hpp"
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+#include <CommonAPI/DBus/DBusAddress.hpp>
+#include <CommonAPI/DBus/DBusFactory.hpp>
+#include <CommonAPI/DBus/DBusProxy.hpp>
+#include <CommonAPI/DBus/DBusAddressTranslator.hpp>
+#include <CommonAPI/DBus/DBusProxyManager.hpp>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+#include <string>
+
+namespace v1 {
+namespace commonapi {
+namespace tests {
+
+class TestInterfaceManagerDBusProxy
+    : virtual public TestInterfaceManagerProxyBase, 
+      virtual public CommonAPI::DBus::DBusProxy {
+public:
+    TestInterfaceManagerDBusProxy(
+        const CommonAPI::DBus::DBusAddress &_address,
+        const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection);
+
+    virtual ~TestInterfaceManagerDBusProxy() { }
+
+
+
+
+    virtual CommonAPI::ProxyManager& getProxyManagerTestInterface();
+
+    virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
+
+private:
+   
+
+
+    CommonAPI::DBus::DBusProxyManager proxyManagerTestInterface_;
+};
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1
+
+#endif // COMMONAPI_TESTS_Test_Interface_Manager_DBUS_PROXY_HPP_
+
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.cpp
new file mode 100644
index 0000000..511b538
--- /dev/null
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.cpp
@@ -0,0 +1,149 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#include <v1/commonapi/tests/TestInterfaceManager.hpp>
+#include <v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.hpp>
+
+namespace v1 {
+namespace commonapi {
+namespace tests {
+
+std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> createTestInterfaceManagerDBusStubAdapter(
+                   const CommonAPI::DBus::DBusAddress &_address,
+                   const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection,
+                   const std::shared_ptr<CommonAPI::StubBase> &_stub) {
+    return std::make_shared<TestInterfaceManagerDBusStubAdapter>(_address, _connection, _stub);
+}
+
+INITIALIZER(registerTestInterfaceManagerDBusStubAdapter) {
+    CommonAPI::DBus::Factory::get()->registerStubAdapterCreateMethod(
+    	TestInterfaceManager::getInterface(), &createTestInterfaceManagerDBusStubAdapter);
+}
+
+TestInterfaceManagerDBusStubAdapterInternal::~TestInterfaceManagerDBusStubAdapterInternal() {
+    deactivateManagedInstances();
+    TestInterfaceManagerDBusStubAdapterHelper::deinit();
+}
+
+void TestInterfaceManagerDBusStubAdapterInternal::deactivateManagedInstances() {
+    std::set<std::string>::iterator iter;
+    std::set<std::string>::iterator iterNext;
+
+    iter = registeredTestInterfaceInstances.begin();
+    while (iter != registeredTestInterfaceInstances.end()) {
+        iterNext = std::next(iter);
+
+        if (deregisterManagedStubTestInterface(*iter)) {
+            iter = iterNext;
+        }
+        else {
+            iter++;
+        }
+    }
+}
+
+const char* TestInterfaceManagerDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const {
+    static const std::string introspectionData =
+        "<method name=\"getInterfaceVersion\">\n"
+            "<arg name=\"value\" type=\"uu\" direction=\"out\" />"
+        "</method>\n"
+
+        ""
+    ;
+    return introspectionData.c_str();
+}
+
+CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestInterfaceManagerStub,
+        CommonAPI::Version
+        > TestInterfaceManagerDBusStubAdapterInternal::getTestInterfaceManagerInterfaceVersionStubDispatcher(&TestInterfaceManagerStub::getInterfaceVersion, "uu");
+
+
+
+
+
+
+
+
+const TestInterfaceManagerDBusStubAdapterHelper::StubDispatcherTable& TestInterfaceManagerDBusStubAdapterInternal::getStubDispatcherTable() {
+    return stubDispatcherTable_;
+}
+
+const CommonAPI::DBus::StubAttributeTable& TestInterfaceManagerDBusStubAdapterInternal::getStubAttributeTable() {
+    return stubAttributeTable_;
+}
+bool TestInterfaceManagerDBusStubAdapterInternal::registerManagedStubTestInterface(std::shared_ptr<::v1::commonapi::tests::TestInterfaceStub> _stub, const std::string &_instance) {
+    if (registeredTestInterfaceInstances.find(_instance) == registeredTestInterfaceInstances.end()) {
+    	std::string itsAddress = "local:commonapi.tests.TestInterface:" + _instance;
+        CommonAPI::DBus::DBusAddress itsDBusAddress;
+        CommonAPI::DBus::DBusAddressTranslator::get()->translate(itsAddress, itsDBusAddress);
+
+        std::string objectPath(itsDBusAddress.getObjectPath());
+        std::string adapterObjectPath(getDBusAddress().getObjectPath());
+
+        if (objectPath.compare(0, adapterObjectPath.length(), adapterObjectPath) == 0) {
+        	std::shared_ptr<CommonAPI::DBus::Factory> itsFactory = CommonAPI::DBus::Factory::get();
+
+            auto stubAdapter = itsFactory->createDBusStubAdapter(_stub, "commonapi.tests.TestInterface", itsDBusAddress, connection_);
+            bool isRegistered = itsFactory->registerManagedService(stubAdapter);
+            if (isRegistered) {
+                bool isExported = connection_->getDBusObjectManager()->exportManagedDBusStubAdapter(adapterObjectPath, stubAdapter);
+                if (isExported) {
+                    registeredTestInterfaceInstances.insert(_instance);
+                    return true;
+                } else {
+                    itsFactory->unregisterManagedService(itsAddress);
+                }
+            }
+        }
+    }
+    return false;
+}
+
+bool TestInterfaceManagerDBusStubAdapterInternal::deregisterManagedStubTestInterface(const std::string &_instance) {
+    std::string itsAddress = "local:commonapi.tests.TestInterface:" + _instance;
+    if (registeredTestInterfaceInstances.find(_instance) != registeredTestInterfaceInstances.end()) {
+        std::shared_ptr<CommonAPI::DBus::Factory> itsFactory = CommonAPI::DBus::Factory::get();
+        std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> stubAdapter
+            = itsFactory->getRegisteredService(itsAddress);
+        if (stubAdapter) {
+            connection_->getDBusObjectManager()->unexportManagedDBusStubAdapter(
+                getDBusAddress().getObjectPath(), stubAdapter);
+            itsFactory->unregisterManagedService(itsAddress);
+            registeredTestInterfaceInstances.erase(_instance);
+            return true;
+        }
+    }
+    return false;
+}
+
+std::set<std::string>& TestInterfaceManagerDBusStubAdapterInternal::getTestInterfaceInstances() {
+    return registeredTestInterfaceInstances;
+}
+
+TestInterfaceManagerDBusStubAdapterInternal::TestInterfaceManagerDBusStubAdapterInternal(
+        const CommonAPI::DBus::DBusAddress &_address,
+        const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection,
+        const std::shared_ptr<CommonAPI::StubBase> &_stub)
+	: CommonAPI::DBus::DBusStubAdapter(_address, _connection,true),
+      TestInterfaceManagerDBusStubAdapterHelper(_address, _connection, std::dynamic_pointer_cast<TestInterfaceManagerStub>(_stub), true),
+      stubDispatcherTable_({
+            }),
+        stubAttributeTable_() {
+
+    stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &commonapi::tests::TestInterfaceManagerDBusStubAdapterInternal::getTestInterfaceManagerInterfaceVersionStubDispatcher });
+}
+
+bool TestInterfaceManagerDBusStubAdapterInternal::hasFreedesktopProperties() {
+    return false;
+}
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.hpp
new file mode 100644
index 0000000..1d2fd09
--- /dev/null
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.hpp
@@ -0,0 +1,108 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#ifndef COMMONAPI_TESTS_Test_Interface_Manager_DBUS_STUB_ADAPTER_HPP_
+#define COMMONAPI_TESTS_Test_Interface_Manager_DBUS_STUB_ADAPTER_HPP_
+
+#include <v1/commonapi/tests/TestInterfaceManagerStub.hpp>
+#include "v1/commonapi/tests/TestInterfaceManagerDBusDeployment.hpp"        
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+#include <CommonAPI/DBus/DBusAddressTranslator.hpp>
+#include <CommonAPI/DBus/DBusFactory.hpp>
+#include <CommonAPI/DBus/DBusObjectManager.hpp>
+#include <CommonAPI/DBus/DBusStubAdapterHelper.hpp>
+#include <CommonAPI/DBus/DBusStubAdapter.hpp>
+#include <CommonAPI/DBus/DBusDeployment.hpp>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1 {
+namespace commonapi {
+namespace tests {
+
+typedef CommonAPI::DBus::DBusStubAdapterHelper<TestInterfaceManagerStub> TestInterfaceManagerDBusStubAdapterHelper;
+
+class TestInterfaceManagerDBusStubAdapterInternal
+    : public virtual TestInterfaceManagerStubAdapter,
+      public TestInterfaceManagerDBusStubAdapterHelper
+{
+public:
+    TestInterfaceManagerDBusStubAdapterInternal(
+            const CommonAPI::DBus::DBusAddress &_address,
+            const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection,
+            const std::shared_ptr<CommonAPI::StubBase> &_stub);
+
+    ~TestInterfaceManagerDBusStubAdapterInternal();
+
+    virtual bool hasFreedesktopProperties();
+
+    inline static const char* getInterface() {
+        return TestInterfaceManager::getInterface();
+    }
+
+
+
+    bool registerManagedStubTestInterface(std::shared_ptr<::v1::commonapi::tests::TestInterfaceStub>, const std::string&);
+    bool deregisterManagedStubTestInterface(const std::string&);
+    std::set<std::string>& getTestInterfaceInstances();
+
+    const TestInterfaceManagerDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable();
+    const CommonAPI::DBus::StubAttributeTable& getStubAttributeTable();
+
+    void deactivateManagedInstances();
+    
+
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+        ::v1::commonapi::tests::TestInterfaceManagerStub,
+        CommonAPI::Version
+        > getTestInterfaceManagerInterfaceVersionStubDispatcher;
+
+
+
+
+
+
+
+ protected:
+    virtual const char* getMethodsDBusIntrospectionXmlData() const;
+
+ private:
+    std::set<std::string> registeredTestInterfaceInstances;
+    TestInterfaceManagerDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_;
+    CommonAPI::DBus::StubAttributeTable stubAttributeTable_;
+};
+
+class TestInterfaceManagerDBusStubAdapter
+    : public TestInterfaceManagerDBusStubAdapterInternal,
+      public std::enable_shared_from_this<TestInterfaceManagerDBusStubAdapter> {
+public:
+    TestInterfaceManagerDBusStubAdapter(
+    	const CommonAPI::DBus::DBusAddress &_address,
+        const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection,
+        const std::shared_ptr<CommonAPI::StubBase> &_stub)
+    	: CommonAPI::DBus::DBusStubAdapter(
+    		_address, 
+    		_connection,
+            true),
+          TestInterfaceManagerDBusStubAdapterInternal(
+          	_address, 
+          	_connection, 
+          	_stub) { 
+    }
+};
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1
+
+#endif // COMMONAPI_TESTS_Test_Interface_Manager_DBUS_STUB_ADAPTER_HPP_
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.cpp
index f58b844..19e51f5 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -9,7 +9,7 @@
 */
 #include "BranchInterfaceDBusDeployment.hpp"
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -27,4 +27,4 @@ namespace BranchInterface_ {
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp
index f87fdb9..49bdd2c 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -19,7 +19,7 @@
 #include <CommonAPI/DBus/DBusDeployment.hpp>
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -40,6 +40,6 @@ namespace BranchInterface_ {
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_DBUS_BRANCHINTERFACE_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp
new file mode 100644
index 0000000..43872d8
--- /dev/null
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp
@@ -0,0 +1,105 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#include <v1/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp>
+
+namespace v1 {
+namespace commonapi {
+namespace tests {
+namespace managed {
+
+std::shared_ptr<CommonAPI::DBus::DBusProxy> createBranchInterfaceDBusProxy(
+	const CommonAPI::DBus::DBusAddress &_address,
+	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection) {
+	return std::make_shared<BranchInterfaceDBusProxy>(_address, _connection);
+}
+
+INITIALIZER(registerBranchInterfaceDBusProxy) {
+     CommonAPI::DBus::Factory::get()->registerProxyCreateMethod(
+		BranchInterface::getInterface(),
+		&createBranchInterfaceDBusProxy);
+}
+
+BranchInterfaceDBusProxy::BranchInterfaceDBusProxy(
+	const CommonAPI::DBus::DBusAddress &_address,
+	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection)
+	:	CommonAPI::DBus::DBusProxy(_address, _connection)
+{
+}
+
+
+    
+    void BranchInterfaceDBusProxy::testBranchMethod(const int32_t &_inInt, const std::string &_inString, CommonAPI::CallStatus &_internalCallStatus, BranchInterface::testBranchMethodError &_error, int32_t &_outInt, std::string &_outString, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<BranchInterface::testBranchMethodError, CommonAPI::EmptyDeployment> deploy_error(static_cast<CommonAPI::EmptyDeployment *>(nullptr));
+        CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_inString(_inString, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
+        CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_outInt(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_outString(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
+        CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >,
+            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<BranchInterface::testBranchMethodError, CommonAPI::EmptyDeployment>,
+            CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>,
+            CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>
+            >
+        	>::callMethodWithReply(
+        *this,
+        "testBranchMethod",
+        "is",
+(_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+deploy_inInt, deploy_inString,
+_internalCallStatus,
+deploy_error,
+deploy_outInt, deploy_outString);
+_error = deploy_error.getValue();
+_outInt = deploy_outInt.getValue();
+_outString = deploy_outString.getValue();
+}
+    std::future<CommonAPI::CallStatus> BranchInterfaceDBusProxy::testBranchMethodAsync(const int32_t &_inInt, const std::string &_inString, TestBranchMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<BranchInterface::testBranchMethodError, CommonAPI::EmptyDeployment> deploy_error(static_cast<CommonAPI::EmptyDeployment *>(nullptr));
+        CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_inString(_inString, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
+        CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_outInt(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_outString(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
+        return CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >,
+            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<BranchInterface::testBranchMethodError, CommonAPI::EmptyDeployment>,
+            CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>,
+            CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>
+            >
+        	>::callMethodAsync(
+        *this,
+        "testBranchMethod",
+        "is",
+        (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+        deploy_inInt, deploy_inString,
+        [_callback] (CommonAPI::CallStatus _internalCallStatus, CommonAPI::Deployable<BranchInterface::testBranchMethodError, CommonAPI::EmptyDeployment> _deploy_error, CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> _outInt, CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> _outString) {
+        	if (_callback)
+        		_callback(_internalCallStatus, _deploy_error.getValue(), _outInt.getValue(), _outString.getValue());
+        },
+        std::make_tuple(deploy_error, deploy_outInt, deploy_outString));
+    }
+
+
+void BranchInterfaceDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
+          ownVersionMajor = 1;
+          ownVersionMinor = 0;
+      }
+
+      } // namespace managed
+      } // namespace tests
+      } // namespace commonapi
+      } // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp
index 4f66233..36987e2 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,7 +10,8 @@
 #ifndef COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_PROXY_HPP_
 #define COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_PROXY_HPP_
 
-#include <v1_0/commonapi/tests/managed/BranchInterfaceProxyBase.hpp>
+#include <v1/commonapi/tests/managed/BranchInterfaceProxyBase.hpp>
+#include "v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp"
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -19,12 +20,13 @@
 #include <CommonAPI/DBus/DBusAddress.hpp>
 #include <CommonAPI/DBus/DBusFactory.hpp>
 #include <CommonAPI/DBus/DBusProxy.hpp>
+#include <CommonAPI/DBus/DBusAddressTranslator.hpp>
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
 #include <string>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -48,7 +50,7 @@ public:
     virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
 
 private:
-    
+   
 
 
 };
@@ -56,7 +58,7 @@ private:
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_PROXY_HPP_
 
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp
index ce8f413..7fb3e68 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp
@@ -1,16 +1,16 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#include <v1_0/commonapi/tests/managed/BranchInterface.hpp>
-#include <v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp>
+#include <v1/commonapi/tests/managed/BranchInterface.hpp>
+#include <v1/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -54,7 +54,7 @@ const char* BranchInterfaceDBusStubAdapterInternal::getMethodsDBusIntrospectionX
 }
 
 CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        BranchInterfaceStub,
+        ::v1::commonapi::tests::managed::BranchInterfaceStub,
         CommonAPI::Version
         > BranchInterfaceDBusStubAdapterInternal::getBranchInterfaceInterfaceVersionStubDispatcher(&BranchInterfaceStub::getInterfaceVersion, "uu");
 
@@ -62,7 +62,7 @@ CommonAPI::DBus::DBusGetAttributeStubDispatcher<
 
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    BranchInterfaceStub,
+    ::v1::commonapi::tests::managed::BranchInterfaceStub,
     std::tuple<int32_t, std::string>,
     std::tuple<BranchInterface::testBranchMethodError, int32_t, std::string>,
     std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>,
@@ -99,11 +99,11 @@ BranchInterfaceDBusStubAdapterInternal::BranchInterfaceDBusStubAdapterInternal(
     stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &commonapi::tests::managed::BranchInterfaceDBusStubAdapterInternal::getBranchInterfaceInterfaceVersionStubDispatcher });
 }
 
-const bool BranchInterfaceDBusStubAdapterInternal::hasFreedesktopProperties() {
+bool BranchInterfaceDBusStubAdapterInternal::hasFreedesktopProperties() {
     return false;
 }
 
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp
index 1da6539..a66319e 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,13 +10,14 @@
 #ifndef COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_STUB_ADAPTER_HPP_
 #define COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_STUB_ADAPTER_HPP_
 
-#include <v1_0/commonapi/tests/managed/BranchInterfaceStub.hpp>
-#include "v1_0/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp"        
+#include <v1/commonapi/tests/managed/BranchInterfaceStub.hpp>
+#include "v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp"        
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
 #endif
 
+#include <CommonAPI/DBus/DBusAddressTranslator.hpp>
 #include <CommonAPI/DBus/DBusFactory.hpp>
 #include <CommonAPI/DBus/DBusStubAdapterHelper.hpp>
 #include <CommonAPI/DBus/DBusStubAdapter.hpp>
@@ -24,7 +25,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -43,7 +44,11 @@ public:
 
     ~BranchInterfaceDBusStubAdapterInternal();
 
-    virtual const bool hasFreedesktopProperties();
+    virtual bool hasFreedesktopProperties();
+
+    inline static const char* getInterface() {
+        return BranchInterface::getInterface();
+    }
 
 
 
@@ -55,7 +60,7 @@ public:
     
 
 static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        BranchInterfaceStub,
+        ::v1::commonapi::tests::managed::BranchInterfaceStub,
         CommonAPI::Version
         > getBranchInterfaceInterfaceVersionStubDispatcher;
 
@@ -63,7 +68,7 @@ static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
 
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    BranchInterfaceStub,
+    ::v1::commonapi::tests::managed::BranchInterfaceStub,
     std::tuple<int32_t, std::string>,
     std::tuple<BranchInterface::testBranchMethodError, int32_t, std::string>,
     std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>,
@@ -104,6 +109,6 @@ public:
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_STUB_ADAPTER_HPP_
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.cpp
index d28ab96..ad090e2 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -9,7 +9,7 @@
 */
 #include "LeafInterfaceDBusDeployment.hpp"
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -27,4 +27,4 @@ namespace LeafInterface_ {
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp
index 71e0f4c..2263af3 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -19,7 +19,7 @@
 #include <CommonAPI/DBus/DBusDeployment.hpp>
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -40,6 +40,6 @@ namespace LeafInterface_ {
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_DBUS_LEAFINTERFACE_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp
new file mode 100644
index 0000000..fd4df47
--- /dev/null
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp
@@ -0,0 +1,105 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#include <v1/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp>
+
+namespace v1 {
+namespace commonapi {
+namespace tests {
+namespace managed {
+
+std::shared_ptr<CommonAPI::DBus::DBusProxy> createLeafInterfaceDBusProxy(
+	const CommonAPI::DBus::DBusAddress &_address,
+	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection) {
+	return std::make_shared<LeafInterfaceDBusProxy>(_address, _connection);
+}
+
+INITIALIZER(registerLeafInterfaceDBusProxy) {
+     CommonAPI::DBus::Factory::get()->registerProxyCreateMethod(
+		LeafInterface::getInterface(),
+		&createLeafInterfaceDBusProxy);
+}
+
+LeafInterfaceDBusProxy::LeafInterfaceDBusProxy(
+	const CommonAPI::DBus::DBusAddress &_address,
+	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection)
+	:	CommonAPI::DBus::DBusProxy(_address, _connection)
+{
+}
+
+
+    
+    void LeafInterfaceDBusProxy::testLeafMethod(const int32_t &_inInt, const std::string &_inString, CommonAPI::CallStatus &_internalCallStatus, LeafInterface::testLeafMethodError &_error, int32_t &_outInt, std::string &_outString, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<LeafInterface::testLeafMethodError, CommonAPI::EmptyDeployment> deploy_error(static_cast<CommonAPI::EmptyDeployment *>(nullptr));
+        CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_inString(_inString, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
+        CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_outInt(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_outString(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
+        CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >,
+            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<LeafInterface::testLeafMethodError, CommonAPI::EmptyDeployment>,
+            CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>,
+            CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>
+            >
+        	>::callMethodWithReply(
+        *this,
+        "testLeafMethod",
+        "is",
+(_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+deploy_inInt, deploy_inString,
+_internalCallStatus,
+deploy_error,
+deploy_outInt, deploy_outString);
+_error = deploy_error.getValue();
+_outInt = deploy_outInt.getValue();
+_outString = deploy_outString.getValue();
+}
+    std::future<CommonAPI::CallStatus> LeafInterfaceDBusProxy::testLeafMethodAsync(const int32_t &_inInt, const std::string &_inString, TestLeafMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<LeafInterface::testLeafMethodError, CommonAPI::EmptyDeployment> deploy_error(static_cast<CommonAPI::EmptyDeployment *>(nullptr));
+        CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_inString(_inString, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
+        CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_outInt(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_outString(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
+        return CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >,
+            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<LeafInterface::testLeafMethodError, CommonAPI::EmptyDeployment>,
+            CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>,
+            CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>
+            >
+        	>::callMethodAsync(
+        *this,
+        "testLeafMethod",
+        "is",
+        (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+        deploy_inInt, deploy_inString,
+        [_callback] (CommonAPI::CallStatus _internalCallStatus, CommonAPI::Deployable<LeafInterface::testLeafMethodError, CommonAPI::EmptyDeployment> _deploy_error, CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> _outInt, CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> _outString) {
+        	if (_callback)
+        		_callback(_internalCallStatus, _deploy_error.getValue(), _outInt.getValue(), _outString.getValue());
+        },
+        std::make_tuple(deploy_error, deploy_outInt, deploy_outString));
+    }
+
+
+void LeafInterfaceDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
+          ownVersionMajor = 1;
+          ownVersionMinor = 0;
+      }
+
+      } // namespace managed
+      } // namespace tests
+      } // namespace commonapi
+      } // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp
index 8fec7ca..8eff349 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,7 +10,8 @@
 #ifndef COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_PROXY_HPP_
 #define COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_PROXY_HPP_
 
-#include <v1_0/commonapi/tests/managed/LeafInterfaceProxyBase.hpp>
+#include <v1/commonapi/tests/managed/LeafInterfaceProxyBase.hpp>
+#include "v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp"
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -19,12 +20,13 @@
 #include <CommonAPI/DBus/DBusAddress.hpp>
 #include <CommonAPI/DBus/DBusFactory.hpp>
 #include <CommonAPI/DBus/DBusProxy.hpp>
+#include <CommonAPI/DBus/DBusAddressTranslator.hpp>
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
 #include <string>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -48,7 +50,7 @@ public:
     virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
 
 private:
-    
+   
 
 
 };
@@ -56,7 +58,7 @@ private:
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_PROXY_HPP_
 
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp
index d622168..dbf3f36 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp
@@ -1,16 +1,16 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#include <v1_0/commonapi/tests/managed/LeafInterface.hpp>
-#include <v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp>
+#include <v1/commonapi/tests/managed/LeafInterface.hpp>
+#include <v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -54,7 +54,7 @@ const char* LeafInterfaceDBusStubAdapterInternal::getMethodsDBusIntrospectionXml
 }
 
 CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        LeafInterfaceStub,
+        ::v1::commonapi::tests::managed::LeafInterfaceStub,
         CommonAPI::Version
         > LeafInterfaceDBusStubAdapterInternal::getLeafInterfaceInterfaceVersionStubDispatcher(&LeafInterfaceStub::getInterfaceVersion, "uu");
 
@@ -62,7 +62,7 @@ CommonAPI::DBus::DBusGetAttributeStubDispatcher<
 
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    LeafInterfaceStub,
+    ::v1::commonapi::tests::managed::LeafInterfaceStub,
     std::tuple<int32_t, std::string>,
     std::tuple<LeafInterface::testLeafMethodError, int32_t, std::string>,
     std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>,
@@ -99,11 +99,11 @@ LeafInterfaceDBusStubAdapterInternal::LeafInterfaceDBusStubAdapterInternal(
     stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &commonapi::tests::managed::LeafInterfaceDBusStubAdapterInternal::getLeafInterfaceInterfaceVersionStubDispatcher });
 }
 
-const bool LeafInterfaceDBusStubAdapterInternal::hasFreedesktopProperties() {
+bool LeafInterfaceDBusStubAdapterInternal::hasFreedesktopProperties() {
     return false;
 }
 
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp
index 853dbfb..ca99f2f 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,13 +10,14 @@
 #ifndef COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_STUB_ADAPTER_HPP_
 #define COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_STUB_ADAPTER_HPP_
 
-#include <v1_0/commonapi/tests/managed/LeafInterfaceStub.hpp>
-#include "v1_0/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp"        
+#include <v1/commonapi/tests/managed/LeafInterfaceStub.hpp>
+#include "v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp"        
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
 #endif
 
+#include <CommonAPI/DBus/DBusAddressTranslator.hpp>
 #include <CommonAPI/DBus/DBusFactory.hpp>
 #include <CommonAPI/DBus/DBusStubAdapterHelper.hpp>
 #include <CommonAPI/DBus/DBusStubAdapter.hpp>
@@ -24,7 +25,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -43,7 +44,11 @@ public:
 
     ~LeafInterfaceDBusStubAdapterInternal();
 
-    virtual const bool hasFreedesktopProperties();
+    virtual bool hasFreedesktopProperties();
+
+    inline static const char* getInterface() {
+        return LeafInterface::getInterface();
+    }
 
 
 
@@ -55,7 +60,7 @@ public:
     
 
 static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        LeafInterfaceStub,
+        ::v1::commonapi::tests::managed::LeafInterfaceStub,
         CommonAPI::Version
         > getLeafInterfaceInterfaceVersionStubDispatcher;
 
@@ -63,7 +68,7 @@ static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
 
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    LeafInterfaceStub,
+    ::v1::commonapi::tests::managed::LeafInterfaceStub,
     std::tuple<int32_t, std::string>,
     std::tuple<LeafInterface::testLeafMethodError, int32_t, std::string>,
     std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>,
@@ -104,6 +109,6 @@ public:
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_STUB_ADAPTER_HPP_
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusDeployment.cpp
index c514b7e..7df2021 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusDeployment.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -9,7 +9,7 @@
 */
 #include "RootInterfaceDBusDeployment.hpp"
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -27,4 +27,4 @@ namespace RootInterface_ {
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp
index 63a1fdf..1d3e157 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -19,7 +19,7 @@
 #include <CommonAPI/DBus/DBusDeployment.hpp>
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -40,6 +40,6 @@ namespace RootInterface_ {
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_DBUS_ROOTINTERFACE_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusProxy.cpp
new file mode 100644
index 0000000..8115315
--- /dev/null
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusProxy.cpp
@@ -0,0 +1,113 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#include <v1/commonapi/tests/managed/RootInterfaceDBusProxy.hpp>
+
+namespace v1 {
+namespace commonapi {
+namespace tests {
+namespace managed {
+
+std::shared_ptr<CommonAPI::DBus::DBusProxy> createRootInterfaceDBusProxy(
+	const CommonAPI::DBus::DBusAddress &_address,
+	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection) {
+	return std::make_shared<RootInterfaceDBusProxy>(_address, _connection);
+}
+
+INITIALIZER(registerRootInterfaceDBusProxy) {
+     CommonAPI::DBus::Factory::get()->registerProxyCreateMethod(
+		RootInterface::getInterface(),
+		&createRootInterfaceDBusProxy);
+}
+
+RootInterfaceDBusProxy::RootInterfaceDBusProxy(
+	const CommonAPI::DBus::DBusAddress &_address,
+	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection)
+	:	CommonAPI::DBus::DBusProxy(_address, _connection)
+,		proxyManagerLeafInterface_(*this, "commonapi.tests.managed.LeafInterface"),
+		proxyManagerBranchInterface_(*this, "commonapi.tests.managed.BranchInterface")
+{
+}
+
+
+    
+    void RootInterfaceDBusProxy::testRootMethod(const int32_t &_inInt, const std::string &_inString, CommonAPI::CallStatus &_internalCallStatus, RootInterface::testRootMethodError &_error, int32_t &_outInt, std::string &_outString, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<RootInterface::testRootMethodError, CommonAPI::EmptyDeployment> deploy_error(static_cast<CommonAPI::EmptyDeployment *>(nullptr));
+        CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_inString(_inString, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
+        CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_outInt(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_outString(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
+        CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >,
+            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<RootInterface::testRootMethodError, CommonAPI::EmptyDeployment>,
+            CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>,
+            CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>
+            >
+        	>::callMethodWithReply(
+        *this,
+        "testRootMethod",
+        "is",
+(_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+deploy_inInt, deploy_inString,
+_internalCallStatus,
+deploy_error,
+deploy_outInt, deploy_outString);
+_error = deploy_error.getValue();
+_outInt = deploy_outInt.getValue();
+_outString = deploy_outString.getValue();
+}
+    std::future<CommonAPI::CallStatus> RootInterfaceDBusProxy::testRootMethodAsync(const int32_t &_inInt, const std::string &_inString, TestRootMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<RootInterface::testRootMethodError, CommonAPI::EmptyDeployment> deploy_error(static_cast<CommonAPI::EmptyDeployment *>(nullptr));
+        CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_inString(_inString, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
+        CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_outInt(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_outString(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
+        return CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >,
+            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<RootInterface::testRootMethodError, CommonAPI::EmptyDeployment>,
+            CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>,
+            CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>
+            >
+        	>::callMethodAsync(
+        *this,
+        "testRootMethod",
+        "is",
+        (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+        deploy_inInt, deploy_inString,
+        [_callback] (CommonAPI::CallStatus _internalCallStatus, CommonAPI::Deployable<RootInterface::testRootMethodError, CommonAPI::EmptyDeployment> _deploy_error, CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> _outInt, CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> _outString) {
+        	if (_callback)
+        		_callback(_internalCallStatus, _deploy_error.getValue(), _outInt.getValue(), _outString.getValue());
+        },
+        std::make_tuple(deploy_error, deploy_outInt, deploy_outString));
+    }
+
+CommonAPI::ProxyManager& RootInterfaceDBusProxy::getProxyManagerLeafInterface() {
+return proxyManagerLeafInterface_;
+      }
+CommonAPI::ProxyManager& RootInterfaceDBusProxy::getProxyManagerBranchInterface() {
+return proxyManagerBranchInterface_;
+      }
+
+void RootInterfaceDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
+          ownVersionMajor = 1;
+          ownVersionMinor = 0;
+      }
+
+      } // namespace managed
+      } // namespace tests
+      } // namespace commonapi
+      } // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusProxy.hpp
index a0c7443..f0a458f 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusProxy.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,7 +10,8 @@
 #ifndef COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_PROXY_HPP_
 #define COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_PROXY_HPP_
 
-#include <v1_0/commonapi/tests/managed/RootInterfaceProxyBase.hpp>
+#include <v1/commonapi/tests/managed/RootInterfaceProxyBase.hpp>
+#include "v1/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp"
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -19,13 +20,14 @@
 #include <CommonAPI/DBus/DBusAddress.hpp>
 #include <CommonAPI/DBus/DBusFactory.hpp>
 #include <CommonAPI/DBus/DBusProxy.hpp>
+#include <CommonAPI/DBus/DBusAddressTranslator.hpp>
 #include <CommonAPI/DBus/DBusProxyManager.hpp>
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
 #include <string>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -51,7 +53,7 @@ public:
     virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
 
 private:
-    
+   
 
 
     CommonAPI::DBus::DBusProxyManager proxyManagerLeafInterface_;
@@ -61,7 +63,7 @@ private:
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_PROXY_HPP_
 
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp
index c414d4c..6466b61 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp
@@ -1,16 +1,16 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#include <v1_0/commonapi/tests/managed/RootInterface.hpp>
-#include <v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp>
+#include <v1/commonapi/tests/managed/RootInterface.hpp>
+#include <v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -78,7 +78,7 @@ const char* RootInterfaceDBusStubAdapterInternal::getMethodsDBusIntrospectionXml
 }
 
 CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        RootInterfaceStub,
+        ::v1::commonapi::tests::managed::RootInterfaceStub,
         CommonAPI::Version
         > RootInterfaceDBusStubAdapterInternal::getRootInterfaceInterfaceVersionStubDispatcher(&RootInterfaceStub::getInterfaceVersion, "uu");
 
@@ -86,7 +86,7 @@ CommonAPI::DBus::DBusGetAttributeStubDispatcher<
 
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    RootInterfaceStub,
+    ::v1::commonapi::tests::managed::RootInterfaceStub,
     std::tuple<int32_t, std::string>,
     std::tuple<RootInterface::testRootMethodError, int32_t, std::string>,
     std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>,
@@ -108,7 +108,7 @@ const RootInterfaceDBusStubAdapterHelper::StubDispatcherTable& RootInterfaceDBus
 const CommonAPI::DBus::StubAttributeTable& RootInterfaceDBusStubAdapterInternal::getStubAttributeTable() {
     return stubAttributeTable_;
 }
-bool RootInterfaceDBusStubAdapterInternal::registerManagedStubLeafInterface(std::shared_ptr<LeafInterfaceStub> _stub, const std::string &_instance) {
+bool RootInterfaceDBusStubAdapterInternal::registerManagedStubLeafInterface(std::shared_ptr<::v1::commonapi::tests::managed::LeafInterfaceStub> _stub, const std::string &_instance) {
     if (registeredLeafInterfaceInstances.find(_instance) == registeredLeafInterfaceInstances.end()) {
     	std::string itsAddress = "local:commonapi.tests.managed.LeafInterface:" + _instance;
         CommonAPI::DBus::DBusAddress itsDBusAddress;
@@ -156,7 +156,7 @@ bool RootInterfaceDBusStubAdapterInternal::deregisterManagedStubLeafInterface(co
 std::set<std::string>& RootInterfaceDBusStubAdapterInternal::getLeafInterfaceInstances() {
     return registeredLeafInterfaceInstances;
 }
-bool RootInterfaceDBusStubAdapterInternal::registerManagedStubBranchInterface(std::shared_ptr<BranchInterfaceStub> _stub, const std::string &_instance) {
+bool RootInterfaceDBusStubAdapterInternal::registerManagedStubBranchInterface(std::shared_ptr<::v1::commonapi::tests::managed::BranchInterfaceStub> _stub, const std::string &_instance) {
     if (registeredBranchInterfaceInstances.find(_instance) == registeredBranchInterfaceInstances.end()) {
     	std::string itsAddress = "local:commonapi.tests.managed.BranchInterface:" + _instance;
         CommonAPI::DBus::DBusAddress itsDBusAddress;
@@ -219,11 +219,11 @@ RootInterfaceDBusStubAdapterInternal::RootInterfaceDBusStubAdapterInternal(
     stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &commonapi::tests::managed::RootInterfaceDBusStubAdapterInternal::getRootInterfaceInterfaceVersionStubDispatcher });
 }
 
-const bool RootInterfaceDBusStubAdapterInternal::hasFreedesktopProperties() {
+bool RootInterfaceDBusStubAdapterInternal::hasFreedesktopProperties() {
     return false;
 }
 
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp
index d50ebe4..de6ffe9 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,8 +10,8 @@
 #ifndef COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_STUB_ADAPTER_HPP_
 #define COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_STUB_ADAPTER_HPP_
 
-#include <v1_0/commonapi/tests/managed/RootInterfaceStub.hpp>
-#include "v1_0/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp"        
+#include <v1/commonapi/tests/managed/RootInterfaceStub.hpp>
+#include "v1/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp"        
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -26,7 +26,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -45,14 +45,18 @@ public:
 
     ~RootInterfaceDBusStubAdapterInternal();
 
-    virtual const bool hasFreedesktopProperties();
+    virtual bool hasFreedesktopProperties();
+
+    inline static const char* getInterface() {
+        return RootInterface::getInterface();
+    }
 
 
 
-    bool registerManagedStubLeafInterface(std::shared_ptr<LeafInterfaceStub>, const std::string&);
+    bool registerManagedStubLeafInterface(std::shared_ptr<::v1::commonapi::tests::managed::LeafInterfaceStub>, const std::string&);
     bool deregisterManagedStubLeafInterface(const std::string&);
     std::set<std::string>& getLeafInterfaceInstances();
-    bool registerManagedStubBranchInterface(std::shared_ptr<BranchInterfaceStub>, const std::string&);
+    bool registerManagedStubBranchInterface(std::shared_ptr<::v1::commonapi::tests::managed::BranchInterfaceStub>, const std::string&);
     bool deregisterManagedStubBranchInterface(const std::string&);
     std::set<std::string>& getBranchInterfaceInstances();
 
@@ -63,7 +67,7 @@ public:
     
 
 static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        RootInterfaceStub,
+        ::v1::commonapi::tests::managed::RootInterfaceStub,
         CommonAPI::Version
         > getRootInterfaceInterfaceVersionStubDispatcher;
 
@@ -71,7 +75,7 @@ static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
 
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    RootInterfaceStub,
+    ::v1::commonapi::tests::managed::RootInterfaceStub,
     std::tuple<int32_t, std::string>,
     std::tuple<RootInterface::testRootMethodError, int32_t, std::string>,
     std::tuple<CommonAPI::EmptyDeployment, CommonAPI::DBus::StringDeployment>,
@@ -114,6 +118,6 @@ public:
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_STUB_ADAPTER_HPP_
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusDeployment.cpp
index 855d2af..596e267 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusDeployment.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -9,7 +9,7 @@
 */
 #include "SecondRootDBusDeployment.hpp"
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -27,4 +27,4 @@ namespace SecondRoot_ {
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusDeployment.hpp
index d328176..423adf0 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -19,7 +19,7 @@
 #include <CommonAPI/DBus/DBusDeployment.hpp>
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -40,6 +40,6 @@ namespace SecondRoot_ {
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_DBUS_SECONDROOT_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusProxy.cpp
index 767912b..35fac99 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusProxy.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusProxy.cpp
@@ -1,15 +1,15 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#include <v1_0/commonapi/tests/managed/SecondRootDBusProxy.hpp>
+#include <v1/commonapi/tests/managed/SecondRootDBusProxy.hpp>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -21,7 +21,7 @@ std::shared_ptr<CommonAPI::DBus::DBusProxy> createSecondRootDBusProxy(
 }
 
 INITIALIZER(registerSecondRootDBusProxy) {
-	CommonAPI::DBus::Factory::get()->registerProxyCreateMethod(
+     CommonAPI::DBus::Factory::get()->registerProxyCreateMethod(
 		SecondRoot::getInterface(),
 		&createSecondRootDBusProxy);
 }
@@ -35,18 +35,18 @@ SecondRootDBusProxy::SecondRootDBusProxy(
 }
 
 
+    
 
+CommonAPI::ProxyManager& SecondRootDBusProxy::getProxyManagerLeafInterface() {
+return proxyManagerLeafInterface_;
+      }
 
-        CommonAPI::ProxyManager& SecondRootDBusProxy::getProxyManagerLeafInterface() {
-            return proxyManagerLeafInterface_;
-        }
+void SecondRootDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
+          ownVersionMajor = 1;
+          ownVersionMinor = 0;
+      }
 
-        void SecondRootDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
-            ownVersionMajor = 1;
-            ownVersionMinor = 0;
-        }
-
-        } // namespace managed
-        } // namespace tests
-        } // namespace commonapi
-        } // namespace v1_0
+      } // namespace managed
+      } // namespace tests
+      } // namespace commonapi
+      } // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusProxy.hpp
index 82e6e06..ed2e0d3 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusProxy.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,7 +10,8 @@
 #ifndef COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_PROXY_HPP_
 #define COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_PROXY_HPP_
 
-#include <v1_0/commonapi/tests/managed/SecondRootProxyBase.hpp>
+#include <v1/commonapi/tests/managed/SecondRootProxyBase.hpp>
+#include "v1/commonapi/tests/managed/SecondRootDBusDeployment.hpp"
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -19,13 +20,14 @@
 #include <CommonAPI/DBus/DBusAddress.hpp>
 #include <CommonAPI/DBus/DBusFactory.hpp>
 #include <CommonAPI/DBus/DBusProxy.hpp>
+#include <CommonAPI/DBus/DBusAddressTranslator.hpp>
 #include <CommonAPI/DBus/DBusProxyManager.hpp>
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
 #include <string>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -48,7 +50,7 @@ public:
     virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
 
 private:
-    
+   
 
 
     CommonAPI::DBus::DBusProxyManager proxyManagerLeafInterface_;
@@ -57,7 +59,7 @@ private:
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_PROXY_HPP_
 
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp
index 36b8c10..355c97c 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp
@@ -1,16 +1,16 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#include <v1_0/commonapi/tests/managed/SecondRoot.hpp>
-#include <v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp>
+#include <v1/commonapi/tests/managed/SecondRoot.hpp>
+#include <v1/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp>
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -61,7 +61,7 @@ const char* SecondRootDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlDat
 }
 
 CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        SecondRootStub,
+        ::v1::commonapi::tests::managed::SecondRootStub,
         CommonAPI::Version
         > SecondRootDBusStubAdapterInternal::getSecondRootInterfaceVersionStubDispatcher(&SecondRootStub::getInterfaceVersion, "uu");
 
@@ -79,7 +79,7 @@ const SecondRootDBusStubAdapterHelper::StubDispatcherTable& SecondRootDBusStubAd
 const CommonAPI::DBus::StubAttributeTable& SecondRootDBusStubAdapterInternal::getStubAttributeTable() {
     return stubAttributeTable_;
 }
-bool SecondRootDBusStubAdapterInternal::registerManagedStubLeafInterface(std::shared_ptr<LeafInterfaceStub> _stub, const std::string &_instance) {
+bool SecondRootDBusStubAdapterInternal::registerManagedStubLeafInterface(std::shared_ptr<::v1::commonapi::tests::managed::LeafInterfaceStub> _stub, const std::string &_instance) {
     if (registeredLeafInterfaceInstances.find(_instance) == registeredLeafInterfaceInstances.end()) {
     	std::string itsAddress = "local:commonapi.tests.managed.LeafInterface:" + _instance;
         CommonAPI::DBus::DBusAddress itsDBusAddress;
@@ -141,11 +141,11 @@ SecondRootDBusStubAdapterInternal::SecondRootDBusStubAdapterInternal(
     stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &commonapi::tests::managed::SecondRootDBusStubAdapterInternal::getSecondRootInterfaceVersionStubDispatcher });
 }
 
-const bool SecondRootDBusStubAdapterInternal::hasFreedesktopProperties() {
+bool SecondRootDBusStubAdapterInternal::hasFreedesktopProperties() {
     return false;
 }
 
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp
index eaf9944..f68ffa7 100644
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,8 +10,8 @@
 #ifndef COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_STUB_ADAPTER_HPP_
 #define COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_STUB_ADAPTER_HPP_
 
-#include <v1_0/commonapi/tests/managed/SecondRootStub.hpp>
-#include "v1_0/commonapi/tests/managed/SecondRootDBusDeployment.hpp"        
+#include <v1/commonapi/tests/managed/SecondRootStub.hpp>
+#include "v1/commonapi/tests/managed/SecondRootDBusDeployment.hpp"        
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -26,7 +26,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace commonapi {
 namespace tests {
 namespace managed {
@@ -45,11 +45,15 @@ public:
 
     ~SecondRootDBusStubAdapterInternal();
 
-    virtual const bool hasFreedesktopProperties();
+    virtual bool hasFreedesktopProperties();
+
+    inline static const char* getInterface() {
+        return SecondRoot::getInterface();
+    }
 
 
 
-    bool registerManagedStubLeafInterface(std::shared_ptr<LeafInterfaceStub>, const std::string&);
+    bool registerManagedStubLeafInterface(std::shared_ptr<::v1::commonapi::tests::managed::LeafInterfaceStub>, const std::string&);
     bool deregisterManagedStubLeafInterface(const std::string&);
     std::set<std::string>& getLeafInterfaceInstances();
 
@@ -60,7 +64,7 @@ public:
     
 
 static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        SecondRootStub,
+        ::v1::commonapi::tests::managed::SecondRootStub,
         CommonAPI::Version
         > getSecondRootInterfaceVersionStubDispatcher;
 
@@ -101,6 +105,6 @@ public:
 } // namespace managed
 } // namespace tests
 } // namespace commonapi
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_STUB_ADAPTER_HPP_
diff --git a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusDeployment.cpp
index 19d9740..71bbbe1 100644
--- a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusDeployment.cpp
+++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusDeployment.cpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -9,7 +9,7 @@
 */
 #include "LegacyInterfaceDBusDeployment.hpp"
 
-namespace v1_0 {
+namespace v1 {
 namespace fake {
 namespace legacy {
 namespace service {
@@ -27,4 +27,4 @@ namespace LegacyInterface_ {
 } // namespace service
 } // namespace legacy
 } // namespace fake
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp
index b06463d..5497d10 100644
--- a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp
+++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -19,7 +19,7 @@
 #include <CommonAPI/DBus/DBusDeployment.hpp>
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace fake {
 namespace legacy {
 namespace service {
@@ -40,6 +40,6 @@ namespace LegacyInterface_ {
 } // namespace service
 } // namespace legacy
 } // namespace fake
-} // namespace v1_0
+} // namespace v1
 
 #endif // COMMONAPI_DBUS_LEGACYINTERFACE_DEPLOYMENT_HPP_
diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusProxy.cpp
new file mode 100644
index 0000000..d0c7aba
--- /dev/null
+++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusProxy.cpp
@@ -0,0 +1,166 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
+* Used org.franca.core 0.9.1.201412191134.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#include <v1/fake/legacy/service/LegacyInterfaceDBusProxy.hpp>
+
+namespace v1 {
+namespace fake {
+namespace legacy {
+namespace service {
+
+std::shared_ptr<CommonAPI::DBus::DBusProxy> createLegacyInterfaceDBusProxy(
+	const CommonAPI::DBus::DBusAddress &_address,
+	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection) {
+	return std::make_shared<LegacyInterfaceDBusProxy>(_address, _connection);
+}
+
+INITIALIZER(registerLegacyInterfaceDBusProxy) {
+     CommonAPI::DBus::Factory::get()->registerProxyCreateMethod(
+		LegacyInterface::getInterface(),
+		&createLegacyInterfaceDBusProxy);
+}
+
+LegacyInterfaceDBusProxy::LegacyInterfaceDBusProxy(
+	const CommonAPI::DBus::DBusAddress &_address,
+	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection)
+	:	CommonAPI::DBus::DBusProxy(_address, _connection)
+{
+}
+
+
+    
+    void LegacyInterfaceDBusProxy::TestMethod(const int32_t &_input, CommonAPI::CallStatus &_internalCallStatus, int32_t &_val1, int32_t &_val2, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_input(_input, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_val1(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_val2(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>,
+            CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>
+            >
+        	>::callMethodWithReply(
+        *this,
+        "TestMethod",
+        "i",
+(_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+deploy_input,
+_internalCallStatus,
+deploy_val1, deploy_val2);
+_val1 = deploy_val1.getValue();
+_val2 = deploy_val2.getValue();
+}
+    std::future<CommonAPI::CallStatus> LegacyInterfaceDBusProxy::TestMethodAsync(const int32_t &_input, TestMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_input(_input, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_val1(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_val2(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        return CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>,
+            CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>
+            >
+        	>::callMethodAsync(
+        *this,
+        "TestMethod",
+        "i",
+        (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+        deploy_input,
+        [_callback] (CommonAPI::CallStatus _internalCallStatus, CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> _val1, CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> _val2) {
+        	if (_callback)
+        		_callback(_internalCallStatus, _val1.getValue(), _val2.getValue());
+        },
+        std::make_tuple(deploy_val1, deploy_val2));
+    }
+    void LegacyInterfaceDBusProxy::OtherTestMethod(CommonAPI::CallStatus &_internalCallStatus, std::string &_greeting, int32_t &_identifier, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_greeting(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
+        CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_identifier(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>,
+            CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>
+            >
+        	>::callMethodWithReply(
+        *this,
+        "OtherTestMethod",
+        "",
+(_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+_internalCallStatus,
+deploy_greeting, deploy_identifier);
+_greeting = deploy_greeting.getValue();
+_identifier = deploy_identifier.getValue();
+}
+    std::future<CommonAPI::CallStatus> LegacyInterfaceDBusProxy::OtherTestMethodAsync(OtherTestMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
+        CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_greeting(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
+        CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_identifier(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
+        return CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>,
+            CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>
+            >
+        	>::callMethodAsync(
+        *this,
+        "OtherTestMethod",
+        "",
+        (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+        [_callback] (CommonAPI::CallStatus _internalCallStatus, CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> _greeting, CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> _identifier) {
+        	if (_callback)
+        		_callback(_internalCallStatus, _greeting.getValue(), _identifier.getValue());
+        },
+        std::make_tuple(deploy_greeting, deploy_identifier));
+    }
+    void LegacyInterfaceDBusProxy::finish(CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) {
+        CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            >
+        	>::callMethodWithReply(
+        *this,
+        "finish",
+        "",
+(_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+_internalCallStatus);
+}
+    std::future<CommonAPI::CallStatus> LegacyInterfaceDBusProxy::finishAsync(FinishAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
+        return CommonAPI::DBus::DBusProxyHelper<
+            CommonAPI::DBus::DBusSerializableArguments<
+            >,
+            CommonAPI::DBus::DBusSerializableArguments<
+            >
+        	>::callMethodAsync(
+        *this,
+        "finish",
+        "",
+        (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
+        [_callback] (CommonAPI::CallStatus _internalCallStatus) {
+        	if (_callback)
+        		_callback(_internalCallStatus);
+        },
+        std::make_tuple());
+    }
+
+
+void LegacyInterfaceDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
+          ownVersionMajor = 1;
+          ownVersionMinor = 0;
+      }
+
+      } // namespace service
+      } // namespace legacy
+      } // namespace fake
+      } // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusProxy.hpp
index dbebd0f..19b7d79 100644
--- a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusProxy.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,7 +10,8 @@
 #ifndef FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_PROXY_HPP_
 #define FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_PROXY_HPP_
 
-#include <v1_0/fake/legacy/service/LegacyInterfaceProxyBase.hpp>
+#include <v1/fake/legacy/service/LegacyInterfaceProxyBase.hpp>
+#include "v1/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp"
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
@@ -19,12 +20,13 @@
 #include <CommonAPI/DBus/DBusAddress.hpp>
 #include <CommonAPI/DBus/DBusFactory.hpp>
 #include <CommonAPI/DBus/DBusProxy.hpp>
+#include <CommonAPI/DBus/DBusAddressTranslator.hpp>
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
 #include <string>
 
-namespace v1_0 {
+namespace v1 {
 namespace fake {
 namespace legacy {
 namespace service {
@@ -52,7 +54,7 @@ public:
     virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
 
 private:
-    
+   
 
 
 };
@@ -60,7 +62,7 @@ private:
 } // namespace service
 } // namespace legacy
 } // namespace fake
-} // namespace v1_0
+} // namespace v1
 
 #endif // FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_PROXY_HPP_
 
diff --git a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.cpp
index 6cae1e8..9c145ea 100644
--- a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.cpp
@@ -1,16 +1,16 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file, You can obtain one at
 * http://mozilla.org/MPL/2.0/.
 */
-#include <v1_0/fake/legacy/service/LegacyInterface.hpp>
-#include <v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp>
+#include <v1/fake/legacy/service/LegacyInterface.hpp>
+#include <v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp>
 
-namespace v1_0 {
+namespace v1 {
 namespace fake {
 namespace legacy {
 namespace service {
@@ -58,7 +58,7 @@ const char* LegacyInterfaceDBusStubAdapterInternal::getMethodsDBusIntrospectionX
 }
 
 CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        LegacyInterfaceStub,
+        ::v1::fake::legacy::service::LegacyInterfaceStub,
         CommonAPI::Version
         > LegacyInterfaceDBusStubAdapterInternal::getLegacyInterfaceInterfaceVersionStubDispatcher(&LegacyInterfaceStub::getInterfaceVersion, "uu");
 
@@ -66,7 +66,7 @@ CommonAPI::DBus::DBusGetAttributeStubDispatcher<
 
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    LegacyInterfaceStub,
+    ::v1::fake::legacy::service::LegacyInterfaceStub,
     std::tuple<int32_t>,
     std::tuple<int32_t, int32_t>,
     std::tuple<CommonAPI::EmptyDeployment>,
@@ -78,7 +78,7 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
                 	std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<CommonAPI::EmptyDeployment*>(nullptr)));
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    LegacyInterfaceStub,
+    ::v1::fake::legacy::service::LegacyInterfaceStub,
     std::tuple<>,
     std::tuple<std::string, int32_t>,
     std::tuple<>,
@@ -90,7 +90,7 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
                 	std::make_tuple(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr), static_cast<CommonAPI::EmptyDeployment*>(nullptr)));
 
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    LegacyInterfaceStub,
+    ::v1::fake::legacy::service::LegacyInterfaceStub,
     std::tuple<>,
     std::tuple<>,
     std::tuple<>,
@@ -129,11 +129,11 @@ LegacyInterfaceDBusStubAdapterInternal::LegacyInterfaceDBusStubAdapterInternal(
     stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &fake::legacy::service::LegacyInterfaceDBusStubAdapterInternal::getLegacyInterfaceInterfaceVersionStubDispatcher });
 }
 
-const bool LegacyInterfaceDBusStubAdapterInternal::hasFreedesktopProperties() {
+bool LegacyInterfaceDBusStubAdapterInternal::hasFreedesktopProperties() {
     return false;
 }
 
 } // namespace service
 } // namespace legacy
 } // namespace fake
-} // namespace v1_0
+} // namespace v1
diff --git a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp
index 8aec0a1..95b2423 100644
--- a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp
@@ -1,6 +1,6 @@
 /*
 * This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
+* Used org.genivi.commonapi.dbus 3.1.4.v201511201313.
 * Used org.franca.core 0.9.1.201412191134.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
@@ -10,13 +10,14 @@
 #ifndef FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_STUB_ADAPTER_HPP_
 #define FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_STUB_ADAPTER_HPP_
 
-#include <v1_0/fake/legacy/service/LegacyInterfaceStub.hpp>
-#include "v1_0/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp"        
+#include <v1/fake/legacy/service/LegacyInterfaceStub.hpp>
+#include "v1/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp"        
 
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
 #endif
 
+#include <CommonAPI/DBus/DBusAddressTranslator.hpp>
 #include <CommonAPI/DBus/DBusFactory.hpp>
 #include <CommonAPI/DBus/DBusStubAdapterHelper.hpp>
 #include <CommonAPI/DBus/DBusStubAdapter.hpp>
@@ -24,7 +25,7 @@
 
 #undef COMMONAPI_INTERNAL_COMPILATION
 
-namespace v1_0 {
+namespace v1 {
 namespace fake {
 namespace legacy {
 namespace service {
@@ -43,7 +44,11 @@ public:
 
     ~LegacyInterfaceDBusStubAdapterInternal();
 
-    virtual const bool hasFreedesktopProperties();
+    virtual bool hasFreedesktopProperties();
+
+    inline static const char* getInterface() {
+        return LegacyInterface::getInterface();
+    }
 
 
 
@@ -55,7 +60,7 @@ public:
     
 
 static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        LegacyInterfaceStub,
+        ::v1::fake::legacy::service::LegacyInterfaceStub,
         CommonAPI::Version
         > getLegacyInterfaceInterfaceVersionStubDispatcher;
 
@@ -63,7 +68,7 @@ static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
 
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    LegacyInterfaceStub,
+    ::v1::fake::legacy::service::LegacyInterfaceStub,
     std::tuple<int32_t>,
     std::tuple<int32_t, int32_t>,
     std::tuple<CommonAPI::EmptyDeployment>,
@@ -72,7 +77,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     > testMethodStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    LegacyInterfaceStub,
+    ::v1::fake::legacy::service::LegacyInterfaceStub,
     std::tuple<>,
     std::tuple<std::string, int32_t>,
     std::tuple<>,
@@ -81,7 +86,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     > otherTestMethodStubDispatcher;
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
-    LegacyInterfaceStub,
+    ::v1::fake::legacy::service::LegacyInterfaceStub,
     std::tuple<>,
     std::tuple<>,
     std::tuple<>,
@@ -122,6 +127,6 @@ public:
 } // namespace service
 } // namespace legacy
 } // namespace fake
-} // namespace v1_0
+} // namespace v1
 
 #endif // FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_STUB_ADAPTER_HPP_
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.cpp
deleted file mode 100644
index 48758f3..0000000
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
-* Used org.franca.core 0.9.1.201412191134.
-*
-* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-* If a copy of the MPL was not distributed with this file, You can obtain one at
-* http://mozilla.org/MPL/2.0/.
-*/
-#include <v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.hpp>
-
-namespace v1_0 {
-namespace commonapi {
-namespace tests {
-
-std::shared_ptr<CommonAPI::DBus::DBusProxy> createExtendedInterfaceDBusProxy(
-	const CommonAPI::DBus::DBusAddress &_address,
-	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection) {
-	return std::make_shared<ExtendedInterfaceDBusProxy>(_address, _connection);
-}
-
-INITIALIZER(registerExtendedInterfaceDBusProxy) {
-	CommonAPI::DBus::Factory::get()->registerProxyCreateMethod(
-		ExtendedInterface::getInterface(),
-		&createExtendedInterfaceDBusProxy);
-}
-
-ExtendedInterfaceDBusProxy::ExtendedInterfaceDBusProxy(
-	const CommonAPI::DBus::DBusAddress &_address,
-	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection)
-	:	CommonAPI::DBus::DBusProxy(_address, _connection),
-		TestInterfaceDBusProxy(_address, _connection)
-{
-}
-
-
-
-        void ExtendedInterfaceDBusProxy::TestIntMethodExtended(const uint32_t &_inInt, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                >
-            >::callMethodWithReply(
-            *this,
-            "TestIntMethodExtended",
-            "u",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_inInt,
-            _internalCallStatus);
-        }
-        std::future<CommonAPI::CallStatus> ExtendedInterfaceDBusProxy::TestIntMethodExtendedAsync(const uint32_t &_inInt, TestIntMethodExtendedAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            return CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                >
-            >::callMethodAsync(
-            *this,
-            "TestIntMethodExtended",
-            "u",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_inInt,
-            [_callback] (CommonAPI::CallStatus _status) {
-            	_callback(_status);
-            },
-            std::make_tuple());
-        }
-
-
-        void ExtendedInterfaceDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
-            ownVersionMajor = 1;
-            ownVersionMinor = 0;
-        }
-
-        } // namespace tests
-        } // namespace commonapi
-        } // namespace v1_0
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp
deleted file mode 100644
index 82a772c..0000000
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
-* Used org.franca.core 0.9.1.201412191134.
-*
-* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-* If a copy of the MPL was not distributed with this file, You can obtain one at
-* http://mozilla.org/MPL/2.0/.
-*/
-#include <v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp>
-
-namespace v1_0 {
-namespace commonapi {
-namespace tests {
-
-std::shared_ptr<CommonAPI::DBus::DBusProxy> createTestFreedesktopInterfaceDBusProxy(
-	const CommonAPI::DBus::DBusAddress &_address,
-	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection) {
-	return std::make_shared<TestFreedesktopInterfaceDBusProxy>(_address, _connection);
-}
-
-INITIALIZER(registerTestFreedesktopInterfaceDBusProxy) {
-	CommonAPI::DBus::Factory::get()->registerProxyCreateMethod(
-		TestFreedesktopInterface::getInterface(),
-		&createTestFreedesktopInterfaceDBusProxy);
-}
-
-TestFreedesktopInterfaceDBusProxy::TestFreedesktopInterfaceDBusProxy(
-	const CommonAPI::DBus::DBusAddress &_address,
-	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection)
-	:	CommonAPI::DBus::DBusProxy(_address, _connection)
-,		testPredefinedTypeAttribute_(*this, "onTestPredefinedTypeAttributeAttributeChanged", "setTestPredefinedTypeAttributeAttribute", "u", "getTestPredefinedTypeAttributeAttribute", static_cast<CommonAPI::EmptyDeployment*>(nullptr)),
-		testReadonlyAttribute_(*this, "onTestReadonlyAttributeAttributeChanged", "u", "getTestReadonlyAttributeAttribute", static_cast<CommonAPI::EmptyDeployment*>(nullptr)),
-		testDerivedStructAttribute_(*this, "onTestDerivedStructAttributeAttributeChanged", "setTestDerivedStructAttributeAttribute", "(sqi)", "getTestDerivedStructAttributeAttribute", static_cast<::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t*>(nullptr)),
-		testDerivedArrayAttribute_(*this, "onTestDerivedArrayAttributeAttributeChanged", "setTestDerivedArrayAttributeAttribute", "at", "getTestDerivedArrayAttributeAttribute", static_cast<::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t*>(nullptr))
-{
-}
-
-        TestFreedesktopInterfaceDBusProxy::TestPredefinedTypeAttributeAttribute& TestFreedesktopInterfaceDBusProxy::getTestPredefinedTypeAttributeAttribute() {
-            return testPredefinedTypeAttribute_;
-        }
-        TestFreedesktopInterfaceDBusProxy::TestReadonlyAttributeAttribute& TestFreedesktopInterfaceDBusProxy::getTestReadonlyAttributeAttribute() {
-            return testReadonlyAttribute_;
-        }
-        TestFreedesktopInterfaceDBusProxy::TestDerivedStructAttributeAttribute& TestFreedesktopInterfaceDBusProxy::getTestDerivedStructAttributeAttribute() {
-            return testDerivedStructAttribute_;
-        }
-        TestFreedesktopInterfaceDBusProxy::TestDerivedArrayAttributeAttribute& TestFreedesktopInterfaceDBusProxy::getTestDerivedArrayAttributeAttribute() {
-            return testDerivedArrayAttribute_;
-        }
-
-
-
-
-        void TestFreedesktopInterfaceDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
-            ownVersionMajor = 1;
-            ownVersionMinor = 0;
-        }
-
-        } // namespace tests
-        } // namespace commonapi
-        } // namespace v1_0
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp
deleted file mode 100644
index 11b53d4..0000000
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
-* Used org.franca.core 0.9.1.201412191134.
-*
-* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-* If a copy of the MPL was not distributed with this file, You can obtain one at
-* http://mozilla.org/MPL/2.0/.
-*/
-#include <v1_0/commonapi/tests/TestFreedesktopInterface.hpp>
-#include <v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp>
-
-namespace v1_0 {
-namespace commonapi {
-namespace tests {
-
-std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> createTestFreedesktopInterfaceDBusStubAdapter(
-                   const CommonAPI::DBus::DBusAddress &_address,
-                   const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection,
-                   const std::shared_ptr<CommonAPI::StubBase> &_stub) {
-    return std::make_shared<TestFreedesktopInterfaceDBusStubAdapter>(_address, _connection, _stub);
-}
-
-INITIALIZER(registerTestFreedesktopInterfaceDBusStubAdapter) {
-    CommonAPI::DBus::Factory::get()->registerStubAdapterCreateMethod(
-    	TestFreedesktopInterface::getInterface(), &createTestFreedesktopInterfaceDBusStubAdapter);
-}
-
-TestFreedesktopInterfaceDBusStubAdapterInternal::~TestFreedesktopInterfaceDBusStubAdapterInternal() {
-    deactivateManagedInstances();
-    TestFreedesktopInterfaceDBusStubAdapterHelper::deinit();
-}
-
-void TestFreedesktopInterfaceDBusStubAdapterInternal::deactivateManagedInstances() {
-
-}
-
-const char* TestFreedesktopInterfaceDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const {
-    static const std::string introspectionData =
-        "<method name=\"getInterfaceVersion\">\n"
-            "<arg name=\"value\" type=\"uu\" direction=\"out\" />"
-        "</method>\n"
-        "<method name=\"getTestPredefinedTypeAttributeAttribute\">\n"
-            "<arg name=\"value\" type=\"u\" direction=\"out\" />"
-        "</method>\n"
-        "<method name=\"setTestPredefinedTypeAttributeAttribute\">\n"
-            "<arg name=\"requestedValue\" type=\"u\" direction=\"in\" />\n"
-            "<arg name=\"setValue\" type=\"u\" direction=\"out\" />\n"
-        "</method>\n"
-        "<signal name=\"onTestPredefinedTypeAttributeAttributeChanged\">\n"
-            "<arg name=\"changedValue\" type=\"u\" />\n"
-        "</signal>\n"
-        "<method name=\"getTestReadonlyAttributeAttribute\">\n"
-            "<arg name=\"value\" type=\"u\" direction=\"out\" />"
-        "</method>\n"
-        "<signal name=\"onTestReadonlyAttributeAttributeChanged\">\n"
-            "<arg name=\"changedValue\" type=\"u\" />\n"
-        "</signal>\n"
-        "<method name=\"getTestDerivedStructAttributeAttribute\">\n"
-            "<arg name=\"value\" type=\"(sqi)\" direction=\"out\" />"
-        "</method>\n"
-        "<method name=\"setTestDerivedStructAttributeAttribute\">\n"
-            "<arg name=\"requestedValue\" type=\"(sqi)\" direction=\"in\" />\n"
-            "<arg name=\"setValue\" type=\"(sqi)\" direction=\"out\" />\n"
-        "</method>\n"
-        "<signal name=\"onTestDerivedStructAttributeAttributeChanged\">\n"
-            "<arg name=\"changedValue\" type=\"(sqi)\" />\n"
-        "</signal>\n"
-        "<method name=\"getTestDerivedArrayAttributeAttribute\">\n"
-            "<arg name=\"value\" type=\"at\" direction=\"out\" />"
-        "</method>\n"
-        "<method name=\"setTestDerivedArrayAttributeAttribute\">\n"
-            "<arg name=\"requestedValue\" type=\"at\" direction=\"in\" />\n"
-            "<arg name=\"setValue\" type=\"at\" direction=\"out\" />\n"
-        "</method>\n"
-        "<signal name=\"onTestDerivedArrayAttributeAttributeChanged\">\n"
-            "<arg name=\"changedValue\" type=\"at\" />\n"
-        "</signal>\n"
-
-    ;
-    return introspectionData.c_str();
-}
-
-CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopInterfaceStub,
-        CommonAPI::Version
-        > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestFreedesktopInterfaceInterfaceVersionStubDispatcher(&TestFreedesktopInterfaceStub::getInterfaceVersion, "uu");
-
-CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopInterfaceStub,
-        uint32_t
-        > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher(
-            &TestFreedesktopInterfaceStub::getTestPredefinedTypeAttributeAttribute
-            , "u"
-            );
-CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        TestFreedesktopInterfaceStub,
-        uint32_t
-        > TestFreedesktopInterfaceDBusStubAdapterInternal::setTestPredefinedTypeAttributeAttributeStubDispatcher(
-                &TestFreedesktopInterfaceStub::getTestPredefinedTypeAttributeAttribute,
-                &TestFreedesktopInterfaceStubRemoteEvent::onRemoteSetTestPredefinedTypeAttributeAttribute,
-                &TestFreedesktopInterfaceStubRemoteEvent::onRemoteTestPredefinedTypeAttributeAttributeChanged
-                ,&TestFreedesktopInterfaceStubAdapter::fireTestPredefinedTypeAttributeAttributeChanged
-                ,"u"
-                );
-CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopInterfaceStub,
-        uint32_t
-        > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestReadonlyAttributeAttributeStubDispatcher(
-            &TestFreedesktopInterfaceStub::getTestReadonlyAttributeAttribute
-            , "u"
-            );
-CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopInterfaceStub,
-        ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
-        ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t
-        > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher(
-            &TestFreedesktopInterfaceStub::getTestDerivedStructAttributeAttribute
-            , "(sqi)"
-            );
-CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        TestFreedesktopInterfaceStub,
-        ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
-        ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t
-        > TestFreedesktopInterfaceDBusStubAdapterInternal::setTestDerivedStructAttributeAttributeStubDispatcher(
-                &TestFreedesktopInterfaceStub::getTestDerivedStructAttributeAttribute,
-                &TestFreedesktopInterfaceStubRemoteEvent::onRemoteSetTestDerivedStructAttributeAttribute,
-                &TestFreedesktopInterfaceStubRemoteEvent::onRemoteTestDerivedStructAttributeAttributeChanged
-                ,&TestFreedesktopInterfaceStubAdapter::fireTestDerivedStructAttributeAttributeChanged
-                ,"(sqi)"
-                );
-CommonAPI::DBus::DBusGetAttributeStubDispatcher<
-        TestFreedesktopInterfaceStub,
-        ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
-        ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t
-        > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher(
-            &TestFreedesktopInterfaceStub::getTestDerivedArrayAttributeAttribute
-            , "at"
-            );
-CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
-        TestFreedesktopInterfaceStub,
-        ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
-        ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t
-        > TestFreedesktopInterfaceDBusStubAdapterInternal::setTestDerivedArrayAttributeAttributeStubDispatcher(
-                &TestFreedesktopInterfaceStub::getTestDerivedArrayAttributeAttribute,
-                &TestFreedesktopInterfaceStubRemoteEvent::onRemoteSetTestDerivedArrayAttributeAttribute,
-                &TestFreedesktopInterfaceStubRemoteEvent::onRemoteTestDerivedArrayAttributeAttributeChanged
-                ,&TestFreedesktopInterfaceStubAdapter::fireTestDerivedArrayAttributeAttributeChanged
-                ,"at"
-                );
-
-
-
-
-void TestFreedesktopInterfaceDBusStubAdapterInternal::fireTestPredefinedTypeAttributeAttributeChanged(const uint32_t& value) {
-    CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<
-    uint32_t
-    >>
-        ::sendSignal(
-            *this,
-            "onTestPredefinedTypeAttributeAttributeChanged",
-            "u",
-            value
-    
-    );
-}
-void TestFreedesktopInterfaceDBusStubAdapterInternal::fireTestReadonlyAttributeAttributeChanged(const uint32_t& value) {
-    CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<
-    uint32_t
-    >>
-        ::sendSignal(
-            *this,
-            "onTestReadonlyAttributeAttributeChanged",
-            "u",
-            value
-    
-    );
-}
-void TestFreedesktopInterfaceDBusStubAdapterInternal::fireTestDerivedStructAttributeAttributeChanged(const ::commonapi::tests::DerivedTypeCollection::TestStructExtended& value) {
-    CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestStructExtended, ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t> deployedValue(value, static_cast<::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t*>(nullptr));
-    CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<
-    CommonAPI::Deployable<
-        ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
-        ::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t
-    >
-    >>
-        ::sendSignal(
-            *this,
-            "onTestDerivedStructAttributeAttributeChanged",
-            "(sqi)",
-            deployedValue
-    
-    );
-}
-void TestFreedesktopInterfaceDBusStubAdapterInternal::fireTestDerivedArrayAttributeAttributeChanged(const ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64& value) {
-    CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestArrayUInt64, ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t> deployedValue(value, static_cast<::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t*>(nullptr));
-    CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<
-    CommonAPI::Deployable<
-        ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64,
-        ::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t
-    >
-    >>
-        ::sendSignal(
-            *this,
-            "onTestDerivedArrayAttributeAttributeChanged",
-            "at",
-            deployedValue
-    
-    );
-}
-
-
-
-const TestFreedesktopInterfaceDBusStubAdapterHelper::StubDispatcherTable& TestFreedesktopInterfaceDBusStubAdapterInternal::getStubDispatcherTable() {
-    return stubDispatcherTable_;
-}
-
-const CommonAPI::DBus::StubAttributeTable& TestFreedesktopInterfaceDBusStubAdapterInternal::getStubAttributeTable() {
-    return stubAttributeTable_;
-}
-
-TestFreedesktopInterfaceDBusStubAdapterInternal::TestFreedesktopInterfaceDBusStubAdapterInternal(
-        const CommonAPI::DBus::DBusAddress &_address,
-        const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection,
-        const std::shared_ptr<CommonAPI::StubBase> &_stub)
-	: CommonAPI::DBus::DBusStubAdapter(_address, _connection,false),
-      TestFreedesktopInterfaceDBusStubAdapterHelper(_address, _connection, std::dynamic_pointer_cast<TestFreedesktopInterfaceStub>(_stub), false),
-      stubDispatcherTable_({
-            { { "getTestPredefinedTypeAttributeAttribute", "" }, &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher }
-            , { { "setTestPredefinedTypeAttributeAttribute", "u" }, &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::setTestPredefinedTypeAttributeAttributeStubDispatcher },
-            { { "getTestReadonlyAttributeAttribute", "" }, &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::getTestReadonlyAttributeAttributeStubDispatcher },
-            { { "getTestDerivedStructAttributeAttribute", "" }, &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher }
-            , { { "setTestDerivedStructAttributeAttribute", "(sqi)" }, &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::setTestDerivedStructAttributeAttributeStubDispatcher },
-            { { "getTestDerivedArrayAttributeAttribute", "" }, &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher }
-            , { { "setTestDerivedArrayAttributeAttribute", "at" }, &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::setTestDerivedArrayAttributeAttributeStubDispatcher }
-            }),
-        stubAttributeTable_() {
-
-    stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::getTestFreedesktopInterfaceInterfaceVersionStubDispatcher });
-}
-
-const bool TestFreedesktopInterfaceDBusStubAdapterInternal::hasFreedesktopProperties() {
-    return false;
-}
-
-} // namespace tests
-} // namespace commonapi
-} // namespace v1_0
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusProxy.cpp
deleted file mode 100644
index 94240f6..0000000
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusProxy.cpp
+++ /dev/null
@@ -1,417 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
-* Used org.franca.core 0.9.1.201412191134.
-*
-* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-* If a copy of the MPL was not distributed with this file, You can obtain one at
-* http://mozilla.org/MPL/2.0/.
-*/
-#include <v1_0/commonapi/tests/TestInterfaceDBusProxy.hpp>
-
-namespace v1_0 {
-namespace commonapi {
-namespace tests {
-
-std::shared_ptr<CommonAPI::DBus::DBusProxy> createTestInterfaceDBusProxy(
-	const CommonAPI::DBus::DBusAddress &_address,
-	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection) {
-	return std::make_shared<TestInterfaceDBusProxy>(_address, _connection);
-}
-
-INITIALIZER(registerTestInterfaceDBusProxy) {
-	CommonAPI::DBus::Factory::get()->registerProxyCreateMethod(
-		TestInterface::getInterface(),
-		&createTestInterfaceDBusProxy);
-}
-
-TestInterfaceDBusProxy::TestInterfaceDBusProxy(
-	const CommonAPI::DBus::DBusAddress &_address,
-	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection)
-	:	CommonAPI::DBus::DBusProxy(_address, _connection)
-,		testPredefinedTypeAttribute_(*this, "onTestPredefinedTypeAttributeAttributeChanged", "setTestPredefinedTypeAttributeAttribute", "u", "getTestPredefinedTypeAttributeAttribute", static_cast<CommonAPI::EmptyDeployment*>(nullptr)),
-		testDerivedStructAttribute_(*this, "onTestDerivedStructAttributeAttributeChanged", "setTestDerivedStructAttributeAttribute", "(sqi)", "getTestDerivedStructAttributeAttribute", static_cast<::commonapi::tests::DerivedTypeCollection_::TestStructExtendedDeployment_t*>(nullptr)),
-		testDerivedArrayAttribute_(*this, "onTestDerivedArrayAttributeAttributeChanged", "setTestDerivedArrayAttributeAttribute", "at", "getTestDerivedArrayAttributeAttribute", static_cast<::commonapi::tests::DerivedTypeCollection_::TestArrayUInt64Deployment_t*>(nullptr))
-,		testPredefinedTypeBroadcast_(*this, "TestPredefinedTypeBroadcast", "us", std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<CommonAPI::DBus::StringDeployment*>(nullptr))),
-		testSelectiveBroadcastSelective_(*this, "TestSelectiveBroadcast", "", std::make_tuple()),
-		testBroadcastWithOutArgsSelective_(*this, "TestBroadcastWithOutArgs", "us", std::make_tuple(static_cast<CommonAPI::EmptyDeployment*>(nullptr), static_cast<CommonAPI::DBus::StringDeployment*>(nullptr)))
-{
-}
-
-        TestInterfaceDBusProxy::TestPredefinedTypeAttributeAttribute& TestInterfaceDBusProxy::getTestPredefinedTypeAttributeAttribute() {
-            return testPredefinedTypeAttribute_;
-        }
-        TestInterfaceDBusProxy::TestDerivedStructAttributeAttribute& TestInterfaceDBusProxy::getTestDerivedStructAttributeAttribute() {
-            return testDerivedStructAttribute_;
-        }
-        TestInterfaceDBusProxy::TestDerivedArrayAttributeAttribute& TestInterfaceDBusProxy::getTestDerivedArrayAttributeAttribute() {
-            return testDerivedArrayAttribute_;
-        }
-
-        TestInterfaceDBusProxy::TestPredefinedTypeBroadcastEvent& TestInterfaceDBusProxy::getTestPredefinedTypeBroadcastEvent() {
-            return testPredefinedTypeBroadcast_;
-        }
-        TestInterfaceDBusProxy::TestSelectiveBroadcastSelectiveEvent& TestInterfaceDBusProxy::getTestSelectiveBroadcastSelectiveEvent() {
-            return testSelectiveBroadcastSelective_;
-        }
-        TestInterfaceDBusProxy::TestBroadcastWithOutArgsSelectiveEvent& TestInterfaceDBusProxy::getTestBroadcastWithOutArgsSelectiveEvent() {
-            return testBroadcastWithOutArgsSelective_;
-        }
-
-        void TestInterfaceDBusProxy::testEmptyMethod(CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) {
-            CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                >
-            >::callMethodWithReply(
-            *this,
-            "testEmptyMethod",
-            "",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            _internalCallStatus);
-        }
-        std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::testEmptyMethodAsync(TestEmptyMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
-            return CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                >
-            >::callMethodAsync(
-            *this,
-            "testEmptyMethod",
-            "",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            [_callback] (CommonAPI::CallStatus _status) {
-            	_callback(_status);
-            },
-            std::make_tuple());
-        }
-        void TestInterfaceDBusProxy::testVoidPredefinedTypeMethod(const uint32_t &_uint32Value, const std::string &_stringValue, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_uint32Value(_uint32Value, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_stringValue(_stringValue, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
-            CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment >,
-                CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                >
-            >::callMethodWithReply(
-            *this,
-            "testVoidPredefinedTypeMethod",
-            "us",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_uint32Value, deploy_stringValue,
-            _internalCallStatus);
-        }
-        std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::testVoidPredefinedTypeMethodAsync(const uint32_t &_uint32Value, const std::string &_stringValue, TestVoidPredefinedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_uint32Value(_uint32Value, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_stringValue(_stringValue, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
-            return CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment >,
-                CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                >
-            >::callMethodAsync(
-            *this,
-            "testVoidPredefinedTypeMethod",
-            "us",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_uint32Value, deploy_stringValue,
-            [_callback] (CommonAPI::CallStatus _status) {
-            	_callback(_status);
-            },
-            std::make_tuple());
-        }
-        void TestInterfaceDBusProxy::testPredefinedTypeMethod(const uint32_t &_uint32InValue, const std::string &_stringInValue, CommonAPI::CallStatus &_internalCallStatus, uint32_t &_uint32OutValue, std::string &_stringOutValue, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_uint32InValue(_uint32InValue, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_stringInValue(_stringInValue, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
-            CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_uint32OutValue(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_stringOutValue(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
-            CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment >,
-                CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                    CommonAPI::Deployable<uint32_t,CommonAPI::EmptyDeployment>,
-                    CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>
-                >
-            >::callMethodWithReply(
-            *this,
-            "testPredefinedTypeMethod",
-            "us",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_uint32InValue, deploy_stringInValue,
-            _internalCallStatus,
-            deploy_uint32OutValue, deploy_stringOutValue);
-            _uint32OutValue = deploy_uint32OutValue.getValue();
-            _stringOutValue = deploy_stringOutValue.getValue();
-        }
-        std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::testPredefinedTypeMethodAsync(const uint32_t &_uint32InValue, const std::string &_stringInValue, TestPredefinedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_uint32InValue(_uint32InValue, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_stringInValue(_stringInValue, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
-            CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> deploy_uint32OutValue(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_stringOutValue(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
-            return CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment >,
-                CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                    CommonAPI::Deployable<uint32_t,CommonAPI::EmptyDeployment>,
-                    CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>
-                >
-            >::callMethodAsync(
-            *this,
-            "testPredefinedTypeMethod",
-            "us",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_uint32InValue, deploy_stringInValue,
-            [_callback] (CommonAPI::CallStatus _status, CommonAPI::Deployable<uint32_t, CommonAPI::EmptyDeployment> _uint32OutValue, CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> _stringOutValue) {
-            	_callback(_status, _uint32OutValue.getValue(), _stringOutValue.getValue());
-            },
-            std::make_tuple(deploy_uint32OutValue, deploy_stringOutValue));
-        }
-        void TestInterfaceDBusProxy::testVoidDerivedTypeMethod(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2Value, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapValue, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment> deploy_testEnumExtended2Value(_testEnumExtended2Value, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> deploy_testMapValue(_testMapValue, static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr));
-            CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment >,
-                CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                >
-            >::callMethodWithReply(
-            *this,
-            "testVoidDerivedTypeMethod",
-            "ia{ua(sq)}",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_testEnumExtended2Value, deploy_testMapValue,
-            _internalCallStatus);
-        }
-        std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::testVoidDerivedTypeMethodAsync(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2Value, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapValue, TestVoidDerivedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment> deploy_testEnumExtended2Value(_testEnumExtended2Value, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> deploy_testMapValue(_testMapValue, static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr));
-            return CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment >,
-                CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                >
-            >::callMethodAsync(
-            *this,
-            "testVoidDerivedTypeMethod",
-            "ia{ua(sq)}",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_testEnumExtended2Value, deploy_testMapValue,
-            [_callback] (CommonAPI::CallStatus _status) {
-            	_callback(_status);
-            },
-            std::make_tuple());
-        }
-        void TestInterfaceDBusProxy::testDerivedTypeMethod(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2InValue, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapInValue, CommonAPI::CallStatus &_internalCallStatus, ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2OutValue, ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapOutValue, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment> deploy_testEnumExtended2InValue(_testEnumExtended2InValue, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> deploy_testMapInValue(_testMapInValue, static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr));
-            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment> deploy_testEnumExtended2OutValue(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> deploy_testMapOutValue(static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr));
-            CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment >,
-                CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                    CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2,CommonAPI::EmptyDeployment>,
-                    CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap,::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t>
-                >
-            >::callMethodWithReply(
-            *this,
-            "testDerivedTypeMethod",
-            "ia{ua(sq)}",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_testEnumExtended2InValue, deploy_testMapInValue,
-            _internalCallStatus,
-            deploy_testEnumExtended2OutValue, deploy_testMapOutValue);
-            _testEnumExtended2OutValue = deploy_testEnumExtended2OutValue.getValue();
-            _testMapOutValue = deploy_testMapOutValue.getValue();
-        }
-        std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::testDerivedTypeMethodAsync(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 &_testEnumExtended2InValue, const ::commonapi::tests::DerivedTypeCollection::TestMap &_testMapInValue, TestDerivedTypeMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment> deploy_testEnumExtended2InValue(_testEnumExtended2InValue, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> deploy_testMapInValue(_testMapInValue, static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr));
-            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment> deploy_testEnumExtended2OutValue(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> deploy_testMapOutValue(static_cast<::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t*>(nullptr));
-            return CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment >,
-                CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                    CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2,CommonAPI::EmptyDeployment>,
-                    CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap,::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t>
-                >
-            >::callMethodAsync(
-            *this,
-            "testDerivedTypeMethod",
-            "ia{ua(sq)}",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_testEnumExtended2InValue, deploy_testMapInValue,
-            [_callback] (CommonAPI::CallStatus _status, CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2, CommonAPI::EmptyDeployment> _testEnumExtended2OutValue, CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::TestMap, ::commonapi::tests::DerivedTypeCollection_::TestMapDeployment_t> _testMapOutValue) {
-            	_callback(_status, _testEnumExtended2OutValue.getValue(), _testMapOutValue.getValue());
-            },
-            std::make_tuple(deploy_testEnumExtended2OutValue, deploy_testMapOutValue));
-        }
-        void TestInterfaceDBusProxy::TestArrayOfPolymorphicStructMethod(const std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>> &_inArray, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>, CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t>> deploy_inArray(_inArray, static_cast<CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t>*>(nullptr));
-            CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>, CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t> >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                >
-            >::callMethodWithReply(
-            *this,
-            "TestArrayOfPolymorphicStructMethod",
-            "a(uv)",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_inArray,
-            _internalCallStatus);
-        }
-        std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::TestArrayOfPolymorphicStructMethodAsync(const std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>> &_inArray, TestArrayOfPolymorphicStructMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>, CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t>> deploy_inArray(_inArray, static_cast<CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t>*>(nullptr));
-            return CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<std::vector<std::shared_ptr<::commonapi::tests::DerivedTypeCollection::TestPolymorphicStruct>>, CommonAPI::DBus::ArrayDeployment<::commonapi::tests::DerivedTypeCollection_::TestPolymorphicStructDeployment_t> >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                >
-            >::callMethodAsync(
-            *this,
-            "TestArrayOfPolymorphicStructMethod",
-            "a(uv)",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_inArray,
-            [_callback] (CommonAPI::CallStatus _status) {
-            	_callback(_status);
-            },
-            std::make_tuple());
-        }
-        void TestInterfaceDBusProxy::TestMapOfPolymorphicStructMethod(const ::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic &_inMap, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic, ::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t> deploy_inMap(_inMap, static_cast<::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t*>(nullptr));
-            CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic, ::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                >
-            >::callMethodWithReply(
-            *this,
-            "TestMapOfPolymorphicStructMethod",
-            "a{y(uv)}",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_inMap,
-            _internalCallStatus);
-        }
-        std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::TestMapOfPolymorphicStructMethodAsync(const ::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic &_inMap, TestMapOfPolymorphicStructMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic, ::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t> deploy_inMap(_inMap, static_cast<::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t*>(nullptr));
-            return CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::MapIntToPolymorphic, ::commonapi::tests::DerivedTypeCollection_::MapIntToPolymorphicDeployment_t >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                >
-            >::callMethodAsync(
-            *this,
-            "TestMapOfPolymorphicStructMethod",
-            "a{y(uv)}",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_inMap,
-            [_callback] (CommonAPI::CallStatus _status) {
-            	_callback(_status);
-            },
-            std::make_tuple());
-        }
-        void TestInterfaceDBusProxy::TestStructWithPolymorphicMemberMethod(const ::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember &_inStruct, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember, ::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t> deploy_inStruct(_inStruct, static_cast<::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t*>(nullptr));
-            CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember, ::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                >
-            >::callMethodWithReply(
-            *this,
-            "TestStructWithPolymorphicMemberMethod",
-            "(u(uv))",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_inStruct,
-            _internalCallStatus);
-        }
-        std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::TestStructWithPolymorphicMemberMethodAsync(const ::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember &_inStruct, TestStructWithPolymorphicMemberMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember, ::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t> deploy_inStruct(_inStruct, static_cast<::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t*>(nullptr));
-            return CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithPolymorphicMember, ::commonapi::tests::DerivedTypeCollection_::StructWithPolymorphicMemberDeployment_t >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                >
-            >::callMethodAsync(
-            *this,
-            "TestStructWithPolymorphicMemberMethod",
-            "(u(uv))",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_inStruct,
-            [_callback] (CommonAPI::CallStatus _status) {
-            	_callback(_status);
-            },
-            std::make_tuple());
-        }
-        void TestInterfaceDBusProxy::TestStructWithEnumKeyMapMember(const ::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap &_inStruct, CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap, ::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t> deploy_inStruct(_inStruct, static_cast<::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t*>(nullptr));
-            CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap, ::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                >
-            >::callMethodWithReply(
-            *this,
-            "TestStructWithEnumKeyMapMember",
-            "(a{is})",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_inStruct,
-            _internalCallStatus);
-        }
-        std::future<CommonAPI::CallStatus> TestInterfaceDBusProxy::TestStructWithEnumKeyMapMemberAsync(const ::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap &_inStruct, TestStructWithEnumKeyMapMemberAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap, ::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t> deploy_inStruct(_inStruct, static_cast<::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t*>(nullptr));
-            return CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<::commonapi::tests::DerivedTypeCollection::StructWithEnumKeyMap, ::commonapi::tests::DerivedTypeCollection_::StructWithEnumKeyMapDeployment_t >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                >
-            >::callMethodAsync(
-            *this,
-            "TestStructWithEnumKeyMapMember",
-            "(a{is})",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_inStruct,
-            [_callback] (CommonAPI::CallStatus _status) {
-            	_callback(_status);
-            },
-            std::make_tuple());
-        }
-
-
-        void TestInterfaceDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
-            ownVersionMajor = 1;
-            ownVersionMinor = 0;
-        }
-
-        } // namespace tests
-        } // namespace commonapi
-        } // namespace v1_0
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp
deleted file mode 100644
index 0c7c6ce..0000000
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
-* Used org.franca.core 0.9.1.201412191134.
-*
-* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-* If a copy of the MPL was not distributed with this file, You can obtain one at
-* http://mozilla.org/MPL/2.0/.
-*/
-#include <v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp>
-
-namespace v1_0 {
-namespace commonapi {
-namespace tests {
-namespace managed {
-
-std::shared_ptr<CommonAPI::DBus::DBusProxy> createBranchInterfaceDBusProxy(
-	const CommonAPI::DBus::DBusAddress &_address,
-	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection) {
-	return std::make_shared<BranchInterfaceDBusProxy>(_address, _connection);
-}
-
-INITIALIZER(registerBranchInterfaceDBusProxy) {
-	CommonAPI::DBus::Factory::get()->registerProxyCreateMethod(
-		BranchInterface::getInterface(),
-		&createBranchInterfaceDBusProxy);
-}
-
-BranchInterfaceDBusProxy::BranchInterfaceDBusProxy(
-	const CommonAPI::DBus::DBusAddress &_address,
-	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection)
-	:	CommonAPI::DBus::DBusProxy(_address, _connection)
-{
-}
-
-
-
-        void BranchInterfaceDBusProxy::testBranchMethod(const int32_t &_inInt, const std::string &_inString, CommonAPI::CallStatus &_internalCallStatus, BranchInterface::testBranchMethodError &_error, int32_t &_outInt, std::string &_outString, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<BranchInterface::testBranchMethodError, CommonAPI::EmptyDeployment> deploy_error(static_cast<CommonAPI::EmptyDeployment *>(nullptr));
-            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_inString(_inString, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
-            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_outInt(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_outString(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
-            CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >,
-                CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<BranchInterface::testBranchMethodError, CommonAPI::EmptyDeployment>,
-                    CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>,
-                    CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>
-                >
-            >::callMethodWithReply(
-            *this,
-            "testBranchMethod",
-            "is",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_inInt, deploy_inString,
-            _internalCallStatus,
-            deploy_error,
-            deploy_outInt, deploy_outString);
-            _error = deploy_error.getValue();
-            _outInt = deploy_outInt.getValue();
-            _outString = deploy_outString.getValue();
-        }
-        std::future<CommonAPI::CallStatus> BranchInterfaceDBusProxy::testBranchMethodAsync(const int32_t &_inInt, const std::string &_inString, TestBranchMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<BranchInterface::testBranchMethodError, CommonAPI::EmptyDeployment> deploy_error(static_cast<CommonAPI::EmptyDeployment *>(nullptr));
-            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_inString(_inString, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
-            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_outInt(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_outString(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
-            return CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >,
-                CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<BranchInterface::testBranchMethodError, CommonAPI::EmptyDeployment>,
-                    CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>,
-                    CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>
-                >
-            >::callMethodAsync(
-            *this,
-            "testBranchMethod",
-            "is",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_inInt, deploy_inString,
-            [_callback] (CommonAPI::CallStatus _status, CommonAPI::Deployable<BranchInterface::testBranchMethodError, CommonAPI::EmptyDeployment> _deploy_error, CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> _outInt, CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> _outString) {
-            	_callback(_status, _deploy_error.getValue(), _outInt.getValue(), _outString.getValue());
-            },
-            std::make_tuple(deploy_error, deploy_outInt, deploy_outString));
-        }
-
-
-        void BranchInterfaceDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
-            ownVersionMajor = 1;
-            ownVersionMinor = 0;
-        }
-
-        } // namespace managed
-        } // namespace tests
-        } // namespace commonapi
-        } // namespace v1_0
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp
deleted file mode 100644
index 6a26285..0000000
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
-* Used org.franca.core 0.9.1.201412191134.
-*
-* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-* If a copy of the MPL was not distributed with this file, You can obtain one at
-* http://mozilla.org/MPL/2.0/.
-*/
-#include <v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp>
-
-namespace v1_0 {
-namespace commonapi {
-namespace tests {
-namespace managed {
-
-std::shared_ptr<CommonAPI::DBus::DBusProxy> createLeafInterfaceDBusProxy(
-	const CommonAPI::DBus::DBusAddress &_address,
-	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection) {
-	return std::make_shared<LeafInterfaceDBusProxy>(_address, _connection);
-}
-
-INITIALIZER(registerLeafInterfaceDBusProxy) {
-	CommonAPI::DBus::Factory::get()->registerProxyCreateMethod(
-		LeafInterface::getInterface(),
-		&createLeafInterfaceDBusProxy);
-}
-
-LeafInterfaceDBusProxy::LeafInterfaceDBusProxy(
-	const CommonAPI::DBus::DBusAddress &_address,
-	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection)
-	:	CommonAPI::DBus::DBusProxy(_address, _connection)
-{
-}
-
-
-
-        void LeafInterfaceDBusProxy::testLeafMethod(const int32_t &_inInt, const std::string &_inString, CommonAPI::CallStatus &_internalCallStatus, LeafInterface::testLeafMethodError &_error, int32_t &_outInt, std::string &_outString, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<LeafInterface::testLeafMethodError, CommonAPI::EmptyDeployment> deploy_error(static_cast<CommonAPI::EmptyDeployment *>(nullptr));
-            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_inString(_inString, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
-            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_outInt(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_outString(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
-            CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >,
-                CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<LeafInterface::testLeafMethodError, CommonAPI::EmptyDeployment>,
-                    CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>,
-                    CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>
-                >
-            >::callMethodWithReply(
-            *this,
-            "testLeafMethod",
-            "is",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_inInt, deploy_inString,
-            _internalCallStatus,
-            deploy_error,
-            deploy_outInt, deploy_outString);
-            _error = deploy_error.getValue();
-            _outInt = deploy_outInt.getValue();
-            _outString = deploy_outString.getValue();
-        }
-        std::future<CommonAPI::CallStatus> LeafInterfaceDBusProxy::testLeafMethodAsync(const int32_t &_inInt, const std::string &_inString, TestLeafMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<LeafInterface::testLeafMethodError, CommonAPI::EmptyDeployment> deploy_error(static_cast<CommonAPI::EmptyDeployment *>(nullptr));
-            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_inString(_inString, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
-            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_outInt(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_outString(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
-            return CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >,
-                CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<LeafInterface::testLeafMethodError, CommonAPI::EmptyDeployment>,
-                    CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>,
-                    CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>
-                >
-            >::callMethodAsync(
-            *this,
-            "testLeafMethod",
-            "is",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_inInt, deploy_inString,
-            [_callback] (CommonAPI::CallStatus _status, CommonAPI::Deployable<LeafInterface::testLeafMethodError, CommonAPI::EmptyDeployment> _deploy_error, CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> _outInt, CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> _outString) {
-            	_callback(_status, _deploy_error.getValue(), _outInt.getValue(), _outString.getValue());
-            },
-            std::make_tuple(deploy_error, deploy_outInt, deploy_outString));
-        }
-
-
-        void LeafInterfaceDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
-            ownVersionMajor = 1;
-            ownVersionMinor = 0;
-        }
-
-        } // namespace managed
-        } // namespace tests
-        } // namespace commonapi
-        } // namespace v1_0
diff --git a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.cpp
deleted file mode 100644
index 4ad729e..0000000
--- a/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
-* Used org.franca.core 0.9.1.201412191134.
-*
-* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-* If a copy of the MPL was not distributed with this file, You can obtain one at
-* http://mozilla.org/MPL/2.0/.
-*/
-#include <v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.hpp>
-
-namespace v1_0 {
-namespace commonapi {
-namespace tests {
-namespace managed {
-
-std::shared_ptr<CommonAPI::DBus::DBusProxy> createRootInterfaceDBusProxy(
-	const CommonAPI::DBus::DBusAddress &_address,
-	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection) {
-	return std::make_shared<RootInterfaceDBusProxy>(_address, _connection);
-}
-
-INITIALIZER(registerRootInterfaceDBusProxy) {
-	CommonAPI::DBus::Factory::get()->registerProxyCreateMethod(
-		RootInterface::getInterface(),
-		&createRootInterfaceDBusProxy);
-}
-
-RootInterfaceDBusProxy::RootInterfaceDBusProxy(
-	const CommonAPI::DBus::DBusAddress &_address,
-	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection)
-	:	CommonAPI::DBus::DBusProxy(_address, _connection)
-,		proxyManagerLeafInterface_(*this, "commonapi.tests.managed.LeafInterface"),
-		proxyManagerBranchInterface_(*this, "commonapi.tests.managed.BranchInterface")
-{
-}
-
-
-
-        void RootInterfaceDBusProxy::testRootMethod(const int32_t &_inInt, const std::string &_inString, CommonAPI::CallStatus &_internalCallStatus, RootInterface::testRootMethodError &_error, int32_t &_outInt, std::string &_outString, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<RootInterface::testRootMethodError, CommonAPI::EmptyDeployment> deploy_error(static_cast<CommonAPI::EmptyDeployment *>(nullptr));
-            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_inString(_inString, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
-            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_outInt(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_outString(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
-            CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >,
-                CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<RootInterface::testRootMethodError, CommonAPI::EmptyDeployment>,
-                    CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>,
-                    CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>
-                >
-            >::callMethodWithReply(
-            *this,
-            "testRootMethod",
-            "is",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_inInt, deploy_inString,
-            _internalCallStatus,
-            deploy_error,
-            deploy_outInt, deploy_outString);
-            _error = deploy_error.getValue();
-            _outInt = deploy_outInt.getValue();
-            _outString = deploy_outString.getValue();
-        }
-        std::future<CommonAPI::CallStatus> RootInterfaceDBusProxy::testRootMethodAsync(const int32_t &_inInt, const std::string &_inString, TestRootMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<RootInterface::testRootMethodError, CommonAPI::EmptyDeployment> deploy_error(static_cast<CommonAPI::EmptyDeployment *>(nullptr));
-            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_inInt(_inInt, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_inString(_inString, static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
-            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_outInt(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_outString(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
-            return CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >,
-                CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<RootInterface::testRootMethodError, CommonAPI::EmptyDeployment>,
-                    CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>,
-                    CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>
-                >
-            >::callMethodAsync(
-            *this,
-            "testRootMethod",
-            "is",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_inInt, deploy_inString,
-            [_callback] (CommonAPI::CallStatus _status, CommonAPI::Deployable<RootInterface::testRootMethodError, CommonAPI::EmptyDeployment> _deploy_error, CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> _outInt, CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> _outString) {
-            	_callback(_status, _deploy_error.getValue(), _outInt.getValue(), _outString.getValue());
-            },
-            std::make_tuple(deploy_error, deploy_outInt, deploy_outString));
-        }
-
-        CommonAPI::ProxyManager& RootInterfaceDBusProxy::getProxyManagerLeafInterface() {
-            return proxyManagerLeafInterface_;
-        }
-        CommonAPI::ProxyManager& RootInterfaceDBusProxy::getProxyManagerBranchInterface() {
-            return proxyManagerBranchInterface_;
-        }
-
-        void RootInterfaceDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
-            ownVersionMajor = 1;
-            ownVersionMinor = 0;
-        }
-
-        } // namespace managed
-        } // namespace tests
-        } // namespace commonapi
-        } // namespace v1_0
diff --git a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.cpp
deleted file mode 100644
index 0a14ba3..0000000
--- a/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.2.v201507021046.
-* Used org.franca.core 0.9.1.201412191134.
-*
-* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
-* If a copy of the MPL was not distributed with this file, You can obtain one at
-* http://mozilla.org/MPL/2.0/.
-*/
-#include <v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.hpp>
-
-namespace v1_0 {
-namespace fake {
-namespace legacy {
-namespace service {
-
-std::shared_ptr<CommonAPI::DBus::DBusProxy> createLegacyInterfaceDBusProxy(
-	const CommonAPI::DBus::DBusAddress &_address,
-	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection) {
-	return std::make_shared<LegacyInterfaceDBusProxy>(_address, _connection);
-}
-
-INITIALIZER(registerLegacyInterfaceDBusProxy) {
-	CommonAPI::DBus::Factory::get()->registerProxyCreateMethod(
-		LegacyInterface::getInterface(),
-		&createLegacyInterfaceDBusProxy);
-}
-
-LegacyInterfaceDBusProxy::LegacyInterfaceDBusProxy(
-	const CommonAPI::DBus::DBusAddress &_address,
-	const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection)
-	:	CommonAPI::DBus::DBusProxy(_address, _connection)
-{
-}
-
-
-
-        void LegacyInterfaceDBusProxy::TestMethod(const int32_t &_input, CommonAPI::CallStatus &_internalCallStatus, int32_t &_val1, int32_t &_val2, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_input(_input, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_val1(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_val2(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                    CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>,
-                    CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>
-                >
-            >::callMethodWithReply(
-            *this,
-            "TestMethod",
-            "i",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_input,
-            _internalCallStatus,
-            deploy_val1, deploy_val2);
-            _val1 = deploy_val1.getValue();
-            _val2 = deploy_val2.getValue();
-        }
-        std::future<CommonAPI::CallStatus> LegacyInterfaceDBusProxy::TestMethodAsync(const int32_t &_input, TestMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_input(_input, static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_val1(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_val2(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            return CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment >
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                    CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>,
-                    CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>
-                >
-            >::callMethodAsync(
-            *this,
-            "TestMethod",
-            "i",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            deploy_input,
-            [_callback] (CommonAPI::CallStatus _status, CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> _val1, CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> _val2) {
-            	_callback(_status, _val1.getValue(), _val2.getValue());
-            },
-            std::make_tuple(deploy_val1, deploy_val2));
-        }
-        void LegacyInterfaceDBusProxy::OtherTestMethod(CommonAPI::CallStatus &_internalCallStatus, std::string &_greeting, int32_t &_identifier, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_greeting(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
-            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_identifier(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                    CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>,
-                    CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>
-                >
-            >::callMethodWithReply(
-            *this,
-            "OtherTestMethod",
-            "",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            _internalCallStatus,
-            deploy_greeting, deploy_identifier);
-            _greeting = deploy_greeting.getValue();
-            _identifier = deploy_identifier.getValue();
-        }
-        std::future<CommonAPI::CallStatus> LegacyInterfaceDBusProxy::OtherTestMethodAsync(OtherTestMethodAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
-            CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> deploy_greeting(static_cast<CommonAPI::DBus::StringDeployment*>(nullptr));
-            CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> deploy_identifier(static_cast<CommonAPI::EmptyDeployment*>(nullptr));
-            return CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                    CommonAPI::Deployable<std::string,CommonAPI::DBus::StringDeployment>,
-                    CommonAPI::Deployable<int32_t,CommonAPI::EmptyDeployment>
-                >
-            >::callMethodAsync(
-            *this,
-            "OtherTestMethod",
-            "",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            [_callback] (CommonAPI::CallStatus _status, CommonAPI::Deployable<std::string, CommonAPI::DBus::StringDeployment> _greeting, CommonAPI::Deployable<int32_t, CommonAPI::EmptyDeployment> _identifier) {
-            	_callback(_status, _greeting.getValue(), _identifier.getValue());
-            },
-            std::make_tuple(deploy_greeting, deploy_identifier));
-        }
-        void LegacyInterfaceDBusProxy::finish(CommonAPI::CallStatus &_internalCallStatus, const CommonAPI::CallInfo *_info) {
-            CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                >
-            >::callMethodWithReply(
-            *this,
-            "finish",
-            "",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            _internalCallStatus);
-        }
-        std::future<CommonAPI::CallStatus> LegacyInterfaceDBusProxy::finishAsync(FinishAsyncCallback _callback, const CommonAPI::CallInfo *_info) {
-            return CommonAPI::DBus::DBusProxyHelper<
-                CommonAPI::DBus::DBusSerializableArguments<
-                >,
-                CommonAPI::DBus::DBusSerializableArguments<
-                >
-            >::callMethodAsync(
-            *this,
-            "finish",
-            "",
-            (_info ? _info : &CommonAPI::DBus::defaultCallInfo),
-            [_callback] (CommonAPI::CallStatus _status) {
-            	_callback(_status);
-            },
-            std::make_tuple());
-        }
-
-
-        void LegacyInterfaceDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
-            ownVersionMajor = 1;
-            ownVersionMinor = 0;
-        }
-
-        } // namespace service
-        } // namespace legacy
-        } // namespace fake
-        } // namespace v1_0