Improve ConfigurationStubImpl. Introduce function getSupportedSatelliteSystems

33 files changed, 389 insertions, 198 deletions

diff --git a/enhanced-position-service/commonapi-service/api/Configuration.fidl b/enhanced-position-service/commonapi-service/api/Configuration.fidl
index 700f816..391f250 100755
--- a/enhanced-position-service/commonapi-service/api/Configuration.fidl
+++ b/enhanced-position-service/commonapi-service/api/Configuration.fidl
@@ -32,4 +32,13 @@ interface Configuration {
         }

     }

     

+     <** @description : GetSupportedSatelliteSystems = This method returns a list of supported satellite systems **>

+    method GetSupportedSatelliteSystems {

+        out {

+            <** @description : satelliteSystems = list of supported satellite systems **>

+            SatelliteSystem[] satelliteSystems

+        }

+    }

+    

+  

 }

diff --git a/enhanced-position-service/commonapi-service/src/ConfigurationStubImpl.cpp b/enhanced-position-service/commonapi-service/src/ConfigurationStubImpl.cpp
index 130e2b7..219cb12 100644
--- a/enhanced-position-service/commonapi-service/src/ConfigurationStubImpl.cpp
+++ b/enhanced-position-service/commonapi-service/src/ConfigurationStubImpl.cpp
@@ -30,7 +30,12 @@ DLT_IMPORT_CONTEXT(gCtx);
 using namespace org::genivi::EnhancedPositionService::EnhancedPositionServiceTypes;
 
 ConfigurationStubImpl::ConfigurationStubImpl() {
+
    setUpdateIntervalAttribute(1000); //set default time interval
+
+   mSupportedSatSystems.push_back(SatelliteSystem::GALILEO);
+   mSupportedSatSystems.push_back(SatelliteSystem::GPS);
+
    setSatSystemAttribute(SatelliteSystem::GALILEO); //set default GNSS system
 }
 
@@ -46,6 +51,16 @@ void ConfigurationStubImpl::GetVersion(EnhancedPositionServiceTypes::Version& ve
     version.date = std::string(VER_DATE);
 }
 
+//check if the value belongs to the list of supported satellite systems
+bool ConfigurationStubImpl::validateSatSystemAttributeRequestedValue(const EnhancedPositionServiceTypes::SatelliteSystem& value) {
+    return std::find(mSupportedSatSystems.begin(), mSupportedSatSystems.end(), value) != mSupportedSatSystems.end();
+}
+
+void ConfigurationStubImpl::GetSupportedSatelliteSystems(std::vector<EnhancedPositionServiceTypes::SatelliteSystem>& satelliteSystems) {
+	//add a list of supported satellite systems
+	satelliteSystems = mSupportedSatSystems;
+}
+
 void ConfigurationStubImpl::run()
 {
     LOG_INFO_MSG(gCtx,"Starting Configuration dispatcher...");
@@ -55,7 +70,7 @@ void ConfigurationStubImpl::run()
 
 void ConfigurationStubImpl::shutdown()
 {
-  LOG_INFO_MSG(gCtx,"Shutting down Configuration dispatcher...");
+    LOG_INFO_MSG(gCtx,"Shutting down Configuration dispatcher...");
 }
 
 
diff --git a/enhanced-position-service/commonapi-service/src/ConfigurationStubImpl.h b/enhanced-position-service/commonapi-service/src/ConfigurationStubImpl.h
index 355df98..8492c69 100644
--- a/enhanced-position-service/commonapi-service/src/ConfigurationStubImpl.h
+++ b/enhanced-position-service/commonapi-service/src/ConfigurationStubImpl.h
@@ -30,8 +30,15 @@ public:
     ConfigurationStubImpl();
     virtual ~ConfigurationStubImpl();
     void GetVersion(EnhancedPositionServiceTypes::Version& version);
+    void GetSupportedSatelliteSystems(std::vector<EnhancedPositionServiceTypes::SatelliteSystem>& satelliteSystems);
     void run();
     void shutdown();
+
+protected:
+    bool validateSatSystemAttributeRequestedValue(const EnhancedPositionServiceTypes::SatelliteSystem& value);
+
+private:
+    std::vector<EnhancedPositionServiceTypes::SatelliteSystem> mSupportedSatSystems;
 };
 
 #endif /* CONFIGURATIONSTUBIMPL_H_ */
diff --git a/enhanced-position-service/commonapi-service/src/EnhancedPositionService.cpp b/enhanced-position-service/commonapi-service/src/EnhancedPositionService.cpp
index ec4f1a0..14fe771 100755
--- a/enhanced-position-service/commonapi-service/src/EnhancedPositionService.cpp
+++ b/enhanced-position-service/commonapi-service/src/EnhancedPositionService.cpp
@@ -16,7 +16,7 @@ DLT_DECLARE_CONTEXT(gCtx);
 using namespace std;
 
 int main() {
-	DLT_REGISTER_APP("ENHP","ENHANCED_POSITION-SERVICE");
+    DLT_REGISTER_APP("ENHP","ENHANCED_POSITION-SERVICE");
     DLT_REGISTER_CONTEXT(gCtx,"ENHP","Global Context");
 
     std::shared_ptr<CommonAPI::Runtime> runtime = CommonAPI::Runtime::load();
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusProxy.cpp b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusProxy.cpp
index 6bc748c..e620d7e 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusProxy.cpp
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusProxy.cpp
@@ -74,6 +74,27 @@ std::future<CommonAPI::CallStatus> ConfigurationDBusProxy::GetVersionAsync(GetVe
         "",
         std::move(callback));
 }
+/**
+ * GetSupportedSatelliteSystems = This method returns a list of supported
+ *  satellite systems
+ */
+void ConfigurationDBusProxy::GetSupportedSatelliteSystems(CommonAPI::CallStatus& callStatus, std::vector<EnhancedPositionServiceTypes::SatelliteSystem>& satelliteSystems) {
+    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
+                                     CommonAPI::DBus::DBusSerializableArguments<std::vector<EnhancedPositionServiceTypes::SatelliteSystem>> >::callMethodWithReply(
+        *this,
+        "GetSupportedSatelliteSystems",
+        "",
+        callStatus
+        , satelliteSystems);
+}
+std::future<CommonAPI::CallStatus> ConfigurationDBusProxy::GetSupportedSatelliteSystemsAsync(GetSupportedSatelliteSystemsAsyncCallback callback) {
+    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
+                                     CommonAPI::DBus::DBusSerializableArguments<std::vector<EnhancedPositionServiceTypes::SatelliteSystem>> >::callMethodAsync(
+        *this,
+        "GetSupportedSatelliteSystems",
+        "",
+        std::move(callback));
+}
 
 
 
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusProxy.h b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusProxy.h
index 2e2b2db..16c7092 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusProxy.h
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusProxy.h
@@ -54,6 +54,12 @@ class ConfigurationDBusProxy: virtual public ConfigurationProxyBase, virtual pub
      */
     virtual void GetVersion(CommonAPI::CallStatus& callStatus, EnhancedPositionServiceTypes::Version& version);
     virtual std::future<CommonAPI::CallStatus> GetVersionAsync(GetVersionAsyncCallback callback);
+    /**
+     * GetSupportedSatelliteSystems = This method returns a list of supported
+     *  satellite systems
+     */
+    virtual void GetSupportedSatelliteSystems(CommonAPI::CallStatus& callStatus, std::vector<EnhancedPositionServiceTypes::SatelliteSystem>& satelliteSystems);
+    virtual std::future<CommonAPI::CallStatus> GetSupportedSatelliteSystemsAsync(GetSupportedSatelliteSystemsAsyncCallback callback);
 
 
     virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusStubAdapter.cpp b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusStubAdapter.cpp
index e48fdc5..8df18e9 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusStubAdapter.cpp
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusStubAdapter.cpp
@@ -73,6 +73,13 @@ const char* ConfigurationDBusStubAdapterInternal::getMethodsDBusIntrospectionXml
         "<method name=\"GetVersion\">\n"
             "<arg name=\"version\" type=\"(qqqs)\" direction=\"out\" />\n"
         "</method>\n"
+        /**
+         * GetSupportedSatelliteSystems = This method returns a list of supported
+         *  satellite systems
+         */
+        "<method name=\"GetSupportedSatelliteSystems\">\n"
+            "<arg name=\"satelliteSystems\" type=\"ai\" direction=\"out\" />\n"
+        "</method>\n"
 
     ;
     return introspectionData.c_str();
@@ -128,6 +135,15 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     std::tuple<>,
     std::tuple<EnhancedPositionServiceTypes::Version>
     > ConfigurationDBusStubAdapterInternal::getVersionStubDispatcher(&ConfigurationStub::GetVersion, "(qqqs)");
+/**
+ * GetSupportedSatelliteSystems = This method returns a list of supported
+ *  satellite systems
+ */
+CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ConfigurationStub,
+    std::tuple<>,
+    std::tuple<std::vector<EnhancedPositionServiceTypes::SatelliteSystem>>
+    > ConfigurationDBusStubAdapterInternal::getSupportedSatelliteSystemsStubDispatcher(&ConfigurationStub::GetSupportedSatelliteSystems, "ai");
 
 
 /**
@@ -206,7 +222,12 @@ ConfigurationDBusStubAdapterInternal::ConfigurationDBusStubAdapterInternal(
              * GetVersion = This method returns the API version implemented by the server
              *  application
              */
-            { { "GetVersion", "" }, &org::genivi::EnhancedPositionService::ConfigurationDBusStubAdapterInternal::getVersionStubDispatcher }
+            { { "GetVersion", "" }, &org::genivi::EnhancedPositionService::ConfigurationDBusStubAdapterInternal::getVersionStubDispatcher },
+            /**
+             * GetSupportedSatelliteSystems = This method returns a list of supported
+             *  satellite systems
+             */
+            { { "GetSupportedSatelliteSystems", "" }, &org::genivi::EnhancedPositionService::ConfigurationDBusStubAdapterInternal::getSupportedSatelliteSystemsStubDispatcher }
             }),
         stubAttributeTable_() {
 
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusStubAdapter.h b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusStubAdapter.h
index 9406b6b..3e8b531 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusStubAdapter.h
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationDBusStubAdapter.h
@@ -103,6 +103,15 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     std::tuple<>,
     std::tuple<EnhancedPositionServiceTypes::Version>
     > getVersionStubDispatcher;
+/**
+ * GetSupportedSatelliteSystems = This method returns a list of supported
+ *  satellite systems
+ */
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ConfigurationStub,
+    std::tuple<>,
+    std::tuple<std::vector<EnhancedPositionServiceTypes::SatelliteSystem>>
+    > getSupportedSatelliteSystemsStubDispatcher;
 
 
 
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationProxy.h b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationProxy.h
index 0556d1b..c1cc85e 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationProxy.h
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationProxy.h
@@ -83,6 +83,29 @@ public:
      * It will provide the same value for CallStatus as will be handed to the callback.
      */
     virtual std::future<CommonAPI::CallStatus> GetVersionAsync(GetVersionAsyncCallback callback);
+    /**
+     * GetSupportedSatelliteSystems = This method returns a list of supported
+     *  satellite systems
+     * 
+     * Calls GetSupportedSatelliteSystems with synchronous semantics.
+     * 
+    * All non-const parameters will be filled with the returned values.
+     * The CallStatus will be filled when the method returns and indicate either
+     * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
+     * will be set.
+     */
+    virtual void GetSupportedSatelliteSystems(CommonAPI::CallStatus& callStatus, std::vector<EnhancedPositionServiceTypes::SatelliteSystem>& satelliteSystems);
+    /**
+     * Calls GetSupportedSatelliteSystems with asynchronous semantics.
+     * 
+     * The provided callback will be called when the reply to this call arrives or
+     * an error occurs during the call. The CallStatus will indicate either "SUCCESS"
+     * or which type of error has occurred. In case of any error, ONLY the CallStatus
+     * will have a defined value.
+     * 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> GetSupportedSatelliteSystemsAsync(GetSupportedSatelliteSystemsAsyncCallback callback);
 
 
     /**
@@ -216,6 +239,19 @@ template <typename ... _AttributeExtensions>
 std::future<CommonAPI::CallStatus> ConfigurationProxy<_AttributeExtensions...>::GetVersionAsync(GetVersionAsyncCallback callback) {
     return delegate_->GetVersionAsync(callback);
 }
+/**
+ * GetSupportedSatelliteSystems = This method returns a list of supported
+ *  satellite systems
+ */
+template <typename ... _AttributeExtensions>
+void ConfigurationProxy<_AttributeExtensions...>::GetSupportedSatelliteSystems(CommonAPI::CallStatus& callStatus, std::vector<EnhancedPositionServiceTypes::SatelliteSystem>& satelliteSystems) {
+    delegate_->GetSupportedSatelliteSystems(callStatus, satelliteSystems);
+}
+
+template <typename ... _AttributeExtensions>
+std::future<CommonAPI::CallStatus> ConfigurationProxy<_AttributeExtensions...>::GetSupportedSatelliteSystemsAsync(GetSupportedSatelliteSystemsAsyncCallback callback) {
+    return delegate_->GetSupportedSatelliteSystemsAsync(callback);
+}
 
 template <typename ... _AttributeExtensions>
 std::string ConfigurationProxy<_AttributeExtensions...>::getAddress() const {
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationProxyBase.h b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationProxyBase.h
index 6f91a7b..38ae3b5 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationProxyBase.h
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationProxyBase.h
@@ -47,6 +47,7 @@ class ConfigurationProxyBase: virtual public CommonAPI::Proxy {
     typedef CommonAPI::ObservableAttribute<int32_t> UpdateIntervalAttribute;
 
     typedef std::function<void(const CommonAPI::CallStatus&, const EnhancedPositionServiceTypes::Version&)> GetVersionAsyncCallback;
+    typedef std::function<void(const CommonAPI::CallStatus&, const std::vector<EnhancedPositionServiceTypes::SatelliteSystem>&)> GetSupportedSatelliteSystemsAsyncCallback;
 
     /**
      * SatSystem = satellite system (GPS, GLONASS, ...)
@@ -64,6 +65,12 @@ class ConfigurationProxyBase: virtual public CommonAPI::Proxy {
      */
     virtual void GetVersion(CommonAPI::CallStatus& callStatus, EnhancedPositionServiceTypes::Version& version) = 0;
     virtual std::future<CommonAPI::CallStatus> GetVersionAsync(GetVersionAsyncCallback callback) = 0;
+    /**
+     * GetSupportedSatelliteSystems = This method returns a list of supported
+     *  satellite systems
+     */
+    virtual void GetSupportedSatelliteSystems(CommonAPI::CallStatus& callStatus, std::vector<EnhancedPositionServiceTypes::SatelliteSystem>& satelliteSystems) = 0;
+    virtual std::future<CommonAPI::CallStatus> GetSupportedSatelliteSystemsAsync(GetSupportedSatelliteSystemsAsyncCallback callback) = 0;
 };
 
 } // namespace EnhancedPositionService
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationStub.h b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationStub.h
index db7034d..74406a6 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationStub.h
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationStub.h
@@ -120,6 +120,12 @@ public:
      */
     /// This is the method that will be called on remote calls on the method GetVersion.
     virtual void GetVersion(const std::shared_ptr<CommonAPI::ClientId> clientId, EnhancedPositionServiceTypes::Version& version) = 0;
+    /**
+     * GetSupportedSatelliteSystems = This method returns a list of supported
+     *  satellite systems
+     */
+    /// This is the method that will be called on remote calls on the method GetSupportedSatelliteSystems.
+    virtual void GetSupportedSatelliteSystems(const std::shared_ptr<CommonAPI::ClientId> clientId, std::vector<EnhancedPositionServiceTypes::SatelliteSystem>& satelliteSystems) = 0;
 
     using CommonAPI::Stub<ConfigurationStubAdapter, ConfigurationStubRemoteEvent>::initStubAdapter;
     typedef CommonAPI::Stub<ConfigurationStubAdapter, ConfigurationStubRemoteEvent>::StubAdapterType StubAdapterType;
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationStubDefault.cpp b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationStubDefault.cpp
index 4f0cf3f..da37eb9 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationStubDefault.cpp
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationStubDefault.cpp
@@ -136,6 +136,18 @@ void ConfigurationStubDefault::GetVersion(EnhancedPositionServiceTypes::Version&
     // No operation in default
 }
 
+/**
+ * GetSupportedSatelliteSystems = This method returns a list of supported
+ *  satellite systems
+ */
+void ConfigurationStubDefault::GetSupportedSatelliteSystems(const std::shared_ptr<CommonAPI::ClientId> clientId, std::vector<EnhancedPositionServiceTypes::SatelliteSystem>& satelliteSystems) {
+    // Call old style methods in default 
+    GetSupportedSatelliteSystems(satelliteSystems);
+}
+void ConfigurationStubDefault::GetSupportedSatelliteSystems(std::vector<EnhancedPositionServiceTypes::SatelliteSystem>& satelliteSystems) {
+    // No operation in default
+}
+
 
 
 
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationStubDefault.h b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationStubDefault.h
index 523f1e9..a9dd97d 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationStubDefault.h
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/ConfigurationStubDefault.h
@@ -56,6 +56,13 @@ public:
     virtual void GetVersion(const std::shared_ptr<CommonAPI::ClientId> clientId, EnhancedPositionServiceTypes::Version& version);
     virtual void GetVersion(EnhancedPositionServiceTypes::Version& version);
 
+    /**
+     * GetSupportedSatelliteSystems = This method returns a list of supported
+     *  satellite systems
+     */
+    virtual void GetSupportedSatelliteSystems(const std::shared_ptr<CommonAPI::ClientId> clientId, std::vector<EnhancedPositionServiceTypes::SatelliteSystem>& satelliteSystems);
+    virtual void GetSupportedSatelliteSystems(std::vector<EnhancedPositionServiceTypes::SatelliteSystem>& satelliteSystems);
+
 
 
 
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusProxy.cpp b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusProxy.cpp
index a1b4a46..e02adfe 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusProxy.cpp
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusProxy.cpp
@@ -98,8 +98,8 @@ std::future<CommonAPI::CallStatus> EnhancedPositionDBusProxy::GetPositionInfoAsy
 /**
  * GetSatelliteInfo = This method returns information about the current satellite
  *  constellation
-		Note: If a requested value is invalid, it's not returned to
- *  the client application
+        Note: If a requested value is invalid, it's not
+ *  returned to the client application
  */
 void EnhancedPositionDBusProxy::GetSatelliteInfo(CommonAPI::CallStatus& callStatus, EnhancedPositionServiceTypes::Timestamp& timestamp, EnhancedPositionServiceTypes::SatelliteInfo& satelliteInfo) {
     CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusProxy.h b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusProxy.h
index 8a7c520..60e4df9 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusProxy.h
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusProxy.h
@@ -64,8 +64,8 @@ class EnhancedPositionDBusProxy: virtual public EnhancedPositionProxyBase, virtu
     /**
      * GetSatelliteInfo = This method returns information about the current satellite
      *  constellation
-    		Note: If a requested value is invalid, it's not returned to
-     *  the client application
+            Note: If a requested value is invalid, it's not
+     *  returned to the client application
      */
     virtual void GetSatelliteInfo(CommonAPI::CallStatus& callStatus, EnhancedPositionServiceTypes::Timestamp& timestamp, EnhancedPositionServiceTypes::SatelliteInfo& satelliteInfo);
     virtual std::future<CommonAPI::CallStatus> GetSatelliteInfoAsync(GetSatelliteInfoAsyncCallback callback);
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusStubAdapter.cpp b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusStubAdapter.cpp
index db19749..c7420c2 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusStubAdapter.cpp
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusStubAdapter.cpp
@@ -47,7 +47,7 @@ const char* EnhancedPositionDBusStubAdapterInternal::getMethodsDBusIntrospection
             "<arg name=\"value\" type=\"uu\" direction=\"out\" />"
         "</method>\n"
         /**
-         * PositionUpdate = This signal is called to notifiy a client application of a
+         * PositionUpdate = This signal is called to notify a client application of a
          *  position change. The update frequency is implementation specific. The maximal
          *  allowed frequency is 10Hz
          */
@@ -75,8 +75,8 @@ const char* EnhancedPositionDBusStubAdapterInternal::getMethodsDBusIntrospection
         /**
          * GetSatelliteInfo = This method returns information about the current satellite
          *  constellation
-        		Note: If a requested value is invalid, it's not returned to
-         *  the client application
+                Note: If a requested value is invalid, it's not
+         *  returned to the client application
          */
         "<method name=\"GetSatelliteInfo\">\n"
             "<arg name=\"timestamp\" type=\"t\" direction=\"out\" />\n"
@@ -126,8 +126,8 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
 /**
  * GetSatelliteInfo = This method returns information about the current satellite
  *  constellation
-		Note: If a requested value is invalid, it's not returned to
- *  the client application
+        Note: If a requested value is invalid, it's not
+ *  returned to the client application
  */
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     EnhancedPositionStub,
@@ -148,7 +148,7 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
 
 
 /**
- * PositionUpdate = This signal is called to notifiy a client application of a
+ * PositionUpdate = This signal is called to notify a client application of a
  *  position change. The update frequency is implementation specific. The maximal
  *  allowed frequency is 10Hz
  */
@@ -212,8 +212,8 @@ EnhancedPositionDBusStubAdapterInternal::EnhancedPositionDBusStubAdapterInternal
             /**
              * GetSatelliteInfo = This method returns information about the current satellite
              *  constellation
-            		Note: If a requested value is invalid, it's not returned to
-             *  the client application
+                    Note: If a requested value is invalid, it's not
+             *  returned to the client application
              */
             { { "GetSatelliteInfo", "" }, &org::genivi::EnhancedPositionService::EnhancedPositionDBusStubAdapterInternal::getSatelliteInfoStubDispatcher },
             /**
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusStubAdapter.h b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusStubAdapter.h
index f6c0df6..5eb5c72 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusStubAdapter.h
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionDBusStubAdapter.h
@@ -50,7 +50,7 @@ class EnhancedPositionDBusStubAdapterInternal: public virtual EnhancedPositionSt
 
 
     /**
-     * PositionUpdate = This signal is called to notifiy a client application of a
+     * PositionUpdate = This signal is called to notify a client application of a
      *  position change. The update frequency is implementation specific. The maximal
      *  allowed frequency is 10Hz
      */
@@ -93,8 +93,8 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
 /**
  * GetSatelliteInfo = This method returns information about the current satellite
  *  constellation
-		Note: If a requested value is invalid, it's not returned to
- *  the client application
+        Note: If a requested value is invalid, it's not
+ *  returned to the client application
  */
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     EnhancedPositionStub,
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionProxy.h b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionProxy.h
index 1c377f0..f769438 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionProxy.h
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionProxy.h
@@ -40,7 +40,7 @@ public:
 
 
     /**
-     * PositionUpdate = This signal is called to notifiy a client application of a
+     * PositionUpdate = This signal is called to notify a client application of a
      *  position change. The update frequency is implementation specific. The maximal
      *  allowed frequency is 10Hz
      */
@@ -103,8 +103,8 @@ public:
     /**
      * GetSatelliteInfo = This method returns information about the current satellite
      *  constellation
-    		Note: If a requested value is invalid, it's not returned to
-     *  the client application
+            Note: If a requested value is invalid, it's not
+     *  returned to the client application
      * 
      * Calls GetSatelliteInfo with synchronous semantics.
      * 
@@ -248,8 +248,8 @@ std::future<CommonAPI::CallStatus> EnhancedPositionProxy<_AttributeExtensions...
 /**
  * GetSatelliteInfo = This method returns information about the current satellite
  *  constellation
-		Note: If a requested value is invalid, it's not returned to
- *  the client application
+        Note: If a requested value is invalid, it's not
+ *  returned to the client application
  */
 template <typename ... _AttributeExtensions>
 void EnhancedPositionProxy<_AttributeExtensions...>::GetSatelliteInfo(CommonAPI::CallStatus& callStatus, EnhancedPositionServiceTypes::Timestamp& timestamp, EnhancedPositionServiceTypes::SatelliteInfo& satelliteInfo) {
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionProxyBase.h b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionProxyBase.h
index cb3296e..87f9506 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionProxyBase.h
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionProxyBase.h
@@ -53,7 +53,7 @@ class EnhancedPositionProxyBase: virtual public CommonAPI::Proxy {
 
 
     /**
-     * PositionUpdate = This signal is called to notifiy a client application of a
+     * PositionUpdate = This signal is called to notify a client application of a
      *  position change. The update frequency is implementation specific. The maximal
      *  allowed frequency is 10Hz
      */
@@ -76,8 +76,8 @@ class EnhancedPositionProxyBase: virtual public CommonAPI::Proxy {
     /**
      * GetSatelliteInfo = This method returns information about the current satellite
      *  constellation
-    		Note: If a requested value is invalid, it's not returned to
-     *  the client application
+            Note: If a requested value is invalid, it's not
+     *  returned to the client application
      */
     virtual void GetSatelliteInfo(CommonAPI::CallStatus& callStatus, EnhancedPositionServiceTypes::Timestamp& timestamp, EnhancedPositionServiceTypes::SatelliteInfo& satelliteInfo) = 0;
     virtual std::future<CommonAPI::CallStatus> GetSatelliteInfoAsync(GetSatelliteInfoAsyncCallback callback) = 0;
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionServiceTypes.h b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionServiceTypes.h
index 9c1f85a..4a05726 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionServiceTypes.h
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionServiceTypes.h
@@ -122,132 +122,130 @@ namespace EnhancedPositionServiceTypes {
     struct PositionInfoKeyComparator;
     /**
      * PositionInfo = array of tuples (key,value)
-                key = enumeration
+            key = enumeration
      *  PositionInfoKey
-                key = LATITUDE, value = value of type 'Double',
-     *  that expresses the latitude of the current position. Range [-90:+90]. Example:
+            key = LATITUDE, value = value of type 'Double', that
+     *  expresses the latitude of the current position. Range [-90:+90]. Example:
      *  48.053250
-                key = LONGITUDE, value = value of type 'Double', that
+            key = LONGITUDE, value = value of type 'Double', that
      *  expresses the longitude of the current position. Range [-180:+180]. Example:
      *  8.324500
-                key = ALTITUDE, value = value of type 'Double', that
+            key = ALTITUDE, value = value of type 'Double', that
      *  expresses the altitude above the sea level of the current position in meters
     
-     *             key = HEADING, value = value of type 'Double', that expresses the
+     *         key = HEADING, value = value of type 'Double', that expresses the
      *  course angle in degree. Range [0:360]. 0 = north, 90 = east, 180 = south, 270
      *  = west
-                key = SPEED, value = value of type 'Double', that
-     *  expresses speed measured in m/s. A negative value indicates that the vehicle
-     *  is moving backwards
-                key = CLIMB, value = value of type 'Double',
-     *  that expresses the road gradient in degrees
-                key = ROLL_RATE,
-     *  value = value of type 'Double', rotation rate around the X-axis in degrees/s.
-     *  Range [-100:+100]
-                key = PITCH_RATE, value = value of type
-     *  'Double', rotation rate around the Y-axis in degrees/s. Range [-100:+100]
+            key = SPEED, value = value of type 'Double', that expresses
+     *  speed measured in m/s. A negative value indicates that the vehicle is moving
+     *  backwards
+            key = CLIMB, value = value of type 'Double', that expresses
+     *  the road gradient in degrees
+            key = ROLL_RATE, value = value of type
+     *  'Double', rotation rate around the X-axis in degrees/s. Range [-100:+100]
        
-     *          key = YAW_RATE, value = value of type 'Double', rotation rate around
-     *  the Z-axis in degrees/s. Range [-100:+100]
-                key = PDOP, value =
-     *  value of type 'Double', that represents the positional (3D) dilution of
-     *  precision
-                key = HDOP, value = value of type 'Double', that
-     *  represents the horizontal (2D) dilution of precision
-                key = VDOP,
-     *  value = value of type 'Double', that represents vertical (altitude) dilution
+     *      key = PITCH_RATE, value = value of type 'Double', rotation rate around the
+     *  Y-axis in degrees/s. Range [-100:+100]
+            key = YAW_RATE, value = value
+     *  of type 'Double', rotation rate around the Z-axis in degrees/s. Range
+     *  [-100:+100]
+            key = PDOP, value = value of type 'Double', that
+     *  represents the positional (3D) dilution of precision
+            key = HDOP,
+     *  value = value of type 'Double', that represents the horizontal (2D) dilution
      *  of precision
-                key = USED_SATELLITES, value = value of type
-     *  'UInt8', that represents the number of used satellites
-                key =
-     *  TRACKED_SATELLITES, value = value of type 'UInt8', that represents the number
-     *  of tracked satellites 
-                key = VISIBLE_SATELLITES, value = value of
-     *  type 'UInt8', that represents the number of visible satellites
-               
-     *  key = SIGMA_HPOSITION, value = value of type 'Double', that represents the
-     *  standard deviation for the horizontal position in m
-                key =
-     *  SIGMA_ALTITUDE, value = value of type 'Double', that represents the standard
-     *  deviation for altitude in m
-                key = SIGMA_HEADING, value = value of
-     *  type 'Double', that represents the standard deviation for altitude in
-     *  degrees
-                key = SIGMA_SPEED, value = value of type 'Double', that
-     *  represents the standard error estimate of the speed in m/s</line>
-               
-     *  key = SIGMA_CLIMB, value = value of type 'Double', that represents the
-     *  standard error estimate of the climb in degrees</line>
-                key =
-     *  GNSS_FIX_STATUS, value = value of type 'UInt16', that represents an
+            key = VDOP, value = value of type 'Double', that
+     *  represents vertical (altitude) dilution of precision
+            key =
+     *  USED_SATELLITES, value = value of type 'UInt8', that represents the number of
+     *  used satellites
+            key = TRACKED_SATELLITES, value = value of type
+     *  'UInt8', that represents the number of tracked satellites 
+            key =
+     *  VISIBLE_SATELLITES, value = value of type 'UInt8', that represents the number
+     *  of visible satellites
+            key = SIGMA_HPOSITION, value = value of type
+     *  'Double', that represents the standard deviation for the horizontal position
+     *  in m
+            key = SIGMA_ALTITUDE, value = value of type 'Double', that
+     *  represents the standard deviation for altitude in m
+            key =
+     *  SIGMA_HEADING, value = value of type 'Double', that represents the standard
+     *  deviation for altitude in degrees
+            key = SIGMA_SPEED, value = value of
+     *  type 'Double', that represents the standard error estimate of the speed in
+     *  m/s</line>
+            key = SIGMA_CLIMB, value = value of type 'Double', that
+     *  represents the standard error estimate of the climb in degrees</line>
+           
+     *  key = GNSS_FIX_STATUS, value = value of type 'UInt16', that represents an
      *  enum(NO_FIX(0x01),TIME_FIX(0x01),2D_FIX(0x02),3D_FIX(0x03), ... )
-               
-     *  key = DR_STATUS, value = value of type 'Boolean', where TRUE means that a
+            key
+     *  = DR_STATUS, value = value of type 'Boolean', where TRUE means that a
      *  dead-reckoning algorithm has been used to calculate the current position
      */
     /**
      * PositionInfo = array of tuples (key,value)
-                key = enumeration
+            key = enumeration
      *  PositionInfoKey
-                key = LATITUDE, value = value of type 'Double',
-     *  that expresses the latitude of the current position. Range [-90:+90]. Example:
+            key = LATITUDE, value = value of type 'Double', that
+     *  expresses the latitude of the current position. Range [-90:+90]. Example:
      *  48.053250
-                key = LONGITUDE, value = value of type 'Double', that
+            key = LONGITUDE, value = value of type 'Double', that
      *  expresses the longitude of the current position. Range [-180:+180]. Example:
      *  8.324500
-                key = ALTITUDE, value = value of type 'Double', that
+            key = ALTITUDE, value = value of type 'Double', that
      *  expresses the altitude above the sea level of the current position in meters
     
-     *             key = HEADING, value = value of type 'Double', that expresses the
+     *         key = HEADING, value = value of type 'Double', that expresses the
      *  course angle in degree. Range [0:360]. 0 = north, 90 = east, 180 = south, 270
      *  = west
-                key = SPEED, value = value of type 'Double', that
-     *  expresses speed measured in m/s. A negative value indicates that the vehicle
-     *  is moving backwards
-                key = CLIMB, value = value of type 'Double',
-     *  that expresses the road gradient in degrees
-                key = ROLL_RATE,
-     *  value = value of type 'Double', rotation rate around the X-axis in degrees/s.
-     *  Range [-100:+100]
-                key = PITCH_RATE, value = value of type
-     *  'Double', rotation rate around the Y-axis in degrees/s. Range [-100:+100]
+            key = SPEED, value = value of type 'Double', that expresses
+     *  speed measured in m/s. A negative value indicates that the vehicle is moving
+     *  backwards
+            key = CLIMB, value = value of type 'Double', that expresses
+     *  the road gradient in degrees
+            key = ROLL_RATE, value = value of type
+     *  'Double', rotation rate around the X-axis in degrees/s. Range [-100:+100]
        
-     *          key = YAW_RATE, value = value of type 'Double', rotation rate around
-     *  the Z-axis in degrees/s. Range [-100:+100]
-                key = PDOP, value =
-     *  value of type 'Double', that represents the positional (3D) dilution of
-     *  precision
-                key = HDOP, value = value of type 'Double', that
-     *  represents the horizontal (2D) dilution of precision
-                key = VDOP,
-     *  value = value of type 'Double', that represents vertical (altitude) dilution
+     *      key = PITCH_RATE, value = value of type 'Double', rotation rate around the
+     *  Y-axis in degrees/s. Range [-100:+100]
+            key = YAW_RATE, value = value
+     *  of type 'Double', rotation rate around the Z-axis in degrees/s. Range
+     *  [-100:+100]
+            key = PDOP, value = value of type 'Double', that
+     *  represents the positional (3D) dilution of precision
+            key = HDOP,
+     *  value = value of type 'Double', that represents the horizontal (2D) dilution
      *  of precision
-                key = USED_SATELLITES, value = value of type
-     *  'UInt8', that represents the number of used satellites
-                key =
-     *  TRACKED_SATELLITES, value = value of type 'UInt8', that represents the number
-     *  of tracked satellites 
-                key = VISIBLE_SATELLITES, value = value of
-     *  type 'UInt8', that represents the number of visible satellites
-               
-     *  key = SIGMA_HPOSITION, value = value of type 'Double', that represents the
-     *  standard deviation for the horizontal position in m
-                key =
-     *  SIGMA_ALTITUDE, value = value of type 'Double', that represents the standard
-     *  deviation for altitude in m
-                key = SIGMA_HEADING, value = value of
-     *  type 'Double', that represents the standard deviation for altitude in
-     *  degrees
-                key = SIGMA_SPEED, value = value of type 'Double', that
-     *  represents the standard error estimate of the speed in m/s</line>
-               
-     *  key = SIGMA_CLIMB, value = value of type 'Double', that represents the
-     *  standard error estimate of the climb in degrees</line>
-                key =
-     *  GNSS_FIX_STATUS, value = value of type 'UInt16', that represents an
+            key = VDOP, value = value of type 'Double', that
+     *  represents vertical (altitude) dilution of precision
+            key =
+     *  USED_SATELLITES, value = value of type 'UInt8', that represents the number of
+     *  used satellites
+            key = TRACKED_SATELLITES, value = value of type
+     *  'UInt8', that represents the number of tracked satellites 
+            key =
+     *  VISIBLE_SATELLITES, value = value of type 'UInt8', that represents the number
+     *  of visible satellites
+            key = SIGMA_HPOSITION, value = value of type
+     *  'Double', that represents the standard deviation for the horizontal position
+     *  in m
+            key = SIGMA_ALTITUDE, value = value of type 'Double', that
+     *  represents the standard deviation for altitude in m
+            key =
+     *  SIGMA_HEADING, value = value of type 'Double', that represents the standard
+     *  deviation for altitude in degrees
+            key = SIGMA_SPEED, value = value of
+     *  type 'Double', that represents the standard error estimate of the speed in
+     *  m/s</line>
+            key = SIGMA_CLIMB, value = value of type 'Double', that
+     *  represents the standard error estimate of the climb in degrees</line>
+           
+     *  key = GNSS_FIX_STATUS, value = value of type 'UInt16', that represents an
      *  enum(NO_FIX(0x01),TIME_FIX(0x01),2D_FIX(0x02),3D_FIX(0x03), ... )
-               
-     *  key = DR_STATUS, value = value of type 'Boolean', where TRUE means that a
+            key
+     *  = DR_STATUS, value = value of type 'Boolean', where TRUE means that a
      *  dead-reckoning algorithm has been used to calculate the current position
      */
     typedef std::unordered_map<PositionInfoKey, Value, CommonAPI::EnumHasher<PositionInfoKey>> PositionInfo;
@@ -328,49 +326,47 @@ namespace EnhancedPositionServiceTypes {
     struct TimeInfoKeyComparator;
     /**
      * TimeInfo = array of tuples (key,value)
-              key = enumeration
-     *  TimeInfoKey
-              key = YEAR, value = value of type 'UInt16', 4 digits
-     *  number that indicates the year. Example: 2012
-              key = MONTH, value =
-     *  value of type 'UInt8', 2 digits number that indicates the month. Example: 03
-     *  means March
-              key = DAY, value = value of type 'UInt8', 2 digits
-     *  number that indicates the day. Range [0:31]. Example: 07
-              key =
-     *  HOUR, value = value of type 'UInt8', 2 digits number that indicates the hour.
-     *  Range [0:23].  Example: 01
-              key = MINUTE, value = value of type
-     *  'UInt8', 2 digits number that represents the minutes. Range [0:59]. Example:
-     *  01
-              key = SECOND, value = value of type 'UInt8', 2 digits number
-     *  that represents the seconds. Range [0:59]. Example: 01
-              key = MS,
-     *  value = value of type 'UInt16', 3 digits number that represents the
-     *  milliseconds. Range [0:999]. Example: 007
+            key = enumeration TimeInfoKey
+    
+     *         key = YEAR, value = value of type 'UInt16', 4 digits number that
+     *  indicates the year. Example: 2012
+            key = MONTH, value = value of type
+     *  'UInt8', 2 digits number that indicates the month. Example: 03 means March
+      
+     *       key = DAY, value = value of type 'UInt8', 2 digits number that indicates
+     *  the day. Range [0:31]. Example: 07
+            key = HOUR, value = value of type
+     *  'UInt8', 2 digits number that indicates the hour. Range [0:23].  Example: 01
+    
+     *         key = MINUTE, value = value of type 'UInt8', 2 digits number that
+     *  represents the minutes. Range [0:59]. Example: 01
+            key = SECOND, value
+     *  = value of type 'UInt8', 2 digits number that represents the seconds. Range
+     *  [0:59]. Example: 01
+            key = MS, value = value of type 'UInt16', 3
+     *  digits number that represents the milliseconds. Range [0:999]. Example: 007
      */
     /**
      * TimeInfo = array of tuples (key,value)
-              key = enumeration
-     *  TimeInfoKey
-              key = YEAR, value = value of type 'UInt16', 4 digits
-     *  number that indicates the year. Example: 2012
-              key = MONTH, value =
-     *  value of type 'UInt8', 2 digits number that indicates the month. Example: 03
-     *  means March
-              key = DAY, value = value of type 'UInt8', 2 digits
-     *  number that indicates the day. Range [0:31]. Example: 07
-              key =
-     *  HOUR, value = value of type 'UInt8', 2 digits number that indicates the hour.
-     *  Range [0:23].  Example: 01
-              key = MINUTE, value = value of type
-     *  'UInt8', 2 digits number that represents the minutes. Range [0:59]. Example:
-     *  01
-              key = SECOND, value = value of type 'UInt8', 2 digits number
-     *  that represents the seconds. Range [0:59]. Example: 01
-              key = MS,
-     *  value = value of type 'UInt16', 3 digits number that represents the
-     *  milliseconds. Range [0:999]. Example: 007
+            key = enumeration TimeInfoKey
+    
+     *         key = YEAR, value = value of type 'UInt16', 4 digits number that
+     *  indicates the year. Example: 2012
+            key = MONTH, value = value of type
+     *  'UInt8', 2 digits number that indicates the month. Example: 03 means March
+      
+     *       key = DAY, value = value of type 'UInt8', 2 digits number that indicates
+     *  the day. Range [0:31]. Example: 07
+            key = HOUR, value = value of type
+     *  'UInt8', 2 digits number that indicates the hour. Range [0:23].  Example: 01
+    
+     *         key = MINUTE, value = value of type 'UInt8', 2 digits number that
+     *  represents the minutes. Range [0:59]. Example: 01
+            key = SECOND, value
+     *  = value of type 'UInt8', 2 digits number that represents the seconds. Range
+     *  [0:59]. Example: 01
+            key = MS, value = value of type 'UInt16', 3
+     *  digits number that represents the milliseconds. Range [0:999]. Example: 007
      */
     typedef std::unordered_map<TimeInfoKey, Value, CommonAPI::EnumHasher<TimeInfoKey>> TimeInfo;
     enum class PositionFeedbackKey: int32_t {
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStub.h b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStub.h
index 6381d59..8df954b 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStub.h
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStub.h
@@ -114,8 +114,8 @@ public:
     /**
      * GetSatelliteInfo = This method returns information about the current satellite
      *  constellation
-    		Note: If a requested value is invalid, it's not returned to
-     *  the client application
+            Note: If a requested value is invalid, it's not
+     *  returned to the client application
      */
     /// This is the method that will be called on remote calls on the method GetSatelliteInfo.
     virtual void GetSatelliteInfo(const std::shared_ptr<CommonAPI::ClientId> clientId, EnhancedPositionServiceTypes::Timestamp& timestamp, EnhancedPositionServiceTypes::SatelliteInfo& satelliteInfo) = 0;
@@ -127,7 +127,7 @@ public:
     /// This is the method that will be called on remote calls on the method GetTime.
     virtual void GetTime(const std::shared_ptr<CommonAPI::ClientId> clientId, EnhancedPositionServiceTypes::Timestamp& timestamp, EnhancedPositionServiceTypes::TimeInfo& time) = 0;
     /**
-     * PositionUpdate = This signal is called to notifiy a client application of a
+     * PositionUpdate = This signal is called to notify a client application of a
      *  position change. The update frequency is implementation specific. The maximal
      *  allowed frequency is 10Hz
      */
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.cpp b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.cpp
index 3cbb5f0..0712337 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.cpp
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.cpp
@@ -57,8 +57,8 @@ void EnhancedPositionStubDefault::GetPositionInfo(EnhancedPositionServiceTypes::
 /**
  * GetSatelliteInfo = This method returns information about the current satellite
  *  constellation
-		Note: If a requested value is invalid, it's not returned to
- *  the client application
+        Note: If a requested value is invalid, it's not
+ *  returned to the client application
  */
 void EnhancedPositionStubDefault::GetSatelliteInfo(const std::shared_ptr<CommonAPI::ClientId> clientId, EnhancedPositionServiceTypes::Timestamp& timestamp, EnhancedPositionServiceTypes::SatelliteInfo& satelliteInfo) {
     // Call old style methods in default 
@@ -83,7 +83,7 @@ void EnhancedPositionStubDefault::GetTime(EnhancedPositionServiceTypes::Timestam
 
 
 /**
- * PositionUpdate = This signal is called to notifiy a client application of a
+ * PositionUpdate = This signal is called to notify a client application of a
  *  position change. The update frequency is implementation specific. The maximal
  *  allowed frequency is 10Hz
  */
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.h b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.h
index 45f68f1..cb8c784 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.h
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/EnhancedPositionStubDefault.h
@@ -60,8 +60,8 @@ public:
     /**
      * GetSatelliteInfo = This method returns information about the current satellite
      *  constellation
-    		Note: If a requested value is invalid, it's not returned to
-     *  the client application
+            Note: If a requested value is invalid, it's not
+     *  returned to the client application
      */
     virtual void GetSatelliteInfo(const std::shared_ptr<CommonAPI::ClientId> clientId, EnhancedPositionServiceTypes::Timestamp& timestamp, EnhancedPositionServiceTypes::SatelliteInfo& satelliteInfo);
     virtual void GetSatelliteInfo(EnhancedPositionServiceTypes::Timestamp& timestamp, EnhancedPositionServiceTypes::SatelliteInfo& satelliteInfo);
@@ -76,7 +76,7 @@ public:
 
 
     /**
-     * PositionUpdate = This signal is called to notifiy a client application of a
+     * PositionUpdate = This signal is called to notify a client application of a
      *  position change. The update frequency is implementation specific. The maximal
      *  allowed frequency is 10Hz
      */
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusProxy.cpp b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusProxy.cpp
index 6949ea3..2ddf9c5 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusProxy.cpp
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusProxy.cpp
@@ -71,22 +71,22 @@ std::future<CommonAPI::CallStatus> PositionFeedbackDBusProxy::GetVersionAsync(Ge
  * SetPositionFeedback = This method allows a client application to provide the
  *  EnhancedPositionService with a position feedback
  */
-void PositionFeedbackDBusProxy::SetPositionFeedback(const std::vector<PositionFeedback::PositionFeedbackInfo>& feedback, const uint64_t& timestamp, const EnhancedPositionServiceTypes::PositionFeedbackType& feedbackType, CommonAPI::CallStatus& callStatus) {
-    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::vector<PositionFeedback::PositionFeedbackInfo>, uint64_t, EnhancedPositionServiceTypes::PositionFeedbackType>,
+void PositionFeedbackDBusProxy::SetPositionFeedback(const PositionFeedback::PositionFeedbackInfo& feedback, const uint64_t& timestamp, const EnhancedPositionServiceTypes::PositionFeedbackType& feedbackType, CommonAPI::CallStatus& callStatus) {
+    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<PositionFeedback::PositionFeedbackInfo, uint64_t, EnhancedPositionServiceTypes::PositionFeedbackType>,
                                      CommonAPI::DBus::DBusSerializableArguments<> >::callMethodWithReply(
         *this,
         "SetPositionFeedback",
-        "aa{i(yv)}ti",
+        "a{i(yv)}ti",
         feedback, timestamp, feedbackType,
         callStatus
         );
 }
-std::future<CommonAPI::CallStatus> PositionFeedbackDBusProxy::SetPositionFeedbackAsync(const std::vector<PositionFeedback::PositionFeedbackInfo>& feedback, const uint64_t& timestamp, const EnhancedPositionServiceTypes::PositionFeedbackType& feedbackType, SetPositionFeedbackAsyncCallback callback) {
-    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::vector<PositionFeedback::PositionFeedbackInfo>, uint64_t, EnhancedPositionServiceTypes::PositionFeedbackType>,
+std::future<CommonAPI::CallStatus> PositionFeedbackDBusProxy::SetPositionFeedbackAsync(const PositionFeedback::PositionFeedbackInfo& feedback, const uint64_t& timestamp, const EnhancedPositionServiceTypes::PositionFeedbackType& feedbackType, SetPositionFeedbackAsyncCallback callback) {
+    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<PositionFeedback::PositionFeedbackInfo, uint64_t, EnhancedPositionServiceTypes::PositionFeedbackType>,
                                      CommonAPI::DBus::DBusSerializableArguments<> >::callMethodAsync(
         *this,
         "SetPositionFeedback",
-        "aa{i(yv)}ti",
+        "a{i(yv)}ti",
         feedback, timestamp, feedbackType, 
         std::move(callback));
 }
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusProxy.h b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusProxy.h
index 1c3128c..6273398 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusProxy.h
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusProxy.h
@@ -56,8 +56,8 @@ class PositionFeedbackDBusProxy: virtual public PositionFeedbackProxyBase, virtu
      * SetPositionFeedback = This method allows a client application to provide the
      *  EnhancedPositionService with a position feedback
      */
-    virtual void SetPositionFeedback(const std::vector<PositionFeedback::PositionFeedbackInfo>& feedback, const uint64_t& timestamp, const EnhancedPositionServiceTypes::PositionFeedbackType& feedbackType, CommonAPI::CallStatus& callStatus);
-    virtual std::future<CommonAPI::CallStatus> SetPositionFeedbackAsync(const std::vector<PositionFeedback::PositionFeedbackInfo>& feedback, const uint64_t& timestamp, const EnhancedPositionServiceTypes::PositionFeedbackType& feedbackType, SetPositionFeedbackAsyncCallback callback);
+    virtual void SetPositionFeedback(const PositionFeedback::PositionFeedbackInfo& feedback, const uint64_t& timestamp, const EnhancedPositionServiceTypes::PositionFeedbackType& feedbackType, CommonAPI::CallStatus& callStatus);
+    virtual std::future<CommonAPI::CallStatus> SetPositionFeedbackAsync(const PositionFeedback::PositionFeedbackInfo& feedback, const uint64_t& timestamp, const EnhancedPositionServiceTypes::PositionFeedbackType& feedbackType, SetPositionFeedbackAsyncCallback callback);
 
 
     virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusStubAdapter.cpp b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusStubAdapter.cpp
index dc4cec1..c5c4b0f 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusStubAdapter.cpp
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusStubAdapter.cpp
@@ -58,7 +58,7 @@ const char* PositionFeedbackDBusStubAdapterInternal::getMethodsDBusIntrospection
          *  EnhancedPositionService with a position feedback
          */
         "<method name=\"SetPositionFeedback\">\n"
-            "<arg name=\"feedback\" type=\"aa{i(yv)}\" direction=\"in\" />\n"
+            "<arg name=\"feedback\" type=\"a{i(yv)}\" direction=\"in\" />\n"
             "<arg name=\"timestamp\" type=\"t\" direction=\"in\" />\n"
             "<arg name=\"feedbackType\" type=\"i\" direction=\"in\" />\n"
         "</method>\n"
@@ -89,7 +89,7 @@ CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
  */
 CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     PositionFeedbackStub,
-    std::tuple<std::vector<PositionFeedback::PositionFeedbackInfo>, uint64_t, EnhancedPositionServiceTypes::PositionFeedbackType>,
+    std::tuple<PositionFeedback::PositionFeedbackInfo, uint64_t, EnhancedPositionServiceTypes::PositionFeedbackType>,
     std::tuple<>
     > PositionFeedbackDBusStubAdapterInternal::setPositionFeedbackStubDispatcher(&PositionFeedbackStub::SetPositionFeedback, "");
 
@@ -140,7 +140,7 @@ PositionFeedbackDBusStubAdapterInternal::PositionFeedbackDBusStubAdapterInternal
              * SetPositionFeedback = This method allows a client application to provide the
              *  EnhancedPositionService with a position feedback
              */
-            { { "SetPositionFeedback", "aa{i(yv)}ti" }, &org::genivi::EnhancedPositionService::PositionFeedbackDBusStubAdapterInternal::setPositionFeedbackStubDispatcher }
+            { { "SetPositionFeedback", "a{i(yv)}ti" }, &org::genivi::EnhancedPositionService::PositionFeedbackDBusStubAdapterInternal::setPositionFeedbackStubDispatcher }
             }),
         stubAttributeTable_() {
 
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusStubAdapter.h b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusStubAdapter.h
index d2b3af5..da41534 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusStubAdapter.h
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackDBusStubAdapter.h
@@ -80,7 +80,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
  */
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
     PositionFeedbackStub,
-    std::tuple<std::vector<PositionFeedback::PositionFeedbackInfo>, uint64_t, EnhancedPositionServiceTypes::PositionFeedbackType>,
+    std::tuple<PositionFeedback::PositionFeedbackInfo, uint64_t, EnhancedPositionServiceTypes::PositionFeedbackType>,
     std::tuple<>
     > setPositionFeedbackStubDispatcher;
 
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackProxy.h b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackProxy.h
index 229978f..dfc01d3 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackProxy.h
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackProxy.h
@@ -75,7 +75,7 @@ public:
      * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus
      * will be set.
      */
-    virtual void SetPositionFeedback(const std::vector<PositionFeedback::PositionFeedbackInfo>& feedback, const uint64_t& timestamp, const EnhancedPositionServiceTypes::PositionFeedbackType& feedbackType, CommonAPI::CallStatus& callStatus);
+    virtual void SetPositionFeedback(const PositionFeedback::PositionFeedbackInfo& feedback, const uint64_t& timestamp, const EnhancedPositionServiceTypes::PositionFeedbackType& feedbackType, CommonAPI::CallStatus& callStatus);
     /**
      * Calls SetPositionFeedback with asynchronous semantics.
      * 
@@ -86,7 +86,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> SetPositionFeedbackAsync(const std::vector<PositionFeedback::PositionFeedbackInfo>& feedback, const uint64_t& timestamp, const EnhancedPositionServiceTypes::PositionFeedbackType& feedbackType, SetPositionFeedbackAsyncCallback callback);
+    virtual std::future<CommonAPI::CallStatus> SetPositionFeedbackAsync(const PositionFeedback::PositionFeedbackInfo& feedback, const uint64_t& timestamp, const EnhancedPositionServiceTypes::PositionFeedbackType& feedbackType, SetPositionFeedbackAsyncCallback callback);
 
 
     /**
@@ -173,12 +173,12 @@ std::future<CommonAPI::CallStatus> PositionFeedbackProxy<_AttributeExtensions...
  *  EnhancedPositionService with a position feedback
  */
 template <typename ... _AttributeExtensions>
-void PositionFeedbackProxy<_AttributeExtensions...>::SetPositionFeedback(const std::vector<PositionFeedback::PositionFeedbackInfo>& feedback, const uint64_t& timestamp, const EnhancedPositionServiceTypes::PositionFeedbackType& feedbackType, CommonAPI::CallStatus& callStatus) {
+void PositionFeedbackProxy<_AttributeExtensions...>::SetPositionFeedback(const PositionFeedback::PositionFeedbackInfo& feedback, const uint64_t& timestamp, const EnhancedPositionServiceTypes::PositionFeedbackType& feedbackType, CommonAPI::CallStatus& callStatus) {
     delegate_->SetPositionFeedback(feedback, timestamp, feedbackType, callStatus);
 }
 
 template <typename ... _AttributeExtensions>
-std::future<CommonAPI::CallStatus> PositionFeedbackProxy<_AttributeExtensions...>::SetPositionFeedbackAsync(const std::vector<PositionFeedback::PositionFeedbackInfo>& feedback, const uint64_t& timestamp, const EnhancedPositionServiceTypes::PositionFeedbackType& feedbackType, SetPositionFeedbackAsyncCallback callback) {
+std::future<CommonAPI::CallStatus> PositionFeedbackProxy<_AttributeExtensions...>::SetPositionFeedbackAsync(const PositionFeedback::PositionFeedbackInfo& feedback, const uint64_t& timestamp, const EnhancedPositionServiceTypes::PositionFeedbackType& feedbackType, SetPositionFeedbackAsyncCallback callback) {
     return delegate_->SetPositionFeedbackAsync(feedback, timestamp, feedbackType, callback);
 }
 
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackProxyBase.h b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackProxyBase.h
index 0a1e348..0deae02 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackProxyBase.h
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackProxyBase.h
@@ -60,8 +60,8 @@ class PositionFeedbackProxyBase: virtual public CommonAPI::Proxy {
      * SetPositionFeedback = This method allows a client application to provide the
      *  EnhancedPositionService with a position feedback
      */
-    virtual void SetPositionFeedback(const std::vector<PositionFeedback::PositionFeedbackInfo>& feedback, const uint64_t& timestamp, const EnhancedPositionServiceTypes::PositionFeedbackType& feedbackType, CommonAPI::CallStatus& callStatus) = 0;
-    virtual std::future<CommonAPI::CallStatus> SetPositionFeedbackAsync(const std::vector<PositionFeedback::PositionFeedbackInfo>& feedback, const uint64_t& timestamp, const EnhancedPositionServiceTypes::PositionFeedbackType& feedbackType, SetPositionFeedbackAsyncCallback callback) = 0;
+    virtual void SetPositionFeedback(const PositionFeedback::PositionFeedbackInfo& feedback, const uint64_t& timestamp, const EnhancedPositionServiceTypes::PositionFeedbackType& feedbackType, CommonAPI::CallStatus& callStatus) = 0;
+    virtual std::future<CommonAPI::CallStatus> SetPositionFeedbackAsync(const PositionFeedback::PositionFeedbackInfo& feedback, const uint64_t& timestamp, const EnhancedPositionServiceTypes::PositionFeedbackType& feedbackType, SetPositionFeedbackAsyncCallback callback) = 0;
 };
 
 } // namespace EnhancedPositionService
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStub.h b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStub.h
index df08f16..cc3c150 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStub.h
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStub.h
@@ -103,7 +103,7 @@ public:
      *  EnhancedPositionService with a position feedback
      */
     /// This is the method that will be called on remote calls on the method SetPositionFeedback.
-    virtual void SetPositionFeedback(const std::shared_ptr<CommonAPI::ClientId> clientId, std::vector<PositionFeedback::PositionFeedbackInfo> feedback, uint64_t timestamp, EnhancedPositionServiceTypes::PositionFeedbackType feedbackType) = 0;
+    virtual void SetPositionFeedback(const std::shared_ptr<CommonAPI::ClientId> clientId, PositionFeedback::PositionFeedbackInfo feedback, uint64_t timestamp, EnhancedPositionServiceTypes::PositionFeedbackType feedbackType) = 0;
 
     using CommonAPI::Stub<PositionFeedbackStubAdapter, PositionFeedbackStubRemoteEvent>::initStubAdapter;
     typedef CommonAPI::Stub<PositionFeedbackStubAdapter, PositionFeedbackStubRemoteEvent>::StubAdapterType StubAdapterType;
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.cpp b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.cpp
index 8b64ce1..f80e0d7 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.cpp
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.cpp
@@ -44,11 +44,11 @@ void PositionFeedbackStubDefault::GetVersion(EnhancedPositionServiceTypes::Versi
  * SetPositionFeedback = This method allows a client application to provide the
  *  EnhancedPositionService with a position feedback
  */
-void PositionFeedbackStubDefault::SetPositionFeedback(const std::shared_ptr<CommonAPI::ClientId> clientId, std::vector<PositionFeedback::PositionFeedbackInfo> feedback, uint64_t timestamp, EnhancedPositionServiceTypes::PositionFeedbackType feedbackType) {
+void PositionFeedbackStubDefault::SetPositionFeedback(const std::shared_ptr<CommonAPI::ClientId> clientId, PositionFeedback::PositionFeedbackInfo feedback, uint64_t timestamp, EnhancedPositionServiceTypes::PositionFeedbackType feedbackType) {
     // Call old style methods in default 
     SetPositionFeedback(feedback, timestamp, feedbackType);
 }
-void PositionFeedbackStubDefault::SetPositionFeedback(std::vector<PositionFeedback::PositionFeedbackInfo> feedback, uint64_t timestamp, EnhancedPositionServiceTypes::PositionFeedbackType feedbackType) {
+void PositionFeedbackStubDefault::SetPositionFeedback(PositionFeedback::PositionFeedbackInfo feedback, uint64_t timestamp, EnhancedPositionServiceTypes::PositionFeedbackType feedbackType) {
     // No operation in default
 }
 
diff --git a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.h b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.h
index c33497f..79fd96d 100644
--- a/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.h
+++ b/enhanced-position-service/commonapi-service/src/gen/org/genivi/EnhancedPositionService/PositionFeedbackStubDefault.h
@@ -53,8 +53,8 @@ public:
      * SetPositionFeedback = This method allows a client application to provide the
      *  EnhancedPositionService with a position feedback
      */
-    virtual void SetPositionFeedback(const std::shared_ptr<CommonAPI::ClientId> clientId, std::vector<PositionFeedback::PositionFeedbackInfo> feedback, uint64_t timestamp, EnhancedPositionServiceTypes::PositionFeedbackType feedbackType);
-    virtual void SetPositionFeedback(std::vector<PositionFeedback::PositionFeedbackInfo> feedback, uint64_t timestamp, EnhancedPositionServiceTypes::PositionFeedbackType feedbackType);
+    virtual void SetPositionFeedback(const std::shared_ptr<CommonAPI::ClientId> clientId, PositionFeedback::PositionFeedbackInfo feedback, uint64_t timestamp, EnhancedPositionServiceTypes::PositionFeedbackType feedbackType);
+    virtual void SetPositionFeedback(PositionFeedback::PositionFeedbackInfo feedback, uint64_t timestamp, EnhancedPositionServiceTypes::PositionFeedbackType feedbackType);
 
 
 
diff --git a/enhanced-position-service/commonapi-service/test/test-scripts/run-test.sh b/enhanced-position-service/commonapi-service/test/test-scripts/run-test.sh
new file mode 100755
index 0000000..5764d12
--- /dev/null
+++ b/enhanced-position-service/commonapi-service/test/test-scripts/run-test.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+###########################################################################
+# @licence app begin@
+# SPDX-License-Identifier: MPL-2.0
+#
+# Component Name: Positioning poC
+# Author: Marco Residori
+#
+# Copyright (C) 2013, XS Embedded GmbH
+# 
+# License:
+# 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/.
+#
+# @licence end@
+###########################################################################
+
+TOP_DIR=../../../..
+
+LOGS_DIR=$TOP_DIR/log-replayer/logs
+LOGREPLAYER_DIR=$TOP_DIR/build/log-replayer/src
+ENHPOS_DIR=$TOP_DIR/build/enhanced-position-service/commonapi-service/src
+
+echo "Test started"
+
+$LOGREPLAYER_DIR/log-replayer $LOGS_DIR/geneve-cologny.log > /dev/null 2>&1 &
+$ENHPOS_DIR/EnhancedPositionService &
+sleep 1
+$ENHPOS_DIR/EnhancedPositionClient &
+sleep 10
+
+echo "Test finished"
+killall EnhancedPositionClient
+killall EnhancedPositionService
+killall log-replayer
+
+