*PluginCommandInterfaceCAPI, PluginRoutingInterfaceCAPI, NodeStateCommunicatorCAPI with unit tests first version.

Choosing between DBUS and Common-API via cmake.

CommonAPI - legacy support for DBus properties (Set 1)

Signed-off-by: Christian Linke <christian.linke@bmw.de>
(cherry picked from commit ea96ef59e29466667c90b506426e2a5a9cdb82d2)

20 files changed, 3007 insertions, 0 deletions

diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/Consumer.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/Consumer.h
new file mode 100644
index 0000000..345bd3b
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/Consumer.h
@@ -0,0 +1,70 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2012, BMW AG
+ *
+ * This file is part of GENIVI Project AudioManager.
+ *
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \copyright
+ * 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/.
+ *
+ *
+ * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
+ *
+ * For further information see http://www.genivi.org/.
+*/
+#ifndef ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_H_
+#define ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_H_
+
+
+
+#define COMMONAPI_INTERNAL_COMPILATION
+
+#include <CommonAPI/types.h>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+namespace Consumer {
+
+class Consumer {
+ public:
+    virtual ~Consumer() { }
+
+    static inline const char* getInterfaceId();
+    static inline CommonAPI::Version getInterfaceVersion();
+};
+
+const char* Consumer::getInterfaceId() {
+    return "org.genivi.NodeStateManager.Consumer.Consumer";
+}
+
+CommonAPI::Version Consumer::getInterfaceVersion() {
+    return CommonAPI::Version(0, 1);
+}
+
+
+} // namespace Consumer
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
+
+namespace CommonAPI {
+
+}
+
+
+namespace std {
+    //hashes for types
+    
+    //hashes for error types
+}
+
+#endif // ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusProxy.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusProxy.cpp
new file mode 100644
index 0000000..e920d51
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusProxy.cpp
@@ -0,0 +1,292 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2012, BMW AG
+ *
+ * This file is part of GENIVI Project AudioManager.
+ *
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \copyright
+ * 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/.
+ *
+ *
+ * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
+ *
+ * For further information see http://www.genivi.org/.
+*/
+#include "ConsumerDBusProxy.h"
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+namespace Consumer {
+
+std::shared_ptr<CommonAPI::DBus::DBusProxy> createConsumerDBusProxy(
+                    const std::string& commonApiAddress,
+                    const std::string& interfaceName,
+                    const std::string& busName,
+                    const std::string& objectPath,
+                    const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyConnection) {
+    return std::make_shared<ConsumerDBusProxy>(commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection);
+}
+
+__attribute__((constructor)) void registerConsumerDBusProxy(void) {
+    CommonAPI::DBus::DBusFactory::registerProxyFactoryMethod(Consumer::getInterfaceId(),
+       &createConsumerDBusProxy);
+}
+
+ConsumerDBusProxy::ConsumerDBusProxy(
+                    const std::string& commonApiAddress,
+                    const std::string& interfaceName,
+                    const std::string& busName,
+                    const std::string& objectPath,
+                    const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyconnection):
+        CommonAPI::DBus::DBusProxy(commonApiAddress, interfaceName, busName, objectPath, dbusProxyconnection)
+,        restartReason_(*this, interfaceName.c_str(), "RestartReason"),
+        shutdownReason_(*this, interfaceName.c_str(), "ShutdownReason"),
+        wakeUpReason_(*this, interfaceName.c_str(), "WakeUpReason"),
+        bootMode_(*this, interfaceName.c_str(), "BootMode")
+,        nodeState_(*this, "NodeState", "i"),
+                        nodeApplicationMode_(*this, "NodeApplicationMode", "i"),
+                        sessionStateChanged_(*this, "SessionStateChanged", "sii")
+                 {
+}
+
+ConsumerDBusProxy::RestartReasonAttribute& ConsumerDBusProxy::getRestartReasonAttribute() {
+    return restartReason_;
+}
+ConsumerDBusProxy::ShutdownReasonAttribute& ConsumerDBusProxy::getShutdownReasonAttribute() {
+    return shutdownReason_;
+}
+ConsumerDBusProxy::WakeUpReasonAttribute& ConsumerDBusProxy::getWakeUpReasonAttribute() {
+    return wakeUpReason_;
+}
+ConsumerDBusProxy::BootModeAttribute& ConsumerDBusProxy::getBootModeAttribute() {
+    return bootMode_;
+}
+
+ConsumerDBusProxy::NodeStateEvent& ConsumerDBusProxy::getNodeStateEvent() {
+    return nodeState_;
+}
+ConsumerDBusProxy::NodeApplicationModeEvent& ConsumerDBusProxy::getNodeApplicationModeEvent() {
+    return nodeApplicationMode_;
+}
+ConsumerDBusProxy::SessionStateChangedEvent& ConsumerDBusProxy::getSessionStateChangedEvent() {
+    return sessionStateChanged_;
+}
+
+void ConsumerDBusProxy::GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& NodeStateId, int32_t& ErrorCode) {
+    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodWithReply(
+        *this,
+        "GetNodeState",
+        "",
+        callStatus
+        , NodeStateId, ErrorCode);
+}
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetNodeStateAsync(GetNodeStateAsyncCallback callback) {
+    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodAsync(
+        *this,
+        "GetNodeState",
+        "",
+        std::move(callback));
+}
+void ConsumerDBusProxy::SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t, int32_t>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
+        *this,
+        "SetSessionState",
+        "ssii",
+        SessionName, SessionOwner, SeatID, SessionState, 
+        callStatus
+        , ErrorCode);
+}
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, SetSessionStateAsyncCallback callback) {
+    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t, int32_t>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
+        *this,
+        "SetSessionState",
+        "ssii",
+        SessionName, SessionOwner, SeatID, SessionState, 
+        std::move(callback));
+}
+void ConsumerDBusProxy::GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode) {
+    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, int32_t>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodWithReply(
+        *this,
+        "GetSessionState",
+        "si",
+        SessionName, SeatID, 
+        callStatus
+        , SessionState, ErrorCode);
+}
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback) {
+    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, int32_t>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodAsync(
+        *this,
+        "GetSessionState",
+        "si",
+        SessionName, SeatID, 
+        std::move(callback));
+}
+void ConsumerDBusProxy::GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ApplicationModeId, int32_t& ErrorCode) {
+    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodWithReply(
+        *this,
+        "GetApplicationMode",
+        "",
+        callStatus
+        , ApplicationModeId, ErrorCode);
+}
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetApplicationModeAsync(GetApplicationModeAsyncCallback callback) {
+    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t, int32_t> >::callMethodAsync(
+        *this,
+        "GetApplicationMode",
+        "",
+        std::move(callback));
+}
+void ConsumerDBusProxy::RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t, uint32_t>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
+        *this,
+        "RegisterShutdownClient",
+        "ssuu",
+        BusName, ObjName, ShutdownMode, TimeoutMs, 
+        callStatus
+        , ErrorCode);
+}
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback) {
+    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t, uint32_t>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
+        *this,
+        "RegisterShutdownClient",
+        "ssuu",
+        BusName, ObjName, ShutdownMode, TimeoutMs, 
+        std::move(callback));
+}
+void ConsumerDBusProxy::UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
+        *this,
+        "UnRegisterShutdownClient",
+        "ssu",
+        BusName, ObjName, ShutdownMode, 
+        callStatus
+        , ErrorCode);
+}
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback) {
+    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, uint32_t>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
+        *this,
+        "UnRegisterShutdownClient",
+        "ssu",
+        BusName, ObjName, ShutdownMode, 
+        std::move(callback));
+}
+void ConsumerDBusProxy::RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t, int32_t>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
+        *this,
+        "RegisterSession",
+        "ssii",
+        SessionName, SessionOwner, SeatID, SessionState, 
+        callStatus
+        , ErrorCode);
+}
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback) {
+    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t, int32_t>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
+        *this,
+        "RegisterSession",
+        "ssii",
+        SessionName, SessionOwner, SeatID, SessionState, 
+        std::move(callback));
+}
+void ConsumerDBusProxy::UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
+        *this,
+        "UnRegisterSession",
+        "ssi",
+        SessionName, SessionOwner, SeatID, 
+        callStatus
+        , ErrorCode);
+}
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback) {
+    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, std::string, int32_t>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
+        *this,
+        "UnRegisterSession",
+        "ssi",
+        SessionName, SessionOwner, SeatID, 
+        std::move(callback));
+}
+void ConsumerDBusProxy::GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count) {
+    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
+                                     CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodWithReply(
+        *this,
+        "GetAppHealthCount",
+        "",
+        callStatus
+        , Count);
+}
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback) {
+    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
+                                     CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodAsync(
+        *this,
+        "GetAppHealthCount",
+        "",
+        std::move(callback));
+}
+void ConsumerDBusProxy::GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version) {
+    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
+                                     CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodWithReply(
+        *this,
+        "GetInterfaceVersion",
+        "",
+        callStatus
+        , Version);
+}
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback) {
+    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<>,
+                                     CommonAPI::DBus::DBusSerializableArguments<uint32_t> >::callMethodAsync(
+        *this,
+        "GetInterfaceVersion",
+        "",
+        std::move(callback));
+}
+void ConsumerDBusProxy::LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, int32_t>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
+        *this,
+        "LifecycleRequestComplete",
+        "ui",
+        RequestId, Status, 
+        callStatus
+        , ErrorCode);
+}
+std::future<CommonAPI::CallStatus> ConsumerDBusProxy::LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback) {
+    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, int32_t>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
+        *this,
+        "LifecycleRequestComplete",
+        "ui",
+        RequestId, Status, 
+        std::move(callback));
+}
+
+void ConsumerDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
+    ownVersionMajor = 0;
+    ownVersionMinor = 1;
+}
+
+} // namespace Consumer
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusProxy.h
new file mode 100644
index 0000000..c3db1df
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusProxy.h
@@ -0,0 +1,114 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2012, BMW AG
+ *
+ * This file is part of GENIVI Project AudioManager.
+ *
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \copyright
+ * 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/.
+ *
+ *
+ * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
+ *
+ * For further information see http://www.genivi.org/.
+*/
+#ifndef ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_DBUS_PROXY_H_
+#define ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_DBUS_PROXY_H_
+
+#include <org/genivi/NodeStateManager/Consumer/ConsumerProxyBase.h>
+
+#define COMMONAPI_INTERNAL_COMPILATION
+
+#include <CommonAPI/DBus/DBusFactory.h>
+#include <CommonAPI/DBus/DBusProxy.h>
+#include <CommonAPI/DBus/DBusAttribute.h>
+#include <CommonAPI/DBus/DBusEvent.h>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+#include <string>
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+namespace Consumer {
+
+class ConsumerDBusProxy: virtual public ConsumerProxyBase, virtual public CommonAPI::DBus::DBusProxy {
+ public:
+    ConsumerDBusProxy(
+                    const std::string& commonApiAddress,
+                    const std::string& interfaceName,
+                    const std::string& busName,
+                    const std::string& objectPath,
+                    const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyconnection);
+
+    virtual ~ConsumerDBusProxy() { }
+
+    virtual RestartReasonAttribute& getRestartReasonAttribute();
+    virtual ShutdownReasonAttribute& getShutdownReasonAttribute();
+    virtual WakeUpReasonAttribute& getWakeUpReasonAttribute();
+    virtual BootModeAttribute& getBootModeAttribute();
+
+    virtual NodeStateEvent& getNodeStateEvent();
+    virtual NodeApplicationModeEvent& getNodeApplicationModeEvent();
+    virtual SessionStateChangedEvent& getSessionStateChangedEvent();
+
+
+    virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& NodeStateId, int32_t& ErrorCode);
+    virtual std::future<CommonAPI::CallStatus> GetNodeStateAsync(GetNodeStateAsyncCallback callback);
+
+    virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    virtual std::future<CommonAPI::CallStatus> SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, SetSessionStateAsyncCallback callback);
+
+    virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode);
+    virtual std::future<CommonAPI::CallStatus> GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback);
+
+    virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ApplicationModeId, int32_t& ErrorCode);
+    virtual std::future<CommonAPI::CallStatus> GetApplicationModeAsync(GetApplicationModeAsyncCallback callback);
+
+    virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    virtual std::future<CommonAPI::CallStatus> RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback);
+
+    virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    virtual std::future<CommonAPI::CallStatus> UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback);
+
+    virtual void RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    virtual std::future<CommonAPI::CallStatus> RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback);
+
+    virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    virtual std::future<CommonAPI::CallStatus> UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback);
+
+    virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count);
+    virtual std::future<CommonAPI::CallStatus> GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback);
+
+    virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version);
+    virtual std::future<CommonAPI::CallStatus> GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback);
+
+    virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    virtual std::future<CommonAPI::CallStatus> LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback);
+    
+    virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
+
+ private:
+    CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopAttribute<RestartReasonAttribute>> restartReason_;
+    CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopAttribute<ShutdownReasonAttribute>> shutdownReason_;
+    CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopAttribute<WakeUpReasonAttribute>> wakeUpReason_;
+    CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopAttribute<BootModeAttribute>> bootMode_;
+
+    CommonAPI::DBus::DBusEvent<NodeStateEvent> nodeState_;
+    CommonAPI::DBus::DBusEvent<NodeApplicationModeEvent> nodeApplicationMode_;
+    CommonAPI::DBus::DBusEvent<SessionStateChangedEvent> sessionStateChanged_;
+};
+
+} // namespace Consumer
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
+
+#endif // ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_DBUS_PROXY_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusStubAdapter.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusStubAdapter.cpp
new file mode 100644
index 0000000..a72ba16
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusStubAdapter.cpp
@@ -0,0 +1,374 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2012, BMW AG
+ *
+ * This file is part of GENIVI Project AudioManager.
+ *
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \copyright
+ * 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/.
+ *
+ *
+ * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
+ *
+ * For further information see http://www.genivi.org/.
+*/
+#include "ConsumerDBusStubAdapter.h"
+#include <org/genivi/NodeStateManager/Consumer/Consumer.h>
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+namespace Consumer {
+
+std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> createConsumerDBusStubAdapter(
+                   const std::string& commonApiAddress,
+                   const std::string& interfaceName,
+                   const std::string& busName,
+                   const std::string& objectPath,
+                   const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyConnection,
+                   const std::shared_ptr<CommonAPI::StubBase>& stubBase) {
+    return std::make_shared<ConsumerDBusStubAdapter>(commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection, stubBase);
+}
+
+__attribute__((constructor)) void registerConsumerDBusStubAdapter(void) {
+    CommonAPI::DBus::DBusFactory::registerAdapterFactoryMethod(Consumer::getInterfaceId(),
+                                                               &createConsumerDBusStubAdapter);
+}
+
+ConsumerDBusStubAdapter::ConsumerDBusStubAdapter(
+        const std::string& commonApiAddress,
+        const std::string& dbusInterfaceName,
+        const std::string& dbusBusName,
+        const std::string& dbusObjectPath,
+        const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection,
+        const std::shared_ptr<CommonAPI::StubBase>& stub):
+        ConsumerDBusStubAdapterHelper(commonApiAddress, dbusInterfaceName, dbusBusName, dbusObjectPath, dbusConnection, std::dynamic_pointer_cast<ConsumerStub>(stub)) {
+}
+
+const char* ConsumerDBusStubAdapter::getMethodsDBusIntrospectionXmlData() const {
+    return
+        "<method name=\"getRestartReasonAttribute\">\n"
+        	"<arg name=\"value\" type=\"i\" direction=\"out\" />"
+        "</method>\n"
+        "<method name=\"setRestartReasonAttribute\">\n"
+            "<arg name=\"requestedValue\" type=\"i\" direction=\"in\" />\n"
+            "<arg name=\"setValue\" type=\"i\" direction=\"out\" />\n"
+        "</method>\n"
+        "<signal name=\"onRestartReasonAttributeChanged\">\n"
+            "<arg name=\"changedValue\" type=\"i\" />\n"
+        "</signal>\n"
+        "<method name=\"getShutdownReasonAttribute\">\n"
+        	"<arg name=\"value\" type=\"i\" direction=\"out\" />"
+        "</method>\n"
+        "<method name=\"setShutdownReasonAttribute\">\n"
+            "<arg name=\"requestedValue\" type=\"i\" direction=\"in\" />\n"
+            "<arg name=\"setValue\" type=\"i\" direction=\"out\" />\n"
+        "</method>\n"
+        "<signal name=\"onShutdownReasonAttributeChanged\">\n"
+            "<arg name=\"changedValue\" type=\"i\" />\n"
+        "</signal>\n"
+        "<method name=\"getWakeUpReasonAttribute\">\n"
+        	"<arg name=\"value\" type=\"i\" direction=\"out\" />"
+        "</method>\n"
+        "<method name=\"setWakeUpReasonAttribute\">\n"
+            "<arg name=\"requestedValue\" type=\"i\" direction=\"in\" />\n"
+            "<arg name=\"setValue\" type=\"i\" direction=\"out\" />\n"
+        "</method>\n"
+        "<signal name=\"onWakeUpReasonAttributeChanged\">\n"
+            "<arg name=\"changedValue\" type=\"i\" />\n"
+        "</signal>\n"
+        "<method name=\"getBootModeAttribute\">\n"
+        	"<arg name=\"value\" type=\"i\" direction=\"out\" />"
+        "</method>\n"
+        "<method name=\"setBootModeAttribute\">\n"
+            "<arg name=\"requestedValue\" type=\"i\" direction=\"in\" />\n"
+            "<arg name=\"setValue\" type=\"i\" direction=\"out\" />\n"
+        "</method>\n"
+        "<signal name=\"onBootModeAttributeChanged\">\n"
+            "<arg name=\"changedValue\" type=\"i\" />\n"
+        "</signal>\n"
+        "<signal name=\"NodeState\">\n"
+            "<arg name=\"NodeState\" type=\"i\" />\n"
+        "</signal>\n"
+        "<signal name=\"NodeApplicationMode\">\n"
+            "<arg name=\"ApplicationModeId\" type=\"i\" />\n"
+        "</signal>\n"
+        "<signal name=\"SessionStateChanged\">\n"
+            "<arg name=\"SessionStateName\" type=\"s\" />\n"
+            "<arg name=\"SeatID\" type=\"i\" />\n"
+            "<arg name=\"SessionState\" type=\"i\" />\n"
+        "</signal>\n"
+        "<method name=\"GetNodeState\">\n"
+            "<arg name=\"NodeStateId\" type=\"i\" direction=\"out\" />\n"
+            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
+        "</method>\n"
+        "<method name=\"SetSessionState\">\n"
+            "<arg name=\"SessionName\" type=\"s\" direction=\"in\" />\n"
+            "<arg name=\"SessionOwner\" type=\"s\" direction=\"in\" />\n"
+            "<arg name=\"SeatID\" type=\"i\" direction=\"in\" />\n"
+            "<arg name=\"SessionState\" type=\"i\" direction=\"in\" />\n"
+            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
+        "</method>\n"
+        "<method name=\"GetSessionState\">\n"
+            "<arg name=\"SessionName\" type=\"s\" direction=\"in\" />\n"
+            "<arg name=\"SeatID\" type=\"i\" direction=\"in\" />\n"
+            "<arg name=\"SessionState\" type=\"i\" direction=\"out\" />\n"
+            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
+        "</method>\n"
+        "<method name=\"GetApplicationMode\">\n"
+            "<arg name=\"ApplicationModeId\" type=\"i\" direction=\"out\" />\n"
+            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
+        "</method>\n"
+        "<method name=\"RegisterShutdownClient\">\n"
+            "<arg name=\"BusName\" type=\"s\" direction=\"in\" />\n"
+            "<arg name=\"ObjName\" type=\"s\" direction=\"in\" />\n"
+            "<arg name=\"ShutdownMode\" type=\"u\" direction=\"in\" />\n"
+            "<arg name=\"TimeoutMs\" type=\"u\" direction=\"in\" />\n"
+            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
+        "</method>\n"
+        "<method name=\"UnRegisterShutdownClient\">\n"
+            "<arg name=\"BusName\" type=\"s\" direction=\"in\" />\n"
+            "<arg name=\"ObjName\" type=\"s\" direction=\"in\" />\n"
+            "<arg name=\"ShutdownMode\" type=\"u\" direction=\"in\" />\n"
+            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
+        "</method>\n"
+        "<method name=\"RegisterSession\">\n"
+            "<arg name=\"SessionName\" type=\"s\" direction=\"in\" />\n"
+            "<arg name=\"SessionOwner\" type=\"s\" direction=\"in\" />\n"
+            "<arg name=\"SeatID\" type=\"i\" direction=\"in\" />\n"
+            "<arg name=\"SessionState\" type=\"i\" direction=\"in\" />\n"
+            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
+        "</method>\n"
+        "<method name=\"UnRegisterSession\">\n"
+            "<arg name=\"SessionName\" type=\"s\" direction=\"in\" />\n"
+            "<arg name=\"SessionOwner\" type=\"s\" direction=\"in\" />\n"
+            "<arg name=\"SeatID\" type=\"i\" direction=\"in\" />\n"
+            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
+        "</method>\n"
+        "<method name=\"GetAppHealthCount\">\n"
+            "<arg name=\"Count\" type=\"u\" direction=\"out\" />\n"
+        "</method>\n"
+        "<method name=\"GetInterfaceVersion\">\n"
+            "<arg name=\"Version\" type=\"u\" direction=\"out\" />\n"
+        "</method>\n"
+        "<method name=\"LifecycleRequestComplete\">\n"
+            "<arg name=\"RequestId\" type=\"u\" direction=\"in\" />\n"
+            "<arg name=\"Status\" type=\"i\" direction=\"in\" />\n"
+            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
+        "</method>\n"
+    ;
+}
+
+
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+        ConsumerStub,
+        int32_t
+        > getRestartReasonAttributeStubDispatcher(&ConsumerStub::getRestartReasonAttribute, "i");
+static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
+        ConsumerStub,
+        int32_t
+        > setRestartReasonAttributeStubDispatcher(
+                &ConsumerStub::getRestartReasonAttribute,
+                &ConsumerStubRemoteEvent::onRemoteSetRestartReasonAttribute,
+                &ConsumerStubRemoteEvent::onRemoteRestartReasonAttributeChanged,
+                &ConsumerStubAdapter::fireRestartReasonAttributeChanged,
+                "i");
+
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+        ConsumerStub,
+        int32_t
+        > getShutdownReasonAttributeStubDispatcher(&ConsumerStub::getShutdownReasonAttribute, "i");
+static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
+        ConsumerStub,
+        int32_t
+        > setShutdownReasonAttributeStubDispatcher(
+                &ConsumerStub::getShutdownReasonAttribute,
+                &ConsumerStubRemoteEvent::onRemoteSetShutdownReasonAttribute,
+                &ConsumerStubRemoteEvent::onRemoteShutdownReasonAttributeChanged,
+                &ConsumerStubAdapter::fireShutdownReasonAttributeChanged,
+                "i");
+
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+        ConsumerStub,
+        int32_t
+        > getWakeUpReasonAttributeStubDispatcher(&ConsumerStub::getWakeUpReasonAttribute, "i");
+static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
+        ConsumerStub,
+        int32_t
+        > setWakeUpReasonAttributeStubDispatcher(
+                &ConsumerStub::getWakeUpReasonAttribute,
+                &ConsumerStubRemoteEvent::onRemoteSetWakeUpReasonAttribute,
+                &ConsumerStubRemoteEvent::onRemoteWakeUpReasonAttributeChanged,
+                &ConsumerStubAdapter::fireWakeUpReasonAttributeChanged,
+                "i");
+
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+        ConsumerStub,
+        int32_t
+        > getBootModeAttributeStubDispatcher(&ConsumerStub::getBootModeAttribute, "i");
+static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
+        ConsumerStub,
+        int32_t
+        > setBootModeAttributeStubDispatcher(
+                &ConsumerStub::getBootModeAttribute,
+                &ConsumerStubRemoteEvent::onRemoteSetBootModeAttribute,
+                &ConsumerStubRemoteEvent::onRemoteBootModeAttributeChanged,
+                &ConsumerStubAdapter::fireBootModeAttributeChanged,
+                "i");
+
+
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ConsumerStub,
+    std::tuple<>,
+    std::tuple<int32_t, int32_t>
+    > getNodeStateStubDispatcher(&ConsumerStub::GetNodeState, "ii");
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ConsumerStub,
+    std::tuple<std::string, std::string, int32_t, int32_t>,
+    std::tuple<int32_t>
+    > setSessionStateStubDispatcher(&ConsumerStub::SetSessionState, "i");
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ConsumerStub,
+    std::tuple<std::string, int32_t>,
+    std::tuple<int32_t, int32_t>
+    > getSessionStateStubDispatcher(&ConsumerStub::GetSessionState, "ii");
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ConsumerStub,
+    std::tuple<>,
+    std::tuple<int32_t, int32_t>
+    > getApplicationModeStubDispatcher(&ConsumerStub::GetApplicationMode, "ii");
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ConsumerStub,
+    std::tuple<std::string, std::string, uint32_t, uint32_t>,
+    std::tuple<int32_t>
+    > registerShutdownClientStubDispatcher(&ConsumerStub::RegisterShutdownClient, "i");
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ConsumerStub,
+    std::tuple<std::string, std::string, uint32_t>,
+    std::tuple<int32_t>
+    > unRegisterShutdownClientStubDispatcher(&ConsumerStub::UnRegisterShutdownClient, "i");
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ConsumerStub,
+    std::tuple<std::string, std::string, int32_t, int32_t>,
+    std::tuple<int32_t>
+    > registerSessionStubDispatcher(&ConsumerStub::RegisterSession, "i");
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ConsumerStub,
+    std::tuple<std::string, std::string, int32_t>,
+    std::tuple<int32_t>
+    > unRegisterSessionStubDispatcher(&ConsumerStub::UnRegisterSession, "i");
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ConsumerStub,
+    std::tuple<>,
+    std::tuple<uint32_t>
+    > getAppHealthCountStubDispatcher(&ConsumerStub::GetAppHealthCount, "u");
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ConsumerStub,
+    std::tuple<>,
+    std::tuple<uint32_t>
+    > getInterfaceVersionStubDispatcher(&ConsumerStub::GetInterfaceVersion, "u");
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ConsumerStub,
+    std::tuple<uint32_t, int32_t>,
+    std::tuple<int32_t>
+    > lifecycleRequestCompleteStubDispatcher(&ConsumerStub::LifecycleRequestComplete, "i");
+
+void ConsumerDBusStubAdapter::fireRestartReasonAttributeChanged(const int32_t& value) {
+	CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
+        ::sendSignal(
+            *this,
+            "onRestartReasonAttributeChanged",
+            "i",
+            value
+    );
+}
+void ConsumerDBusStubAdapter::fireShutdownReasonAttributeChanged(const int32_t& value) {
+	CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
+        ::sendSignal(
+            *this,
+            "onShutdownReasonAttributeChanged",
+            "i",
+            value
+    );
+}
+void ConsumerDBusStubAdapter::fireWakeUpReasonAttributeChanged(const int32_t& value) {
+	CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
+        ::sendSignal(
+            *this,
+            "onWakeUpReasonAttributeChanged",
+            "i",
+            value
+    );
+}
+void ConsumerDBusStubAdapter::fireBootModeAttributeChanged(const int32_t& value) {
+	CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
+        ::sendSignal(
+            *this,
+            "onBootModeAttributeChanged",
+            "i",
+            value
+    );
+}
+
+void ConsumerDBusStubAdapter::fireNodeStateEvent(const int32_t& NodeState) {
+    CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
+            ::sendSignal(
+                *this,
+                "NodeState",
+                "i",
+                NodeState
+        );
+}
+void ConsumerDBusStubAdapter::fireNodeApplicationModeEvent(const int32_t& ApplicationModeId) {
+    CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
+            ::sendSignal(
+                *this,
+                "NodeApplicationMode",
+                "i",
+                ApplicationModeId
+        );
+}
+void ConsumerDBusStubAdapter::fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState) {
+    CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<std::string, int32_t, int32_t>>
+            ::sendSignal(
+                *this,
+                "SessionStateChanged",
+                "sii",
+                SessionStateName, SeatID, SessionState
+        );
+}
+
+} // namespace Consumer
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
+
+template<>
+const org::genivi::NodeStateManager::Consumer::ConsumerDBusStubAdapterHelper::StubDispatcherTable org::genivi::NodeStateManager::Consumer::ConsumerDBusStubAdapterHelper::stubDispatcherTable_ = {
+    { { "getRestartReasonAttribute", "" }, &org::genivi::NodeStateManager::Consumer::getRestartReasonAttributeStubDispatcher }
+    , { { "setRestartReasonAttribute", "i" }, &org::genivi::NodeStateManager::Consumer::setRestartReasonAttributeStubDispatcher },
+    { { "getShutdownReasonAttribute", "" }, &org::genivi::NodeStateManager::Consumer::getShutdownReasonAttributeStubDispatcher }
+    , { { "setShutdownReasonAttribute", "i" }, &org::genivi::NodeStateManager::Consumer::setShutdownReasonAttributeStubDispatcher },
+    { { "getWakeUpReasonAttribute", "" }, &org::genivi::NodeStateManager::Consumer::getWakeUpReasonAttributeStubDispatcher }
+    , { { "setWakeUpReasonAttribute", "i" }, &org::genivi::NodeStateManager::Consumer::setWakeUpReasonAttributeStubDispatcher },
+    { { "getBootModeAttribute", "" }, &org::genivi::NodeStateManager::Consumer::getBootModeAttributeStubDispatcher }
+    , { { "setBootModeAttribute", "i" }, &org::genivi::NodeStateManager::Consumer::setBootModeAttributeStubDispatcher }
+    ,
+    { { "GetNodeState", "" }, &org::genivi::NodeStateManager::Consumer::getNodeStateStubDispatcher },
+    { { "SetSessionState", "ssii" }, &org::genivi::NodeStateManager::Consumer::setSessionStateStubDispatcher },
+    { { "GetSessionState", "si" }, &org::genivi::NodeStateManager::Consumer::getSessionStateStubDispatcher },
+    { { "GetApplicationMode", "" }, &org::genivi::NodeStateManager::Consumer::getApplicationModeStubDispatcher },
+    { { "RegisterShutdownClient", "ssuu" }, &org::genivi::NodeStateManager::Consumer::registerShutdownClientStubDispatcher },
+    { { "UnRegisterShutdownClient", "ssu" }, &org::genivi::NodeStateManager::Consumer::unRegisterShutdownClientStubDispatcher },
+    { { "RegisterSession", "ssii" }, &org::genivi::NodeStateManager::Consumer::registerSessionStubDispatcher },
+    { { "UnRegisterSession", "ssi" }, &org::genivi::NodeStateManager::Consumer::unRegisterSessionStubDispatcher },
+    { { "GetAppHealthCount", "" }, &org::genivi::NodeStateManager::Consumer::getAppHealthCountStubDispatcher },
+    { { "GetInterfaceVersion", "" }, &org::genivi::NodeStateManager::Consumer::getInterfaceVersionStubDispatcher },
+    { { "LifecycleRequestComplete", "ui" }, &org::genivi::NodeStateManager::Consumer::lifecycleRequestCompleteStubDispatcher }
+};
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusStubAdapter.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusStubAdapter.h
new file mode 100644
index 0000000..8b43c21
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerDBusStubAdapter.h
@@ -0,0 +1,68 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2012, BMW AG
+ *
+ * This file is part of GENIVI Project AudioManager.
+ *
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \copyright
+ * 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/.
+ *
+ *
+ * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
+ *
+ * For further information see http://www.genivi.org/.
+*/
+#ifndef ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_DBUS_STUB_ADAPTER_H_
+#define ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_DBUS_STUB_ADAPTER_H_
+
+#include <org/genivi/NodeStateManager/Consumer/ConsumerStub.h>
+
+#define COMMONAPI_INTERNAL_COMPILATION
+
+#include <CommonAPI/DBus/DBusStubAdapterHelper.h>
+#include <CommonAPI/DBus/DBusFactory.h>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+namespace Consumer {
+
+typedef CommonAPI::DBus::DBusStubAdapterHelper<ConsumerStub> ConsumerDBusStubAdapterHelper;
+
+class ConsumerDBusStubAdapter: public ConsumerStubAdapter, public ConsumerDBusStubAdapterHelper {
+ public:
+    ConsumerDBusStubAdapter(
+            const std::string& commonApiAddress,
+            const std::string& dbusInterfaceName,
+            const std::string& dbusBusName,
+            const std::string& dbusObjectPath,
+            const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection,
+            const std::shared_ptr<CommonAPI::StubBase>& stub);
+    
+    void fireRestartReasonAttributeChanged(const int32_t& value);
+    void fireShutdownReasonAttributeChanged(const int32_t& value);
+    void fireWakeUpReasonAttributeChanged(const int32_t& value);
+    void fireBootModeAttributeChanged(const int32_t& value);
+
+    void fireNodeStateEvent(const int32_t& NodeState);
+    void fireNodeApplicationModeEvent(const int32_t& ApplicationModeId);
+    void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState);
+
+ protected:
+    virtual const char* getMethodsDBusIntrospectionXmlData() const;
+};
+
+} // namespace Consumer
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
+
+#endif // ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_DBUS_STUB_ADAPTER_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerProxy.h
new file mode 100644
index 0000000..273fa8b
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerProxy.h
@@ -0,0 +1,619 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2012, BMW AG
+ *
+ * This file is part of GENIVI Project AudioManager.
+ *
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \copyright
+ * 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/.
+ *
+ *
+ * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
+ *
+ * For further information see http://www.genivi.org/.
+*/
+#ifndef ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_PROXY_H_
+#define ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_PROXY_H_
+
+#include "ConsumerProxyBase.h"
+
+#define COMMONAPI_INTERNAL_COMPILATION
+
+#include <CommonAPI/AttributeExtension.h>
+#include <CommonAPI/Factory.h>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+namespace Consumer {
+
+template <typename ... _AttributeExtensions>
+class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase, public _AttributeExtensions... {
+ public:
+    ConsumerProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
+    ~ConsumerProxy();
+
+    /// Returns the wrapper class that provides access to the attribute RestartReason.
+    virtual RestartReasonAttribute& getRestartReasonAttribute() {
+        return delegate_->getRestartReasonAttribute();
+    }
+
+    /// Returns the wrapper class that provides access to the attribute ShutdownReason.
+    virtual ShutdownReasonAttribute& getShutdownReasonAttribute() {
+        return delegate_->getShutdownReasonAttribute();
+    }
+
+    /// Returns the wrapper class that provides access to the attribute WakeUpReason.
+    virtual WakeUpReasonAttribute& getWakeUpReasonAttribute() {
+        return delegate_->getWakeUpReasonAttribute();
+    }
+
+    /// Returns the wrapper class that provides access to the attribute BootMode.
+    virtual BootModeAttribute& getBootModeAttribute() {
+        return delegate_->getBootModeAttribute();
+    }
+
+
+    /// Returns the wrapper class that provides access to the broadcast NodeState.
+    virtual NodeStateEvent& getNodeStateEvent() {
+        return delegate_->getNodeStateEvent();
+    }
+
+    /// Returns the wrapper class that provides access to the broadcast NodeApplicationMode.
+    virtual NodeApplicationModeEvent& getNodeApplicationModeEvent() {
+        return delegate_->getNodeApplicationModeEvent();
+    }
+
+    /// Returns the wrapper class that provides access to the broadcast SessionStateChanged.
+    virtual SessionStateChangedEvent& getSessionStateChangedEvent() {
+        return delegate_->getSessionStateChangedEvent();
+    }
+
+
+
+    /**
+     * Calls GetNodeState 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.
+     * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
+     */
+    virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& NodeStateId, int32_t& ErrorCode);
+    /**
+     * Calls GetNodeState 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> GetNodeStateAsync(GetNodeStateAsyncCallback callback);
+
+    /**
+     * Calls SetSessionState with synchronous semantics.
+     * 
+     * All const parameters are input parameters to this method.
+     * 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.
+     * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
+     */
+    virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    /**
+     * Calls SetSessionState 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> SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, SetSessionStateAsyncCallback callback);
+
+    /**
+     * Calls GetSessionState with synchronous semantics.
+     * 
+     * All const parameters are input parameters to this method.
+     * 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.
+     * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
+     */
+    virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode);
+    /**
+     * Calls GetSessionState 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> GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback);
+
+    /**
+     * Calls GetApplicationMode 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.
+     * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
+     */
+    virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ApplicationModeId, int32_t& ErrorCode);
+    /**
+     * Calls GetApplicationMode 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> GetApplicationModeAsync(GetApplicationModeAsyncCallback callback);
+
+    /**
+     * Calls RegisterShutdownClient with synchronous semantics.
+     * 
+     * All const parameters are input parameters to this method.
+     * 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.
+     * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
+     */
+    virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    /**
+     * Calls RegisterShutdownClient 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> RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback);
+
+    /**
+     * Calls UnRegisterShutdownClient with synchronous semantics.
+     * 
+     * All const parameters are input parameters to this method.
+     * 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.
+     * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
+     */
+    virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    /**
+     * Calls UnRegisterShutdownClient 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> UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback);
+
+    /**
+     * Calls RegisterSession with synchronous semantics.
+     * 
+     * All const parameters are input parameters to this method.
+     * 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.
+     * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
+     */
+    virtual void RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    /**
+     * Calls RegisterSession 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> RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback);
+
+    /**
+     * Calls UnRegisterSession with synchronous semantics.
+     * 
+     * All const parameters are input parameters to this method.
+     * 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.
+     * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
+     */
+    virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    /**
+     * Calls UnRegisterSession 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> UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback);
+
+    /**
+     * Calls GetAppHealthCount 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.
+     * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
+     */
+    virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count);
+    /**
+     * Calls GetAppHealthCount 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> GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback);
+
+    /**
+     * Calls GetInterfaceVersion 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.
+     * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
+     */
+    virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version);
+    /**
+     * Calls GetInterfaceVersion 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> GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback);
+
+    /**
+     * Calls LifecycleRequestComplete with synchronous semantics.
+     * 
+     * All const parameters are input parameters to this method.
+     * 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.
+     * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
+     */
+    virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    /**
+     * Calls LifecycleRequestComplete 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> LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback);
+
+    /// Returns the CommonAPI address of the remote partner this proxy communicates with.
+    virtual std::string getAddress() const;
+
+    /// Returns the domain of the remote partner this proxy communicates with.
+    virtual const std::string& getDomain() const;
+
+    /// Returns the service ID of the remote partner this proxy communicates with.
+    virtual const std::string& getServiceId() const;
+
+    /// Returns the instance ID of the remote partner this proxy communicates with.
+    virtual const std::string& getInstanceId() const;
+
+    /// Returns true if the remote partner for this proxy is available.
+    virtual bool isAvailable() 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<ConsumerProxyBase> delegate_;
+};
+
+namespace ConsumerExtensions {
+    template <template <typename > class _ExtensionType>
+    class RestartReasonAttributeExtension {
+     public:
+        typedef _ExtensionType<ConsumerProxyBase::RestartReasonAttribute> extension_type;
+    
+        static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<ConsumerProxyBase::RestartReasonAttribute>, extension_type>::value,
+                      "Not CommonAPI Attribute Extension!");
+    
+        RestartReasonAttributeExtension(ConsumerProxyBase& proxy): attributeExtension_(proxy.getRestartReasonAttribute()) {
+        }
+    
+        inline extension_type& getRestartReasonAttributeExtension() {
+            return attributeExtension_;
+        }
+    
+     private:
+        extension_type attributeExtension_;
+    };
+
+    template <template <typename > class _ExtensionType>
+    class ShutdownReasonAttributeExtension {
+     public:
+        typedef _ExtensionType<ConsumerProxyBase::ShutdownReasonAttribute> extension_type;
+    
+        static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<ConsumerProxyBase::ShutdownReasonAttribute>, extension_type>::value,
+                      "Not CommonAPI Attribute Extension!");
+    
+        ShutdownReasonAttributeExtension(ConsumerProxyBase& proxy): attributeExtension_(proxy.getShutdownReasonAttribute()) {
+        }
+    
+        inline extension_type& getShutdownReasonAttributeExtension() {
+            return attributeExtension_;
+        }
+    
+     private:
+        extension_type attributeExtension_;
+    };
+
+    template <template <typename > class _ExtensionType>
+    class WakeUpReasonAttributeExtension {
+     public:
+        typedef _ExtensionType<ConsumerProxyBase::WakeUpReasonAttribute> extension_type;
+    
+        static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<ConsumerProxyBase::WakeUpReasonAttribute>, extension_type>::value,
+                      "Not CommonAPI Attribute Extension!");
+    
+        WakeUpReasonAttributeExtension(ConsumerProxyBase& proxy): attributeExtension_(proxy.getWakeUpReasonAttribute()) {
+        }
+    
+        inline extension_type& getWakeUpReasonAttributeExtension() {
+            return attributeExtension_;
+        }
+    
+     private:
+        extension_type attributeExtension_;
+    };
+
+    template <template <typename > class _ExtensionType>
+    class BootModeAttributeExtension {
+     public:
+        typedef _ExtensionType<ConsumerProxyBase::BootModeAttribute> extension_type;
+    
+        static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<ConsumerProxyBase::BootModeAttribute>, extension_type>::value,
+                      "Not CommonAPI Attribute Extension!");
+    
+        BootModeAttributeExtension(ConsumerProxyBase& proxy): attributeExtension_(proxy.getBootModeAttribute()) {
+        }
+    
+        inline extension_type& getBootModeAttributeExtension() {
+            return attributeExtension_;
+        }
+    
+     private:
+        extension_type attributeExtension_;
+    };
+
+} // namespace ConsumerExtensions
+
+//
+// ConsumerProxy Implementation
+//
+template <typename ... _AttributeExtensions>
+ConsumerProxy<_AttributeExtensions...>::ConsumerProxy(std::shared_ptr<CommonAPI::Proxy> delegate):
+        delegate_(std::dynamic_pointer_cast<ConsumerProxyBase>(delegate)),
+        _AttributeExtensions(*(std::dynamic_pointer_cast<ConsumerProxyBase>(delegate)))... {
+}
+
+template <typename ... _AttributeExtensions>
+ConsumerProxy<_AttributeExtensions...>::~ConsumerProxy() {
+}
+
+template <typename ... _AttributeExtensions>
+void ConsumerProxy<_AttributeExtensions...>::GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& NodeStateId, int32_t& ErrorCode) {
+    delegate_->GetNodeState(callStatus, NodeStateId, ErrorCode);
+}
+
+template <typename ... _AttributeExtensions>
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetNodeStateAsync(GetNodeStateAsyncCallback callback) {
+    return delegate_->GetNodeStateAsync(callback);
+}
+
+template <typename ... _AttributeExtensions>
+void ConsumerProxy<_AttributeExtensions...>::SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    delegate_->SetSessionState(SessionName, SessionOwner, SeatID, SessionState, callStatus, ErrorCode);
+}
+
+template <typename ... _AttributeExtensions>
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, SetSessionStateAsyncCallback callback) {
+    return delegate_->SetSessionStateAsync(SessionName, SessionOwner, SeatID, SessionState, callback);
+}
+
+template <typename ... _AttributeExtensions>
+void ConsumerProxy<_AttributeExtensions...>::GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode) {
+    delegate_->GetSessionState(SessionName, SeatID, callStatus, SessionState, ErrorCode);
+}
+
+template <typename ... _AttributeExtensions>
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback) {
+    return delegate_->GetSessionStateAsync(SessionName, SeatID, callback);
+}
+
+template <typename ... _AttributeExtensions>
+void ConsumerProxy<_AttributeExtensions...>::GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ApplicationModeId, int32_t& ErrorCode) {
+    delegate_->GetApplicationMode(callStatus, ApplicationModeId, ErrorCode);
+}
+
+template <typename ... _AttributeExtensions>
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetApplicationModeAsync(GetApplicationModeAsyncCallback callback) {
+    return delegate_->GetApplicationModeAsync(callback);
+}
+
+template <typename ... _AttributeExtensions>
+void ConsumerProxy<_AttributeExtensions...>::RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    delegate_->RegisterShutdownClient(BusName, ObjName, ShutdownMode, TimeoutMs, callStatus, ErrorCode);
+}
+
+template <typename ... _AttributeExtensions>
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback) {
+    return delegate_->RegisterShutdownClientAsync(BusName, ObjName, ShutdownMode, TimeoutMs, callback);
+}
+
+template <typename ... _AttributeExtensions>
+void ConsumerProxy<_AttributeExtensions...>::UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    delegate_->UnRegisterShutdownClient(BusName, ObjName, ShutdownMode, callStatus, ErrorCode);
+}
+
+template <typename ... _AttributeExtensions>
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback) {
+    return delegate_->UnRegisterShutdownClientAsync(BusName, ObjName, ShutdownMode, callback);
+}
+
+template <typename ... _AttributeExtensions>
+void ConsumerProxy<_AttributeExtensions...>::RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    delegate_->RegisterSession(SessionName, SessionOwner, SeatID, SessionState, callStatus, ErrorCode);
+}
+
+template <typename ... _AttributeExtensions>
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback) {
+    return delegate_->RegisterSessionAsync(SessionName, SessionOwner, SeatID, SessionState, callback);
+}
+
+template <typename ... _AttributeExtensions>
+void ConsumerProxy<_AttributeExtensions...>::UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    delegate_->UnRegisterSession(SessionName, SessionOwner, SeatID, callStatus, ErrorCode);
+}
+
+template <typename ... _AttributeExtensions>
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback) {
+    return delegate_->UnRegisterSessionAsync(SessionName, SessionOwner, SeatID, callback);
+}
+
+template <typename ... _AttributeExtensions>
+void ConsumerProxy<_AttributeExtensions...>::GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count) {
+    delegate_->GetAppHealthCount(callStatus, Count);
+}
+
+template <typename ... _AttributeExtensions>
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback) {
+    return delegate_->GetAppHealthCountAsync(callback);
+}
+
+template <typename ... _AttributeExtensions>
+void ConsumerProxy<_AttributeExtensions...>::GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version) {
+    delegate_->GetInterfaceVersion(callStatus, Version);
+}
+
+template <typename ... _AttributeExtensions>
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback) {
+    return delegate_->GetInterfaceVersionAsync(callback);
+}
+
+template <typename ... _AttributeExtensions>
+void ConsumerProxy<_AttributeExtensions...>::LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    delegate_->LifecycleRequestComplete(RequestId, Status, callStatus, ErrorCode);
+}
+
+template <typename ... _AttributeExtensions>
+std::future<CommonAPI::CallStatus> ConsumerProxy<_AttributeExtensions...>::LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback) {
+    return delegate_->LifecycleRequestCompleteAsync(RequestId, Status, callback);
+}
+
+
+template <typename ... _AttributeExtensions>
+std::string ConsumerProxy<_AttributeExtensions...>::getAddress() const {
+    return delegate_->getAddress();
+}
+
+template <typename ... _AttributeExtensions>
+const std::string& ConsumerProxy<_AttributeExtensions...>::getDomain() const {
+    return delegate_->getDomain();
+}
+
+template <typename ... _AttributeExtensions>
+const std::string& ConsumerProxy<_AttributeExtensions...>::getServiceId() const {
+    return delegate_->getServiceId();
+}
+
+template <typename ... _AttributeExtensions>
+const std::string& ConsumerProxy<_AttributeExtensions...>::getInstanceId() const {
+    return delegate_->getInstanceId();
+}
+
+template <typename ... _AttributeExtensions>
+bool ConsumerProxy<_AttributeExtensions...>::isAvailable() const {
+    return delegate_->isAvailable();
+}
+
+template <typename ... _AttributeExtensions>
+CommonAPI::ProxyStatusEvent& ConsumerProxy<_AttributeExtensions...>::getProxyStatusEvent() {
+    return delegate_->getProxyStatusEvent();
+}
+
+template <typename ... _AttributeExtensions>
+CommonAPI::InterfaceVersionAttribute& ConsumerProxy<_AttributeExtensions...>::getInterfaceVersionAttribute() {
+    return delegate_->getInterfaceVersionAttribute();
+}
+
+} // namespace Consumer
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
+
+namespace CommonAPI {
+template<template<typename > class _AttributeExtension>
+struct DefaultAttributeProxyFactoryHelper<org::genivi::NodeStateManager::Consumer::ConsumerProxy,
+    _AttributeExtension> {
+    typedef typename org::genivi::NodeStateManager::Consumer::ConsumerProxy<
+            org::genivi::NodeStateManager::Consumer::ConsumerExtensions::RestartReasonAttributeExtension<_AttributeExtension>, 
+            org::genivi::NodeStateManager::Consumer::ConsumerExtensions::ShutdownReasonAttributeExtension<_AttributeExtension>, 
+            org::genivi::NodeStateManager::Consumer::ConsumerExtensions::WakeUpReasonAttributeExtension<_AttributeExtension>, 
+            org::genivi::NodeStateManager::Consumer::ConsumerExtensions::BootModeAttributeExtension<_AttributeExtension>
+    > class_t;
+};
+}
+
+
+#endif // ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_PROXY_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerProxyBase.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerProxyBase.h
new file mode 100644
index 0000000..076f5cc
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerProxyBase.h
@@ -0,0 +1,114 @@
+ /*
+ * This file was generated by the CommonAPI Generators.
+ *
+  * Copyright (C) 2012, BMW AG
+  *
+  * This file is part of GENIVI Project AudioManager.
+  *
+  * Contributions are licensed to the GENIVI Alliance under one or more
+  * Contribution License Agreements.
+  *
+  * \copyright
+  * 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/.
+  *
+  *
+  * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
+  *
+  * For further information see http://www.genivi.org/.
+ */
+ #ifndef ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_PROXY_BASE_H_
+ #define ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_PROXY_BASE_H_
+ 
+ #include "Consumer.h"
+ 
+ 
+ 
+ #define COMMONAPI_INTERNAL_COMPILATION
+ 
+
+ #include <CommonAPI/Attribute.h>
+ #include <CommonAPI/Event.h>
+ #include <CommonAPI/Proxy.h>
+ #include <functional>
+ #include <future>
+ 
+ #undef COMMONAPI_INTERNAL_COMPILATION
+
+ namespace org {
+ namespace genivi {
+ namespace NodeStateManager {
+ namespace Consumer {
+
+ class ConsumerProxyBase: virtual public CommonAPI::Proxy {
+  public:
+     typedef CommonAPI::ObservableAttribute<int32_t> RestartReasonAttribute;
+     typedef CommonAPI::ObservableAttribute<int32_t> ShutdownReasonAttribute;
+     typedef CommonAPI::ObservableAttribute<int32_t> WakeUpReasonAttribute;
+     typedef CommonAPI::ObservableAttribute<int32_t> BootModeAttribute;
+     typedef CommonAPI::Event<int32_t> NodeStateEvent;
+     typedef CommonAPI::Event<int32_t> NodeApplicationModeEvent;
+     typedef CommonAPI::Event<std::string, int32_t, int32_t> SessionStateChangedEvent;
+     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&, const int32_t&)> GetNodeStateAsyncCallback;
+     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> SetSessionStateAsyncCallback;
+     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&, const int32_t&)> GetSessionStateAsyncCallback;
+     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&, const int32_t&)> GetApplicationModeAsyncCallback;
+     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> RegisterShutdownClientAsyncCallback;
+     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> UnRegisterShutdownClientAsyncCallback;
+     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> RegisterSessionAsyncCallback;
+     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> UnRegisterSessionAsyncCallback;
+     typedef std::function<void(const CommonAPI::CallStatus&, const uint32_t&)> GetAppHealthCountAsyncCallback;
+     typedef std::function<void(const CommonAPI::CallStatus&, const uint32_t&)> GetInterfaceVersionAsyncCallback;
+     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> LifecycleRequestCompleteAsyncCallback;
+
+     virtual RestartReasonAttribute& getRestartReasonAttribute() = 0;
+     virtual ShutdownReasonAttribute& getShutdownReasonAttribute() = 0;
+     virtual WakeUpReasonAttribute& getWakeUpReasonAttribute() = 0;
+     virtual BootModeAttribute& getBootModeAttribute() = 0;
+
+     virtual NodeStateEvent& getNodeStateEvent() = 0;
+     virtual NodeApplicationModeEvent& getNodeApplicationModeEvent() = 0;
+     virtual SessionStateChangedEvent& getSessionStateChangedEvent() = 0;
+
+
+     virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& NodeStateId, int32_t& ErrorCode) = 0;
+     virtual std::future<CommonAPI::CallStatus> GetNodeStateAsync(GetNodeStateAsyncCallback callback) = 0;
+
+     virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
+     virtual std::future<CommonAPI::CallStatus> SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, SetSessionStateAsyncCallback callback) = 0;
+
+     virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode) = 0;
+     virtual std::future<CommonAPI::CallStatus> GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback) = 0;
+
+     virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ApplicationModeId, int32_t& ErrorCode) = 0;
+     virtual std::future<CommonAPI::CallStatus> GetApplicationModeAsync(GetApplicationModeAsyncCallback callback) = 0;
+
+     virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
+     virtual std::future<CommonAPI::CallStatus> RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback) = 0;
+
+     virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
+     virtual std::future<CommonAPI::CallStatus> UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback) = 0;
+
+     virtual void RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
+     virtual std::future<CommonAPI::CallStatus> RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback) = 0;
+
+     virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
+     virtual std::future<CommonAPI::CallStatus> UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback) = 0;
+
+     virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count) = 0;
+     virtual std::future<CommonAPI::CallStatus> GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback) = 0;
+
+     virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version) = 0;
+     virtual std::future<CommonAPI::CallStatus> GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback) = 0;
+
+     virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
+     virtual std::future<CommonAPI::CallStatus> LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback) = 0;
+ };
+
+ } // namespace Consumer
+ } // namespace NodeStateManager
+ } // namespace genivi
+ } // namespace org
+
+ #endif // ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_PROXY_BASE_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStub.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStub.h
new file mode 100644
index 0000000..02fc7ae
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStub.h
@@ -0,0 +1,170 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2012, BMW AG
+ *
+ * This file is part of GENIVI Project AudioManager.
+ *
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \copyright
+ * 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/.
+ *
+ *
+ * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
+ *
+ * For further information see http://www.genivi.org/.
+*/
+#ifndef ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_STUB_H_
+#define ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_STUB_H_
+
+
+
+
+#include "Consumer.h"
+
+#define COMMONAPI_INTERNAL_COMPILATION
+
+
+#include <CommonAPI/Stub.h>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+namespace Consumer {
+
+/**
+ * Receives messages from remote and handles all dispatching of deserialized calls
+ * to a stub for the service Consumer. 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 ConsumerStubAdapter: virtual public CommonAPI::StubAdapter, public Consumer {
+ public:
+    ///Notifies all remote listeners about a change of value of the attribute RestartReason.
+    virtual void fireRestartReasonAttributeChanged(const int32_t& RestartReason) = 0;
+    ///Notifies all remote listeners about a change of value of the attribute ShutdownReason.
+    virtual void fireShutdownReasonAttributeChanged(const int32_t& ShutdownReason) = 0;
+    ///Notifies all remote listeners about a change of value of the attribute WakeUpReason.
+    virtual void fireWakeUpReasonAttributeChanged(const int32_t& WakeUpReason) = 0;
+    ///Notifies all remote listeners about a change of value of the attribute BootMode.
+    virtual void fireBootModeAttributeChanged(const int32_t& BootMode) = 0;
+
+    /**
+     * Sends a broadcast event for NodeState. Should not be called directly.
+     * Instead, the "fire<broadcastName>Event" methods of the stub should be used.
+     */
+    virtual void fireNodeStateEvent(const int32_t& NodeState) = 0;
+    /**
+     * Sends a broadcast event for NodeApplicationMode. Should not be called directly.
+     * Instead, the "fire<broadcastName>Event" methods of the stub should be used.
+     */
+    virtual void fireNodeApplicationModeEvent(const int32_t& ApplicationModeId) = 0;
+    /**
+     * Sends a broadcast event for SessionStateChanged. Should not be called directly.
+     * Instead, the "fire<broadcastName>Event" methods of the stub should be used.
+     */
+    virtual void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState) = 0;
+};
+
+
+/**
+ * Defines the necessary callbacks to handle remote set events related to the attributes
+ * defined in the IDL description for Consumer.
+ * 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 ConsumerStubRemoteEvent {
+ public:
+    virtual ~ConsumerStubRemoteEvent() { }
+
+    /// Verification callback for remote set requests on the attribute RestartReason.
+    virtual bool onRemoteSetRestartReasonAttribute(int32_t RestartReason) = 0;
+    /// Action callback for remote set requests on the attribute RestartReason.
+    virtual void onRemoteRestartReasonAttributeChanged() = 0;
+
+    /// Verification callback for remote set requests on the attribute ShutdownReason.
+    virtual bool onRemoteSetShutdownReasonAttribute(int32_t ShutdownReason) = 0;
+    /// Action callback for remote set requests on the attribute ShutdownReason.
+    virtual void onRemoteShutdownReasonAttributeChanged() = 0;
+
+    /// Verification callback for remote set requests on the attribute WakeUpReason.
+    virtual bool onRemoteSetWakeUpReasonAttribute(int32_t WakeUpReason) = 0;
+    /// Action callback for remote set requests on the attribute WakeUpReason.
+    virtual void onRemoteWakeUpReasonAttributeChanged() = 0;
+
+    /// Verification callback for remote set requests on the attribute BootMode.
+    virtual bool onRemoteSetBootModeAttribute(int32_t BootMode) = 0;
+    /// Action callback for remote set requests on the attribute BootMode.
+    virtual void onRemoteBootModeAttributeChanged() = 0;
+
+};
+
+
+/**
+ * Defines the interface that must be implemented by any class that should provide
+ * the service Consumer 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 ConsumerStub : public CommonAPI::Stub<ConsumerStubAdapter , ConsumerStubRemoteEvent> {
+ public:
+    virtual ~ConsumerStub() { }
+
+    /// Provides getter access to the attribute RestartReason.
+    virtual const int32_t& getRestartReasonAttribute() = 0;
+    /// Provides getter access to the attribute ShutdownReason.
+    virtual const int32_t& getShutdownReasonAttribute() = 0;
+    /// Provides getter access to the attribute WakeUpReason.
+    virtual const int32_t& getWakeUpReasonAttribute() = 0;
+    /// Provides getter access to the attribute BootMode.
+    virtual const int32_t& getBootModeAttribute() = 0;
+
+    /// This is the method that will be called on remote calls on the method GetNodeState.
+    virtual void GetNodeState(int32_t& NodeStateId, int32_t& ErrorCode) = 0;
+    /// This is the method that will be called on remote calls on the method SetSessionState.
+    virtual void SetSessionState(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) = 0;
+    /// This is the method that will be called on remote calls on the method GetSessionState.
+    virtual void GetSessionState(std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode) = 0;
+    /// This is the method that will be called on remote calls on the method GetApplicationMode.
+    virtual void GetApplicationMode(int32_t& ApplicationModeId, int32_t& ErrorCode) = 0;
+    /// This is the method that will be called on remote calls on the method RegisterShutdownClient.
+    virtual void RegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode) = 0;
+    /// This is the method that will be called on remote calls on the method UnRegisterShutdownClient.
+    virtual void UnRegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, int32_t& ErrorCode) = 0;
+    /// This is the method that will be called on remote calls on the method RegisterSession.
+    virtual void RegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) = 0;
+    /// This is the method that will be called on remote calls on the method UnRegisterSession.
+    virtual void UnRegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode) = 0;
+    /// This is the method that will be called on remote calls on the method GetAppHealthCount.
+    virtual void GetAppHealthCount(uint32_t& Count) = 0;
+    /// This is the method that will be called on remote calls on the method GetInterfaceVersion.
+    virtual void GetInterfaceVersion(uint32_t& Version) = 0;
+    /// This is the method that will be called on remote calls on the method LifecycleRequestComplete.
+    virtual void LifecycleRequestComplete(uint32_t RequestId, int32_t Status, int32_t& ErrorCode) = 0;
+    
+    /// Sends a broadcast event for NodeState.
+    virtual void fireNodeStateEvent(const int32_t& NodeState) = 0;
+    /// Sends a broadcast event for NodeApplicationMode.
+    virtual void fireNodeApplicationModeEvent(const int32_t& ApplicationModeId) = 0;
+    /// Sends a broadcast event for SessionStateChanged.
+    virtual void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState) = 0;
+};
+
+} // namespace Consumer
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
+
+#endif // ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_STUB_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStubDefault.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStubDefault.cpp
new file mode 100644
index 0000000..f923d1d
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStubDefault.cpp
@@ -0,0 +1,240 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2012, BMW AG
+ *
+ * This file is part of GENIVI Project AudioManager.
+ *
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \copyright
+ * 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/.
+ *
+ *
+ * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
+ *
+ * For further information see http://www.genivi.org/.
+*/
+#include <org/genivi/NodeStateManager/Consumer/ConsumerStubDefault.h>
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+namespace Consumer {
+
+ConsumerStubDefault::ConsumerStubDefault():
+        remoteEventHandler_(this) {
+}
+
+ConsumerStubRemoteEvent* ConsumerStubDefault::initStubAdapter(const std::shared_ptr<ConsumerStubAdapter>& stubAdapter) {
+    stubAdapter_ = stubAdapter;
+    return &remoteEventHandler_;
+}
+
+const int32_t& ConsumerStubDefault::getRestartReasonAttribute() {
+    return restartReasonAttributeValue_;
+}
+
+void ConsumerStubDefault::setRestartReasonAttribute(int32_t value) {
+    const bool valueChanged = trySetRestartReasonAttribute(std::move(value));
+    if (valueChanged)
+        stubAdapter_->fireRestartReasonAttributeChanged(restartReasonAttributeValue_);
+}
+
+void ConsumerStubDefault::onRemoteRestartReasonAttributeChanged() {
+    // No operation in default
+}
+
+bool ConsumerStubDefault::trySetRestartReasonAttribute(int32_t value) {
+    if (!validateRestartReasonAttributeRequestedValue(value))
+        return false;
+
+    const bool valueChanged = (restartReasonAttributeValue_ != value);
+    restartReasonAttributeValue_ = std::move(value);
+    return valueChanged;
+}
+
+bool ConsumerStubDefault::validateRestartReasonAttributeRequestedValue(const int32_t& value) {
+    return true;
+}
+
+bool ConsumerStubDefault::RemoteEventHandler::onRemoteSetRestartReasonAttribute(int32_t value) {
+    return defaultStub_->trySetRestartReasonAttribute(std::move(value));
+}
+
+void ConsumerStubDefault::RemoteEventHandler::onRemoteRestartReasonAttributeChanged() {
+    defaultStub_->onRemoteRestartReasonAttributeChanged();
+}
+
+const int32_t& ConsumerStubDefault::getShutdownReasonAttribute() {
+    return shutdownReasonAttributeValue_;
+}
+
+void ConsumerStubDefault::setShutdownReasonAttribute(int32_t value) {
+    const bool valueChanged = trySetShutdownReasonAttribute(std::move(value));
+    if (valueChanged)
+        stubAdapter_->fireShutdownReasonAttributeChanged(shutdownReasonAttributeValue_);
+}
+
+void ConsumerStubDefault::onRemoteShutdownReasonAttributeChanged() {
+    // No operation in default
+}
+
+bool ConsumerStubDefault::trySetShutdownReasonAttribute(int32_t value) {
+    if (!validateShutdownReasonAttributeRequestedValue(value))
+        return false;
+
+    const bool valueChanged = (shutdownReasonAttributeValue_ != value);
+    shutdownReasonAttributeValue_ = std::move(value);
+    return valueChanged;
+}
+
+bool ConsumerStubDefault::validateShutdownReasonAttributeRequestedValue(const int32_t& value) {
+    return true;
+}
+
+bool ConsumerStubDefault::RemoteEventHandler::onRemoteSetShutdownReasonAttribute(int32_t value) {
+    return defaultStub_->trySetShutdownReasonAttribute(std::move(value));
+}
+
+void ConsumerStubDefault::RemoteEventHandler::onRemoteShutdownReasonAttributeChanged() {
+    defaultStub_->onRemoteShutdownReasonAttributeChanged();
+}
+
+const int32_t& ConsumerStubDefault::getWakeUpReasonAttribute() {
+    return wakeUpReasonAttributeValue_;
+}
+
+void ConsumerStubDefault::setWakeUpReasonAttribute(int32_t value) {
+    const bool valueChanged = trySetWakeUpReasonAttribute(std::move(value));
+    if (valueChanged)
+        stubAdapter_->fireWakeUpReasonAttributeChanged(wakeUpReasonAttributeValue_);
+}
+
+void ConsumerStubDefault::onRemoteWakeUpReasonAttributeChanged() {
+    // No operation in default
+}
+
+bool ConsumerStubDefault::trySetWakeUpReasonAttribute(int32_t value) {
+    if (!validateWakeUpReasonAttributeRequestedValue(value))
+        return false;
+
+    const bool valueChanged = (wakeUpReasonAttributeValue_ != value);
+    wakeUpReasonAttributeValue_ = std::move(value);
+    return valueChanged;
+}
+
+bool ConsumerStubDefault::validateWakeUpReasonAttributeRequestedValue(const int32_t& value) {
+    return true;
+}
+
+bool ConsumerStubDefault::RemoteEventHandler::onRemoteSetWakeUpReasonAttribute(int32_t value) {
+    return defaultStub_->trySetWakeUpReasonAttribute(std::move(value));
+}
+
+void ConsumerStubDefault::RemoteEventHandler::onRemoteWakeUpReasonAttributeChanged() {
+    defaultStub_->onRemoteWakeUpReasonAttributeChanged();
+}
+
+const int32_t& ConsumerStubDefault::getBootModeAttribute() {
+    return bootModeAttributeValue_;
+}
+
+void ConsumerStubDefault::setBootModeAttribute(int32_t value) {
+    const bool valueChanged = trySetBootModeAttribute(std::move(value));
+    if (valueChanged)
+        stubAdapter_->fireBootModeAttributeChanged(bootModeAttributeValue_);
+}
+
+void ConsumerStubDefault::onRemoteBootModeAttributeChanged() {
+    // No operation in default
+}
+
+bool ConsumerStubDefault::trySetBootModeAttribute(int32_t value) {
+    if (!validateBootModeAttributeRequestedValue(value))
+        return false;
+
+    const bool valueChanged = (bootModeAttributeValue_ != value);
+    bootModeAttributeValue_ = std::move(value);
+    return valueChanged;
+}
+
+bool ConsumerStubDefault::validateBootModeAttributeRequestedValue(const int32_t& value) {
+    return true;
+}
+
+bool ConsumerStubDefault::RemoteEventHandler::onRemoteSetBootModeAttribute(int32_t value) {
+    return defaultStub_->trySetBootModeAttribute(std::move(value));
+}
+
+void ConsumerStubDefault::RemoteEventHandler::onRemoteBootModeAttributeChanged() {
+    defaultStub_->onRemoteBootModeAttributeChanged();
+}
+
+
+void ConsumerStubDefault::GetNodeState(int32_t& NodeStateId, int32_t& ErrorCode) {
+    // No operation in default
+}
+
+void ConsumerStubDefault::SetSessionState(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) {
+    // No operation in default
+}
+
+void ConsumerStubDefault::GetSessionState(std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode) {
+    // No operation in default
+}
+
+void ConsumerStubDefault::GetApplicationMode(int32_t& ApplicationModeId, int32_t& ErrorCode) {
+    // No operation in default
+}
+
+void ConsumerStubDefault::RegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode) {
+    // No operation in default
+}
+
+void ConsumerStubDefault::UnRegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, int32_t& ErrorCode) {
+    // No operation in default
+}
+
+void ConsumerStubDefault::RegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) {
+    // No operation in default
+}
+
+void ConsumerStubDefault::UnRegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode) {
+    // No operation in default
+}
+
+void ConsumerStubDefault::GetAppHealthCount(uint32_t& Count) {
+    // No operation in default
+}
+
+void ConsumerStubDefault::GetInterfaceVersion(uint32_t& Version) {
+    // No operation in default
+}
+
+void ConsumerStubDefault::LifecycleRequestComplete(uint32_t RequestId, int32_t Status, int32_t& ErrorCode) {
+    // No operation in default
+}
+
+
+void ConsumerStubDefault::fireNodeStateEvent(const int32_t& NodeState) {
+    stubAdapter_->fireNodeStateEvent(NodeState);
+}
+void ConsumerStubDefault::fireNodeApplicationModeEvent(const int32_t& ApplicationModeId) {
+    stubAdapter_->fireNodeApplicationModeEvent(ApplicationModeId);
+}
+void ConsumerStubDefault::fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState) {
+    stubAdapter_->fireSessionStateChangedEvent(SessionStateName, SeatID, SessionState);
+}
+
+ConsumerStubDefault::RemoteEventHandler::RemoteEventHandler(ConsumerStubDefault* defaultStub):
+        defaultStub_(defaultStub) {
+}
+
+} // namespace Consumer
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStubDefault.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStubDefault.h
new file mode 100644
index 0000000..76b7f8c
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer/ConsumerStubDefault.h
@@ -0,0 +1,141 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2012, BMW AG
+ *
+ * This file is part of GENIVI Project AudioManager.
+ *
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \copyright
+ * 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/.
+ *
+ *
+ * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
+ *
+ * For further information see http://www.genivi.org/.
+*/
+#ifndef ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_STUB_DEFAULT_H_
+#define ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_STUB_DEFAULT_H_
+
+#include <org/genivi/NodeStateManager/Consumer/ConsumerStub.h>
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+namespace Consumer {
+
+/**
+ * Provides a default implementation for ConsumerStubRemoteEvent and
+ * ConsumerStub. 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 ConsumerStubDefault : public ConsumerStub {
+ public:
+    ConsumerStubDefault();
+
+    ConsumerStubRemoteEvent* initStubAdapter(const std::shared_ptr<ConsumerStubAdapter>& stubAdapter);
+
+    virtual const int32_t& getRestartReasonAttribute();
+    virtual void setRestartReasonAttribute(int32_t value);
+
+    virtual const int32_t& getShutdownReasonAttribute();
+    virtual void setShutdownReasonAttribute(int32_t value);
+
+    virtual const int32_t& getWakeUpReasonAttribute();
+    virtual void setWakeUpReasonAttribute(int32_t value);
+
+    virtual const int32_t& getBootModeAttribute();
+    virtual void setBootModeAttribute(int32_t value);
+
+
+    virtual void GetNodeState(int32_t& NodeStateId, int32_t& ErrorCode);
+
+    virtual void SetSessionState(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode);
+
+    virtual void GetSessionState(std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode);
+
+    virtual void GetApplicationMode(int32_t& ApplicationModeId, int32_t& ErrorCode);
+
+    virtual void RegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode);
+
+    virtual void UnRegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, int32_t& ErrorCode);
+
+    virtual void RegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode);
+
+    virtual void UnRegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode);
+
+    virtual void GetAppHealthCount(uint32_t& Count);
+
+    virtual void GetInterfaceVersion(uint32_t& Version);
+
+    virtual void LifecycleRequestComplete(uint32_t RequestId, int32_t Status, int32_t& ErrorCode);
+
+    
+    virtual void fireNodeStateEvent(const int32_t& NodeState);
+    virtual void fireNodeApplicationModeEvent(const int32_t& ApplicationModeId);
+    virtual void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState);
+
+ protected:
+    virtual void onRemoteRestartReasonAttributeChanged();
+    virtual bool trySetRestartReasonAttribute(int32_t value);
+    virtual bool validateRestartReasonAttributeRequestedValue(const int32_t& value);
+
+    virtual void onRemoteShutdownReasonAttributeChanged();
+    virtual bool trySetShutdownReasonAttribute(int32_t value);
+    virtual bool validateShutdownReasonAttributeRequestedValue(const int32_t& value);
+
+    virtual void onRemoteWakeUpReasonAttributeChanged();
+    virtual bool trySetWakeUpReasonAttribute(int32_t value);
+    virtual bool validateWakeUpReasonAttributeRequestedValue(const int32_t& value);
+
+    virtual void onRemoteBootModeAttributeChanged();
+    virtual bool trySetBootModeAttribute(int32_t value);
+    virtual bool validateBootModeAttributeRequestedValue(const int32_t& value);
+
+    
+ private:
+    class RemoteEventHandler: public ConsumerStubRemoteEvent {
+     public:
+        RemoteEventHandler(ConsumerStubDefault* defaultStub);
+
+        virtual bool onRemoteSetRestartReasonAttribute(int32_t value);
+        virtual void onRemoteRestartReasonAttributeChanged();
+
+        virtual bool onRemoteSetShutdownReasonAttribute(int32_t value);
+        virtual void onRemoteShutdownReasonAttributeChanged();
+
+        virtual bool onRemoteSetWakeUpReasonAttribute(int32_t value);
+        virtual void onRemoteWakeUpReasonAttributeChanged();
+
+        virtual bool onRemoteSetBootModeAttribute(int32_t value);
+        virtual void onRemoteBootModeAttributeChanged();
+
+
+     private:
+        ConsumerStubDefault* defaultStub_;
+    };
+
+    RemoteEventHandler remoteEventHandler_;
+    std::shared_ptr<ConsumerStubAdapter> stubAdapter_;
+
+    int32_t restartReasonAttributeValue_;
+    int32_t shutdownReasonAttributeValue_;
+    int32_t wakeUpReasonAttributeValue_;
+    int32_t bootModeAttributeValue_;
+};
+
+} // namespace Consumer
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
+
+#endif // ORG_GENIVI_NODESTATEMANAGER_CONSUMER_Consumer_STUB_DEFAULT_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumer.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumer.h
new file mode 100644
index 0000000..d4e071d
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumer.h
@@ -0,0 +1,70 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2012, BMW AG
+ *
+ * This file is part of GENIVI Project AudioManager.
+ *
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \copyright
+ * 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/.
+ *
+ *
+ * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
+ *
+ * For further information see http://www.genivi.org/.
+*/
+#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_H_
+#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_H_
+
+
+
+#define COMMONAPI_INTERNAL_COMPILATION
+
+#include <CommonAPI/types.h>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+namespace LifeCycleConsumer {
+
+class LifeCycleConsumer {
+ public:
+    virtual ~LifeCycleConsumer() { }
+
+    static inline const char* getInterfaceId();
+    static inline CommonAPI::Version getInterfaceVersion();
+};
+
+const char* LifeCycleConsumer::getInterfaceId() {
+    return "org.genivi.NodeStateManager.LifeCycleConsumer.LifeCycleConsumer";
+}
+
+CommonAPI::Version LifeCycleConsumer::getInterfaceVersion() {
+    return CommonAPI::Version(0, 1);
+}
+
+
+} // namespace LifeCycleConsumer
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
+
+namespace CommonAPI {
+
+}
+
+
+namespace std {
+    //hashes for types
+    
+    //hashes for error types
+}
+
+#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.cpp
new file mode 100644
index 0000000..5df88da
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.cpp
@@ -0,0 +1,82 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2012, BMW AG
+ *
+ * This file is part of GENIVI Project AudioManager.
+ *
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \copyright
+ * 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/.
+ *
+ *
+ * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
+ *
+ * For further information see http://www.genivi.org/.
+*/
+#include "LifeCycleConsumerDBusProxy.h"
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+namespace LifeCycleConsumer {
+
+std::shared_ptr<CommonAPI::DBus::DBusProxy> createLifeCycleConsumerDBusProxy(
+                    const std::string& commonApiAddress,
+                    const std::string& interfaceName,
+                    const std::string& busName,
+                    const std::string& objectPath,
+                    const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyConnection) {
+    return std::make_shared<LifeCycleConsumerDBusProxy>(commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection);
+}
+
+__attribute__((constructor)) void registerLifeCycleConsumerDBusProxy(void) {
+    CommonAPI::DBus::DBusFactory::registerProxyFactoryMethod(LifeCycleConsumer::getInterfaceId(),
+       &createLifeCycleConsumerDBusProxy);
+}
+
+LifeCycleConsumerDBusProxy::LifeCycleConsumerDBusProxy(
+                    const std::string& commonApiAddress,
+                    const std::string& interfaceName,
+                    const std::string& busName,
+                    const std::string& objectPath,
+                    const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyconnection):
+        CommonAPI::DBus::DBusProxy(commonApiAddress, interfaceName, busName, objectPath, dbusProxyconnection)
+ {
+}
+
+
+
+void LifeCycleConsumerDBusProxy::LifecycleRequest(const uint32_t& Request, const uint32_t& RequestId, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, uint32_t>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodWithReply(
+        *this,
+        "LifecycleRequest",
+        "uu",
+        Request, RequestId, 
+        callStatus
+        , ErrorCode);
+}
+std::future<CommonAPI::CallStatus> LifeCycleConsumerDBusProxy::LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback) {
+    return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t, uint32_t>,
+                                     CommonAPI::DBus::DBusSerializableArguments<int32_t> >::callMethodAsync(
+        *this,
+        "LifecycleRequest",
+        "uu",
+        Request, RequestId, 
+        std::move(callback));
+}
+
+void LifeCycleConsumerDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const {
+    ownVersionMajor = 0;
+    ownVersionMinor = 1;
+}
+
+} // namespace LifeCycleConsumer
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.h
new file mode 100644
index 0000000..7c4522d
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusProxy.h
@@ -0,0 +1,68 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2012, BMW AG
+ *
+ * This file is part of GENIVI Project AudioManager.
+ *
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \copyright
+ * 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/.
+ *
+ *
+ * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
+ *
+ * For further information see http://www.genivi.org/.
+*/
+#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_PROXY_H_
+#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_PROXY_H_
+
+#include <org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxyBase.h>
+
+#define COMMONAPI_INTERNAL_COMPILATION
+
+#include <CommonAPI/DBus/DBusFactory.h>
+#include <CommonAPI/DBus/DBusProxy.h>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+#include <string>
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+namespace LifeCycleConsumer {
+
+class LifeCycleConsumerDBusProxy: virtual public LifeCycleConsumerProxyBase, virtual public CommonAPI::DBus::DBusProxy {
+ public:
+    LifeCycleConsumerDBusProxy(
+                    const std::string& commonApiAddress,
+                    const std::string& interfaceName,
+                    const std::string& busName,
+                    const std::string& objectPath,
+                    const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyconnection);
+
+    virtual ~LifeCycleConsumerDBusProxy() { }
+
+
+
+
+    virtual void LifecycleRequest(const uint32_t& Request, const uint32_t& RequestId, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    virtual std::future<CommonAPI::CallStatus> LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback);
+    
+    virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
+
+ private:
+
+};
+
+} // namespace LifeCycleConsumer
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
+
+#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_PROXY_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.cpp
new file mode 100644
index 0000000..e408a47
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.cpp
@@ -0,0 +1,82 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2012, BMW AG
+ *
+ * This file is part of GENIVI Project AudioManager.
+ *
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \copyright
+ * 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/.
+ *
+ *
+ * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
+ *
+ * For further information see http://www.genivi.org/.
+*/
+#include "LifeCycleConsumerDBusStubAdapter.h"
+#include <org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumer.h>
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+namespace LifeCycleConsumer {
+
+std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> createLifeCycleConsumerDBusStubAdapter(
+                   const std::string& commonApiAddress,
+                   const std::string& interfaceName,
+                   const std::string& busName,
+                   const std::string& objectPath,
+                   const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyConnection,
+                   const std::shared_ptr<CommonAPI::StubBase>& stubBase) {
+    return std::make_shared<LifeCycleConsumerDBusStubAdapter>(commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection, stubBase);
+}
+
+__attribute__((constructor)) void registerLifeCycleConsumerDBusStubAdapter(void) {
+    CommonAPI::DBus::DBusFactory::registerAdapterFactoryMethod(LifeCycleConsumer::getInterfaceId(),
+                                                               &createLifeCycleConsumerDBusStubAdapter);
+}
+
+LifeCycleConsumerDBusStubAdapter::LifeCycleConsumerDBusStubAdapter(
+        const std::string& commonApiAddress,
+        const std::string& dbusInterfaceName,
+        const std::string& dbusBusName,
+        const std::string& dbusObjectPath,
+        const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection,
+        const std::shared_ptr<CommonAPI::StubBase>& stub):
+        LifeCycleConsumerDBusStubAdapterHelper(commonApiAddress, dbusInterfaceName, dbusBusName, dbusObjectPath, dbusConnection, std::dynamic_pointer_cast<LifeCycleConsumerStub>(stub)) {
+}
+
+const char* LifeCycleConsumerDBusStubAdapter::getMethodsDBusIntrospectionXmlData() const {
+    return
+        "<method name=\"LifecycleRequest\">\n"
+            "<arg name=\"Request\" type=\"u\" direction=\"in\" />\n"
+            "<arg name=\"RequestId\" type=\"u\" direction=\"in\" />\n"
+            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
+        "</method>\n"
+    ;
+}
+
+
+
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    LifeCycleConsumerStub,
+    std::tuple<uint32_t, uint32_t>,
+    std::tuple<int32_t>
+    > lifecycleRequestStubDispatcher(&LifeCycleConsumerStub::LifecycleRequest, "i");
+
+
+
+} // namespace LifeCycleConsumer
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
+
+template<>
+const org::genivi::NodeStateManager::LifeCycleConsumer::LifeCycleConsumerDBusStubAdapterHelper::StubDispatcherTable org::genivi::NodeStateManager::LifeCycleConsumer::LifeCycleConsumerDBusStubAdapterHelper::stubDispatcherTable_ = {
+    { { "LifecycleRequest", "uu" }, &org::genivi::NodeStateManager::LifeCycleConsumer::lifecycleRequestStubDispatcher }
+};
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.h
new file mode 100644
index 0000000..74e41a4
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerDBusStubAdapter.h
@@ -0,0 +1,61 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2012, BMW AG
+ *
+ * This file is part of GENIVI Project AudioManager.
+ *
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \copyright
+ * 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/.
+ *
+ *
+ * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
+ *
+ * For further information see http://www.genivi.org/.
+*/
+#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_
+#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_
+
+#include <org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStub.h>
+
+#define COMMONAPI_INTERNAL_COMPILATION
+
+#include <CommonAPI/DBus/DBusStubAdapterHelper.h>
+#include <CommonAPI/DBus/DBusFactory.h>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+namespace LifeCycleConsumer {
+
+typedef CommonAPI::DBus::DBusStubAdapterHelper<LifeCycleConsumerStub> LifeCycleConsumerDBusStubAdapterHelper;
+
+class LifeCycleConsumerDBusStubAdapter: public LifeCycleConsumerStubAdapter, public LifeCycleConsumerDBusStubAdapterHelper {
+ public:
+    LifeCycleConsumerDBusStubAdapter(
+            const std::string& commonApiAddress,
+            const std::string& dbusInterfaceName,
+            const std::string& dbusBusName,
+            const std::string& dbusObjectPath,
+            const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection,
+            const std::shared_ptr<CommonAPI::StubBase>& stub);
+    
+
+
+ protected:
+    virtual const char* getMethodsDBusIntrospectionXmlData() const;
+};
+
+} // namespace LifeCycleConsumer
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
+
+#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxy.h
new file mode 100644
index 0000000..f8e21ed
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxy.h
@@ -0,0 +1,166 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2012, BMW AG
+ *
+ * This file is part of GENIVI Project AudioManager.
+ *
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \copyright
+ * 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/.
+ *
+ *
+ * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
+ *
+ * For further information see http://www.genivi.org/.
+*/
+#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_H_
+#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_H_
+
+#include "LifeCycleConsumerProxyBase.h"
+
+#define COMMONAPI_INTERNAL_COMPILATION
+
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+namespace LifeCycleConsumer {
+
+template <typename ... _AttributeExtensions>
+class LifeCycleConsumerProxy: virtual public LifeCycleConsumer, virtual public LifeCycleConsumerProxyBase, public _AttributeExtensions... {
+ public:
+    LifeCycleConsumerProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
+    ~LifeCycleConsumerProxy();
+
+
+
+
+    /**
+     * Calls LifecycleRequest with synchronous semantics.
+     * 
+     * All const parameters are input parameters to this method.
+     * 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.
+     * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used.
+     */
+    virtual void LifecycleRequest(const uint32_t& Request, const uint32_t& RequestId, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
+    /**
+     * Calls LifecycleRequest 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> LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback);
+
+    /// Returns the CommonAPI address of the remote partner this proxy communicates with.
+    virtual std::string getAddress() const;
+
+    /// Returns the domain of the remote partner this proxy communicates with.
+    virtual const std::string& getDomain() const;
+
+    /// Returns the service ID of the remote partner this proxy communicates with.
+    virtual const std::string& getServiceId() const;
+
+    /// Returns the instance ID of the remote partner this proxy communicates with.
+    virtual const std::string& getInstanceId() const;
+
+    /// Returns true if the remote partner for this proxy is available.
+    virtual bool isAvailable() 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<LifeCycleConsumerProxyBase> delegate_;
+};
+
+
+//
+// LifeCycleConsumerProxy Implementation
+//
+template <typename ... _AttributeExtensions>
+LifeCycleConsumerProxy<_AttributeExtensions...>::LifeCycleConsumerProxy(std::shared_ptr<CommonAPI::Proxy> delegate):
+        delegate_(std::dynamic_pointer_cast<LifeCycleConsumerProxyBase>(delegate)),
+        _AttributeExtensions(*(std::dynamic_pointer_cast<LifeCycleConsumerProxyBase>(delegate)))... {
+}
+
+template <typename ... _AttributeExtensions>
+LifeCycleConsumerProxy<_AttributeExtensions...>::~LifeCycleConsumerProxy() {
+}
+
+template <typename ... _AttributeExtensions>
+void LifeCycleConsumerProxy<_AttributeExtensions...>::LifecycleRequest(const uint32_t& Request, const uint32_t& RequestId, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) {
+    delegate_->LifecycleRequest(Request, RequestId, callStatus, ErrorCode);
+}
+
+template <typename ... _AttributeExtensions>
+std::future<CommonAPI::CallStatus> LifeCycleConsumerProxy<_AttributeExtensions...>::LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback) {
+    return delegate_->LifecycleRequestAsync(Request, RequestId, callback);
+}
+
+
+template <typename ... _AttributeExtensions>
+std::string LifeCycleConsumerProxy<_AttributeExtensions...>::getAddress() const {
+    return delegate_->getAddress();
+}
+
+template <typename ... _AttributeExtensions>
+const std::string& LifeCycleConsumerProxy<_AttributeExtensions...>::getDomain() const {
+    return delegate_->getDomain();
+}
+
+template <typename ... _AttributeExtensions>
+const std::string& LifeCycleConsumerProxy<_AttributeExtensions...>::getServiceId() const {
+    return delegate_->getServiceId();
+}
+
+template <typename ... _AttributeExtensions>
+const std::string& LifeCycleConsumerProxy<_AttributeExtensions...>::getInstanceId() const {
+    return delegate_->getInstanceId();
+}
+
+template <typename ... _AttributeExtensions>
+bool LifeCycleConsumerProxy<_AttributeExtensions...>::isAvailable() const {
+    return delegate_->isAvailable();
+}
+
+template <typename ... _AttributeExtensions>
+CommonAPI::ProxyStatusEvent& LifeCycleConsumerProxy<_AttributeExtensions...>::getProxyStatusEvent() {
+    return delegate_->getProxyStatusEvent();
+}
+
+template <typename ... _AttributeExtensions>
+CommonAPI::InterfaceVersionAttribute& LifeCycleConsumerProxy<_AttributeExtensions...>::getInterfaceVersionAttribute() {
+    return delegate_->getInterfaceVersionAttribute();
+}
+
+} // namespace LifeCycleConsumer
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
+
+
+
+#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxyBase.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxyBase.h
new file mode 100644
index 0000000..3e780d0
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerProxyBase.h
@@ -0,0 +1,58 @@
+ /*
+ * This file was generated by the CommonAPI Generators.
+ *
+  * Copyright (C) 2012, BMW AG
+  *
+  * This file is part of GENIVI Project AudioManager.
+  *
+  * Contributions are licensed to the GENIVI Alliance under one or more
+  * Contribution License Agreements.
+  *
+  * \copyright
+  * 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/.
+  *
+  *
+  * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
+  *
+  * For further information see http://www.genivi.org/.
+ */
+ #ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_BASE_H_
+ #define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_BASE_H_
+ 
+ #include "LifeCycleConsumer.h"
+ 
+ 
+ 
+ #define COMMONAPI_INTERNAL_COMPILATION
+ 
+
+ #include <CommonAPI/Proxy.h>
+ #include <functional>
+ #include <future>
+ 
+ #undef COMMONAPI_INTERNAL_COMPILATION
+
+ namespace org {
+ namespace genivi {
+ namespace NodeStateManager {
+ namespace LifeCycleConsumer {
+
+ class LifeCycleConsumerProxyBase: virtual public CommonAPI::Proxy {
+  public:
+     typedef std::function<void(const CommonAPI::CallStatus&, const int32_t&)> LifecycleRequestAsyncCallback;
+
+
+
+
+     virtual void LifecycleRequest(const uint32_t& Request, const uint32_t& RequestId, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0;
+     virtual std::future<CommonAPI::CallStatus> LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback) = 0;
+ };
+
+ } // namespace LifeCycleConsumer
+ } // namespace NodeStateManager
+ } // namespace genivi
+ } // namespace org
+
+ #endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_PROXY_BASE_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStub.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStub.h
new file mode 100644
index 0000000..f4d9d80
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStub.h
@@ -0,0 +1,93 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2012, BMW AG
+ *
+ * This file is part of GENIVI Project AudioManager.
+ *
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \copyright
+ * 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/.
+ *
+ *
+ * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
+ *
+ * For further information see http://www.genivi.org/.
+*/
+#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_H_
+#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_H_
+
+
+
+
+#include "LifeCycleConsumer.h"
+
+#define COMMONAPI_INTERNAL_COMPILATION
+
+
+#include <CommonAPI/Stub.h>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+namespace LifeCycleConsumer {
+
+/**
+ * Receives messages from remote and handles all dispatching of deserialized calls
+ * to a stub for the service LifeCycleConsumer. 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 LifeCycleConsumerStubAdapter: virtual public CommonAPI::StubAdapter, public LifeCycleConsumer {
+ public:
+
+};
+
+
+/**
+ * Defines the necessary callbacks to handle remote set events related to the attributes
+ * defined in the IDL description for LifeCycleConsumer.
+ * 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 LifeCycleConsumerStubRemoteEvent {
+ public:
+    virtual ~LifeCycleConsumerStubRemoteEvent() { }
+
+};
+
+
+/**
+ * Defines the interface that must be implemented by any class that should provide
+ * the service LifeCycleConsumer 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 LifeCycleConsumerStub : public CommonAPI::Stub<LifeCycleConsumerStubAdapter , LifeCycleConsumerStubRemoteEvent> {
+ public:
+    virtual ~LifeCycleConsumerStub() { }
+
+
+    /// This is the method that will be called on remote calls on the method LifecycleRequest.
+    virtual void LifecycleRequest(uint32_t Request, uint32_t RequestId, int32_t& ErrorCode) = 0;
+    
+};
+
+} // namespace LifeCycleConsumer
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
+
+#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.cpp
new file mode 100644
index 0000000..92df0f0
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.cpp
@@ -0,0 +1,51 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2012, BMW AG
+ *
+ * This file is part of GENIVI Project AudioManager.
+ *
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \copyright
+ * 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/.
+ *
+ *
+ * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
+ *
+ * For further information see http://www.genivi.org/.
+*/
+#include <org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.h>
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+namespace LifeCycleConsumer {
+
+LifeCycleConsumerStubDefault::LifeCycleConsumerStubDefault():
+        remoteEventHandler_(this) {
+}
+
+LifeCycleConsumerStubRemoteEvent* LifeCycleConsumerStubDefault::initStubAdapter(const std::shared_ptr<LifeCycleConsumerStubAdapter>& stubAdapter) {
+    stubAdapter_ = stubAdapter;
+    return &remoteEventHandler_;
+}
+
+
+void LifeCycleConsumerStubDefault::LifecycleRequest(uint32_t Request, uint32_t RequestId, int32_t& ErrorCode) {
+    // No operation in default
+}
+
+
+
+LifeCycleConsumerStubDefault::RemoteEventHandler::RemoteEventHandler(LifeCycleConsumerStubDefault* defaultStub):
+        defaultStub_(defaultStub) {
+}
+
+} // namespace LifeCycleConsumer
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.h
new file mode 100644
index 0000000..6c5f402
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStubDefault.h
@@ -0,0 +1,74 @@
+/*
+* This file was generated by the CommonAPI Generators.
+*
+ * Copyright (C) 2012, BMW AG
+ *
+ * This file is part of GENIVI Project AudioManager.
+ *
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \copyright
+ * 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/.
+ *
+ *
+ * \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013
+ *
+ * For further information see http://www.genivi.org/.
+*/
+#ifndef ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_DEFAULT_H_
+#define ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_DEFAULT_H_
+
+#include <org/genivi/NodeStateManager/LifeCycleConsumer/LifeCycleConsumerStub.h>
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+namespace LifeCycleConsumer {
+
+/**
+ * Provides a default implementation for LifeCycleConsumerStubRemoteEvent and
+ * LifeCycleConsumerStub. 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 LifeCycleConsumerStubDefault : public LifeCycleConsumerStub {
+ public:
+    LifeCycleConsumerStubDefault();
+
+    LifeCycleConsumerStubRemoteEvent* initStubAdapter(const std::shared_ptr<LifeCycleConsumerStubAdapter>& stubAdapter);
+
+
+    virtual void LifecycleRequest(uint32_t Request, uint32_t RequestId, int32_t& ErrorCode);
+
+    
+
+ protected:
+    
+ private:
+    class RemoteEventHandler: public LifeCycleConsumerStubRemoteEvent {
+     public:
+        RemoteEventHandler(LifeCycleConsumerStubDefault* defaultStub);
+
+
+     private:
+        LifeCycleConsumerStubDefault* defaultStub_;
+    };
+
+    RemoteEventHandler remoteEventHandler_;
+    std::shared_ptr<LifeCycleConsumerStubAdapter> stubAdapter_;
+
+};
+
+} // namespace LifeCycleConsumer
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
+
+#endif // ORG_GENIVI_NODESTATEMANAGER_LIFECYCLECONSUMER_Life_Cycle_Consumer_STUB_DEFAULT_H_