* Bug #100 - removed projecttypes.h which causes compiling conflicts5.1

Signed-off-by: Jens Lorenz <jlorenz@de.adit-jv.com>

49 files changed, 2056 insertions, 1824 deletions

diff --git a/AudioManagerDaemon/CMakeLists.txt b/AudioManagerDaemon/CMakeLists.txt
index 2ee16f5..3714df5 100644
--- a/AudioManagerDaemon/CMakeLists.txt
+++ b/AudioManagerDaemon/CMakeLists.txt
@@ -63,6 +63,7 @@ SET(AUDIOMAN_SRCS_CXX
     src/CAmLog.cpp
 )
 
+
 # Preallocation variable for the map.
 IF(NOT WITH_DATABASE_STORAGE )
 
diff --git a/AudioManagerDaemon/docx/04_y_audiomanager_and_sources.dox b/AudioManagerDaemon/docx/04_y_audiomanager_and_sources.dox
index 113cf6b..fd0f1e3 100644
--- a/AudioManagerDaemon/docx/04_y_audiomanager_and_sources.dox
+++ b/AudioManagerDaemon/docx/04_y_audiomanager_and_sources.dox
@@ -30,7 +30,7 @@ sources and sinks since the routing adaptor will take care of handling some of t
 Here are some informations that is believed to be actually communicated to the sources and sinks:
 
  \section conFormats Connection Formats
- The am::am_ConnectionFormat_e formats for a connection are chosen when the connection is build up. So if there are more than one possbilities 
+ The am::am_CustomAvailabilityReason_t formats for a connection are chosen when the connection is build up. So if there are more than one possbilities 
  that can be used for a connection (am::am_Sink_s::listConnectionFormats and am::am_Source_s::listConnectionFormats) the correct one is chosen
  upon a connect. If this is relevant to the sources and sinks, the routingAdaptor must communicate to the sources and sinks accordingly.
  \image html SettingConnectionFormats.png
@@ -43,7 +43,7 @@ Here are some informations that is believed to be actually communicated to the s
  
  \section avail Availability
  This diagram shows the sequence that is used to communicate the availability am::am_Availability_s. from the sources. Please note that the availability reasons 
- am::am_AvailabilityReason_e are product specific.
+ am::am_CustomAvailabilityReason_t are product specific.
  \image html AvailabilityofSources.png 
  Here is the same for the sinks:
  \image html AvailabilityofSinks.png
diff --git a/AudioManagerDaemon/docx/06_classification.dox b/AudioManagerDaemon/docx/06_classification.dox
index ccedffc..0fb72cd 100644
--- a/AudioManagerDaemon/docx/06_classification.dox
+++ b/AudioManagerDaemon/docx/06_classification.dox
@@ -23,8 +23,8 @@
  but the parameters of the Classes itself are product specific and have to be interpreted by the AudioManagerController. This concept allows for very individual
  implementations of system behaviors.\n
  Since Classes are held in the database, Classes can be registered and deregistered during runtime, it is recommended that the AudioManagerController enters
- all source & sink classes at start-up into the database.A ClassProperty exists out of an enumeration (am_ClassProperty_e, project specific) and a corresponding
- value (integer) that is interpreted by the AudioManagerController according to am_ClassProperty_e.\n
+ all source & sink classes at start-up into the database.A ClassProperty exists out of an enumeration (am_CustomClassProperty_t, project specific) and a corresponding
+ value (integer) that is interpreted by the AudioManagerController according to am_CustomClassProperty_t.\n
  There is no restriction to the number of properties a class can have and how many classes can exist in a system.\n
  \section attributes Attributes
  - am::am_SourceClass_s describes the attributes of a source class\n
diff --git a/AudioManagerDaemon/docx/14_misc.dox b/AudioManagerDaemon/docx/14_misc.dox
index 7b3f950..8ae15c2 100644
--- a/AudioManagerDaemon/docx/14_misc.dox
+++ b/AudioManagerDaemon/docx/14_misc.dox
@@ -22,7 +22,7 @@ Every flow of audio is using a format to exchange data. The format that the sour
 experience. It is common that sources and sinks are capable of supporting more than one audioformat.\n
 So all sources and sinks register with a list of connectionFormats that they support and for each connection a format must be chosen that is then used
 to transport the audio data. Gateways (and Soundconverters) have the information which connectionFormat can be transformed into another one.
-am::am_ConnectionFormat_e has all formats listed.\n
+am::am_CustomAvailabilityReason_t has all formats listed.\n
 There is a special usecase that is worth showing as an example in this regard: the change of a connectionFormat when switching from one song to another. Here is an
 example of how the project specific parts could handle this:
 \image html ChangeofAudioformatduringplaytime.png
diff --git a/AudioManagerDaemon/fidls/AudioManagerTypes.fidl b/AudioManagerDaemon/fidls/AudioManagerTypes.fidl
index 0850d33..604b523 100644
--- a/AudioManagerDaemon/fidls/AudioManagerTypes.fidl
+++ b/AudioManagerDaemon/fidls/AudioManagerTypes.fidl
@@ -1,1234 +1,1234 @@
 package org.genivi

 

 <**

-    @author : Christian Linke

+	@author : Christian Linke
 **>

 typeCollection am {

-    version {

-        major 1

-        minor 0

-    }

-    array am_MainConnection_L of am_MainConnectionType_s

+	version {
+		major 1
+		minor 0
+	}
+	array am_MainConnection_L of am_MainConnectionType_s
 

-    array am_SinkClass_L of am_SinkClass_s

+	array am_SinkClass_L of am_SinkClass_s
 

-    array am_SinkType_L of am_SinkType_s

+	array am_SinkType_L of am_SinkType_s
 

-    array am_SourceClass_L of am_SourceClass_s

+	array am_SourceClass_L of am_SourceClass_s
 

-    array am_SourceType_L of am_SourceType_s

+	array am_SourceType_L of am_SourceType_s
 

-    array am_SystemProperty_L of am_SystemProperty_s

+	array am_SystemProperty_L of am_SystemProperty_s
 

-    array am_ClassProperty_L of am_ClassProperty_s

+	array am_ClassProperty_L of am_ClassProperty_s
 

-    array am_ConnectionID_L of am_connectionID_t

+	array am_ConnectionID_L of am_connectionID_t
 

-    array am_EarlyData_L of am_EarlyData_s

+	array am_EarlyData_L of am_EarlyData_s
 

-    array am_MainSoundProperty_L of am_MainSoundProperty_s

+	array am_MainSoundProperty_L of am_MainSoundProperty_s
 

-    array am_NotificationConfiguration_L of am_NotificationConfiguration_s

+	array am_NotificationConfiguration_L of am_NotificationConfiguration_s
 

-    array am_RoutingElement_L of am_RoutingElement_s

+	array am_RoutingElement_L of am_RoutingElement_s
 

-    array am_SoundProperty_L of am_SoundProperty_s

+	array am_SoundProperty_L of am_SoundProperty_s
 

-    array am_Volumes_L of am_Volumes_s

+	array am_Volumes_L of am_Volumes_s
 

-    array am_ConnectionFormat_L of am_ConnectionFormat_pe

+	array am_ConnectionFormat_L of am_CustomConnectionFormat_t
 

-    array am_Convertion_L of am_bool_t

+	array am_Convertion_L of am_bool_t
 

-    <**

-        @description : a source ID

-    **>

-    typedef am_sourceID_t is UInt16

-    typedef am_bool_t is Boolean

+	<**
+		@description : a source ID
+	**>
+	typedef am_sourceID_t is UInt16
+	typedef am_bool_t is Boolean
 

-    <**

-        @description : a domain ID

-    **>

-    typedef am_domainID_t is UInt16

+	<**
+		@description : a domain ID
+	**>
+	typedef am_domainID_t is UInt16
 

-    <**

-        @description : a gateway ID

-    **>

-    typedef am_gatewayID_t is UInt16

+	<**
+		@description : a gateway ID
+	**>
+	typedef am_gatewayID_t is UInt16
 

-    <**

-        @description : a connection ID 

-    **>

-    typedef am_connectionID_t is UInt16

+	<**
+		@description : a connection ID 
+	**>
+	typedef am_connectionID_t is UInt16
 

-    <**

-        @description : a crossfader ID

-    **>

-    typedef am_crossfaderID_t is UInt16

+	<**
+		@description : a crossfader ID
+	**>
+	typedef am_crossfaderID_t is UInt16
 

-    <**

-        @description : a mainConnection ID

-    **>

-    typedef am_mainConnectionID_t is UInt16

+	<**
+		@description : a mainConnection ID
+	**>
+	typedef am_mainConnectionID_t is UInt16
 

-    <**

-        @description : This is the volume presented on the command interface. It is in the duty of the Controller to change the volumes given here into meaningful values on the routing interface.

+	<**
+		@description : This is the volume presented on the command interface. It is in the duty of the Controller to change the volumes given here into meaningful values on the routing interface.
 The range of this type is customer specific.

-    **>

-    typedef am_mainVolume_t is Int16

-

-    <**

-        @description : The unit is 0.1 db steps,The smallest value -3000 (=AM_MUTE). The minimum and maximum can be limited by actual project.

-    **>

-    typedef am_volume_t is Int16

-

-    <**

-        @description : time in ms!

-    **>

-    typedef am_time_t is Int16

-

-    <**

-        @description : offset time that is introduced in milli seconds.

-    **>

-    typedef am_timeSync_t is Int16

-    typedef am_sourceClass_t is UInt16

-

-    <**

-        @description : speed

-    **>

-    typedef am_speed_t is UInt16

-    typedef am_sinkClass_t is UInt16

-

-    <**

-        @description : a sink ID 

-    **>

-    typedef am_sinkID_t is UInt16

-

-    <**

-        @description : This project specific value classifies the format in which data is exchanged within a connection. 

-    **>

-    typedef am_ConnectionFormat_pe is UInt16

-

-    <**

-        @description : This  project specific value gives the information about reason for reason for Source/Sink change

-    **>

-    typedef am_AvailabilityReason_pe is UInt16

-

-    <**

-        @description : product specific identifier of property

-    **>

-    typedef am_ClassProperty_pe is UInt16

-

-    <**

-        @description : For products, different ramp types can be defined here.

+	**>
+	typedef am_mainVolume_t is Int16
+
+	<**
+		@description : The unit is 0.1 db steps,The smallest value -3000 (=AM_MUTE). The minimum and maximum can be limited by actual project.
+	**>
+	typedef am_volume_t is Int16
+
+	<**
+		@description : time in ms!
+	**>
+	typedef am_time_t is Int16
+
+	<**
+		@description : offset time that is introduced in milli seconds.
+	**>
+	typedef am_timeSync_t is Int16
+	typedef am_sourceClass_t is UInt16
+
+	<**
+		@description : speed
+	**>
+	typedef am_speed_t is UInt16
+	typedef am_sinkClass_t is UInt16
+
+	<**
+		@description : a sink ID 
+	**>
+	typedef am_sinkID_t is UInt16
+
+	<**
+		@description : This project specific value classifies the format in which data is exchanged within a connection. 
+	**>
+	typedef am_CustomConnectionFormat_t is UInt16
+
+	<**
+		@description : This  project specific value gives the information about reason for reason for Source/Sink change
+	**>
+	typedef am_CustomAvailabilityReason_t is UInt16
+
+	<**
+		@description : product specific identifier of property
+	**>
+	typedef am_CustomClassProperty_t is UInt16
+
+	<**
+		@description : For products, different ramp types can be defined here.
 It is in the responsibility of the product to make sure that the routing plugins are aware of the ramp types used.

-    **>

-    typedef am_RampType_pe is UInt16

-

-    <**

-        @description : Project specific sound properties.

-    **>

-    typedef am_SoundPropertyType_pe is UInt16

-

-    <**

-        @description : Here are all SoundProperties that can be set via the CommandInterface. Product specific

-    **>

-    typedef am_MainSoundPropertyType_pe is UInt16

-

-    <**

-        @description : describes the different system properties. Project specific

-    **>

-    typedef am_SystemPropertyType_pe is UInt16

-

-    <**

-        @description : gives the type of the Notification.

-    **>

-    typedef am_NotificationType_pe is UInt16

-

-    <**

-        @description : with the help of this enum, sinks and sources can report their availability state

-    **>

-    enumeration am_Availability_e {

-

-        <**

-            @description : default

-        **>

-        A_UNKNOWN = "0"

-

-        <**

-            @description : The source / sink is available

-        **>

-        A_AVAILABLE = "1"

-

-        <**

-            @description : the source / sink is not available

-        **>

-        A_UNAVAILABLE = "2"

-        A_MAX

-    }

-

-    <**

-        @description : describes the active sink of a crossfader.

-    **>

-    enumeration am_HotSink_e {

-

-        <**

-            @description : default

-        **>

-        HS_UNKNOWN = "0"

-

-        <**

-            @description : sinkA is active

-        **>

-        HS_SINKA = "1"

-

-        <**

-            @description : sinkB is active

-        **>

-        HS_SINKB = "2"

-

-        <**

-            @description : the crossfader is in the transition state

-        **>

-        HS_INTERMEDIATE = "3"

-        HS_MAX

-    }

-

-    <**

-        @description : represents the connection state

-    **>

-    enumeration am_ConnectionState_e {

-        CS_UNKNOWN = "0"

-

-        <**

-            @description : This means the connection is just building up

-        **>

-        CS_CONNECTING = "1"

-

-        <**

-            @description : the connection is ready to be used

-        **>

-        CS_CONNECTED = "2"

-

-        <**

-            @description : the connection is in the course to be knocked down

-        **>

-        CS_DISCONNECTING = "3"

-

-        <**

-            @description : only relevant for connectionStatechanged. Is send after the connection was removed

-        **>

-        CS_DISCONNECTED = "4"

-

-        <**

-            @description : this means the connection is still build up but unused at the moment

-        **>

-        CS_SUSPENDED = "5"

-        CS_MAX

-    }

-

-    enumeration am_DomainState_e {

-

-        <**

-            @description : default

-        **>

-        DS_UNKNOWN = "0"

-

-        <**

-            @description : the domain is controlled by the daemon

-        **>

-        DS_CONTROLLED = "1"

-

-        <**

-            @description : the domain is independent starting up

-        **>

-        DS_INDEPENDENT_STARTUP = "1"

-

-        <**

-            @description : the domain is independent running down

-        **>

-        DS_INDEPENDENT_RUNDOWN = "2"

-        DS_MAX

-    }

-

-    <**

-        @description : This enum characterizes the data of the EarlyData_t

-    **>

-    enumeration am_EarlyDataType_e {

-

-        <**

-            @description : default

-        **>

-        ES_UNKNOWN = "0"

-

-        <**

-            @description : the source volume

-        **>

-        ED_SOURCE_VOLUME = "1"

-

-        <**

-            @description : the sink volume

-        **>

-        ED_SINK_VOLUME = "2"

-

-        <**

-            @description : a source property

-        **>

-        ED_SOURCE_PROPERTY = "3"

-

-        <**

-            @description : a sink property

-        **>

-        ED_SINK_PROPERTY = "4"

-        ED_MAX

-    }

-

-    <**

-        @description : the errors of the audiomanager. All possible errors are in here. This enum is used widely as return parameter.

-    **>

-    enumeration am_Error_e {

-

-        <**

-            @description : no error - positive reply

-        **>

-        E_OK = "0"

-

-        <**

-            @description : default

-        **>

-        E_UNKNOWN = "1"

-

-        <**

-            @description : value out of range

-        **>

-        E_OUT_OF_RANGE = "2"

-

-        <**

-            @description : not used

-        **>

-        E_NOT_USED = "3"

-

-        <**

-            @description : a database error occurred 

-        **>

-        E_DATABASE_ERROR = "4"

-

-        <**

-            @description : the desired object already exists

-        **>

-        E_ALREADY_EXISTS = "5"

-

-        <**

-            @description : there is no change

-        **>

-        E_NO_CHANGE = "6"

-

-        <**

-            @description : the desired action is not possible

-        **>

-        E_NOT_POSSIBLE = "7"

-

-        <**

-            @description : the desired object is non existent

-        **>

-        E_NON_EXISTENT = "8"

-

-        <**

-            @description : the asynchronous action was aborted

-        **>

-        E_ABORTED = "9"

-

-        <**

-            @description : This error is returned in case a connect is issued with a connectionFormat that cannot be selected for the connection. This could be either due to the capabilities of a source or a sink or gateway compatibilities for example

-        **>

-        E_WRONG_FORMAT = "10"

-        E_MAX

-    }

-

-    enumeration am_MuteState_e {

-

-        <**

-            @description : default

-        **>

-        MS_UNKNOWN = "0"

-

-        <**

-            @description : the source / sink is muted

-        **>

-        MS_MUTED = "1"

-

-        <**

-            @description : the source / sink is unmuted

-        **>

-        MS_UNMUTED = "2"

-        MS_MAX

-    }

-

-    enumeration am_InterruptState_e {

-

-        <**

-            @description : default

-        **>

-        IS_UNKNOWN = "0"

-

-        <**

-            @description : the interrupt state is off - no interrupt 

-        **>

-        IS_OFF = "1"

-

-        <**

-            @description : the interrupt state is interrupted - the interrupt is active

-        **>

-        IS_INTERRUPTED = "2"

-        IS_MAX

-    }

-

-    <**

-        @description : This datatype determines if a sourceID or a sinkID is used in the union following

-    **>

-    enumeration am_VolumeType_e {

-        VT_UNKNOWN = "0"

-

-        <**

-            @description : the following type is a sink

-        **>

-        VT_SINK = "1"

-

-        <**

-            @description : the following type is a source

-        **>

-        VT_SOURCE = "2"

-        VT_MAX

-    }

-

-    enumeration am_NotificationStatus_e {

-        NS_UNKNOWN = "0"

-

-        <**

-            @description : No notification, the function is turned off

-        **>

-        NS_OFF = "1"

-

-        <**

-            @description : Periodic notifications are sent out. The period in ms is given by am_NotificationParameter

-        **>

-        NS_PERIODIC = "2"

-

-        <**

-            @description : The notification is sent out when the minimum given by am_NotificationParameter is reached.

-        **>

-        NS_MINIMUM = "3"

-

-        <**

-            @description : The notification is sent out when the maximum given by am_NotificationParameter is reached.

-        **>

-        NS_MAXIMUM = "4"

-

-        <**

-            @description : The notification is sent out when a change happened. The Resolution of the change is defined by am_NotificationParameter.

-        **>

-        NS_CHANGE_ = "5"

-        NS_MAX

-    }

-

-    <**

-        @description : This enumeration is used to define the type of the action that is correlated to a handle.

-    **>

-    enumeration am_Handle_e {

-        H_UNKNOWN = "0"

-        H_CONNECT = "1"

-        H_DISCONNECT = "2"

-        H_SETSOURCESTATE = "3"

-        H_SETSINKVOLUME = "4"

-        H_SETSOURCEVOLUME = "5"

-        H_SETSINKSOUNDPROPERTY = "6"

-        H_SETSOURCESOUNDPROPERTY = "7"

-        H_SETSINKSOUNDPROPERTIES = "8"

-        H_SETSOURCESOUNDPROPERTIES = "9"

-        H_CROSSFADE = "10"

-        H_SETVOLUMES = "11"

-        H_SETSINKNOTIFICATION = "12"

-        H_SETSOURCENOTIFICATION = "13"

-        H_MAX

-    }

-

-    <**

-        @description : The source state reflects the state of the source

-    **>

-    enumeration am_SourceState_e {

-        SS_UNKNNOWN = "0"

-

-        <**

-            @description : The source can be activly heared

-        **>

-        SS_ON = "1"

-

-        <**

-            @description : The source cannot be heared

-        **>

-        SS_OFF = "2"

-

-        <**

-            @description : The source is paused. Meaning it cannot be heared but should be prepared to play again soon.

-        **>

-        SS_PAUSED = "3"

-        SS_MAX

-    }

-

-    <**

-        @description : This enum describes the ready state of the routing part

-    **>

-    enumeration am_RoutingReady_e {

-        RR_UNKNOWN = "0"

-        RR_READY = "1"

-        RR_RUNDOWN = "2"

-    }

-

-    <**

-        @description : a list of routing elements that lead from source to sink

-    **>

-    struct am_Route_s {

-

-        <**

-            @description : the sourceID where the route starts

-        **>

-        am_sourceID_t sourceID

-

-        <**

-            @description : the sinkID where the route ends

-        **>

-        am_sinkID_t sinkID

-

-        <**

-            @description : the actual route as list of routing elements

-        **>

-        am_RoutingElement_L route

-    }

-

-    <**

-        @description : this describes the availability of a sink or a source together with the latest change

-    **>

-    struct am_Availability_s {

-

-        <**

-            @description : the current availability state

-        **>

-        am_Availability_e availability

-

-        <**

-            @description : the reason for the last change. This can be used to trigger events that deal with state changes.

-        **>

-        am_AvailabilityReason_pe availabilityReason

-    }

-

-    <**

-        @description : describes class properties

-    **>

-    struct am_ClassProperty_s {

-

-        <**

-            @description : the property as enum

-        **>

-        am_ClassProperty_pe classProperty

-

-        <**

-            @description : the value of the property

-        **>

-        Int16 value

-    }

-

-    <**

-        @description : This struct describes the attribiutes of a crossfader.

-    **>

-    struct am_Crossfader_s {

-

-        <**

-            @description : This is the ID of the crossfader, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManager daemon), or it is a fixed (the project has to ensure the uniqueness of the ID).

-        **>

-        am_crossfaderID_t crossfaderID

-

-        <**

-            @description : The name of the crossfader. Must be unique in the whole system. 

-        **>

-        String name

-

-        <**

-            @description : The sinkID of the SinkA. Sinks shall be registered before registering the crossfader.

-        **>

-        am_sinkID_t sinkID_A

-

-        <**

-            @description : The sinkID of the SinkB. Sinks shall be registered before registering the crossfader.

-        **>

-        am_sinkID_t sinkID_B

-

-        <**

-            @description : The sourceID of the crossfader source. The source shall be registered before the crossfader.

-        **>

-        am_sourceID_t sourceID

-

-        <**

-            @description : This enum can have 3 states:

+	**>
+	typedef am_CustomRampType_t is UInt16
+
+	<**
+		@description : Project specific sound properties.
+	**>
+	typedef am_CustomSoundPropertyType_t is UInt16
+
+	<**
+		@description : Here are all SoundProperties that can be set via the CommandInterface. Product specific
+	**>
+	typedef am_CustomMainSoundPropertyType_t is UInt16
+
+	<**
+		@description : describes the different system properties. Project specific
+	**>
+	typedef am_CustomSystemPropertyType_t is UInt16
+
+	<**
+		@description : gives the type of the Notification.
+	**>
+	typedef am_CustomNotificationType_t is UInt16
+
+	<**
+		@description : with the help of this enum, sinks and sources can report their availability state
+	**>
+	enumeration am_Availability_e {
+
+		<**
+			@description : default
+		**>
+		A_UNKNOWN = "0"
+
+		<**
+			@description : The source / sink is available
+		**>
+		A_AVAILABLE = "1"
+
+		<**
+			@description : the source / sink is not available
+		**>
+		A_UNAVAILABLE = "2"
+		A_MAX
+	}
+
+	<**
+		@description : describes the active sink of a crossfader.
+	**>
+	enumeration am_HotSink_e {
+
+		<**
+			@description : default
+		**>
+		HS_UNKNOWN = "0"
+
+		<**
+			@description : sinkA is active
+		**>
+		HS_SINKA = "1"
+
+		<**
+			@description : sinkB is active
+		**>
+		HS_SINKB = "2"
+
+		<**
+			@description : the crossfader is in the transition state
+		**>
+		HS_INTERMEDIATE = "3"
+		HS_MAX
+	}
+
+	<**
+		@description : represents the connection state
+	**>
+	enumeration am_ConnectionState_e {
+		CS_UNKNOWN = "0"
+
+		<**
+			@description : This means the connection is just building up
+		**>
+		CS_CONNECTING = "1"
+
+		<**
+			@description : the connection is ready to be used
+		**>
+		CS_CONNECTED = "2"
+
+		<**
+			@description : the connection is in the course to be knocked down
+		**>
+		CS_DISCONNECTING = "3"
+
+		<**
+			@description : only relevant for connectionStatechanged. Is send after the connection was removed
+		**>
+		CS_DISCONNECTED = "4"
+
+		<**
+			@description : this means the connection is still build up but unused at the moment
+		**>
+		CS_SUSPENDED = "5"
+		CS_MAX
+	}
+
+	enumeration am_DomainState_e {
+
+		<**
+			@description : default
+		**>
+		DS_UNKNOWN = "0"
+
+		<**
+			@description : the domain is controlled by the daemon
+		**>
+		DS_CONTROLLED = "1"
+
+		<**
+			@description : the domain is independent starting up
+		**>
+		DS_INDEPENDENT_STARTUP = "1"
+
+		<**
+			@description : the domain is independent running down
+		**>
+		DS_INDEPENDENT_RUNDOWN = "2"
+		DS_MAX
+	}
+
+	<**
+		@description : This enum characterizes the data of the EarlyData_t
+	**>
+	enumeration am_EarlyDataType_e {
+
+		<**
+			@description : default
+		**>
+		ES_UNKNOWN = "0"
+
+		<**
+			@description : the source volume
+		**>
+		ED_SOURCE_VOLUME = "1"
+
+		<**
+			@description : the sink volume
+		**>
+		ED_SINK_VOLUME = "2"
+
+		<**
+			@description : a source property
+		**>
+		ED_SOURCE_PROPERTY = "3"
+
+		<**
+			@description : a sink property
+		**>
+		ED_SINK_PROPERTY = "4"
+		ED_MAX
+	}
+
+	<**
+		@description : the errors of the audiomanager. All possible errors are in here. This enum is used widely as return parameter.
+	**>
+	enumeration am_Error_e {
+
+		<**
+			@description : no error - positive reply
+		**>
+		E_OK = "0"
+
+		<**
+			@description : default
+		**>
+		E_UNKNOWN = "1"
+
+		<**
+			@description : value out of range
+		**>
+		E_OUT_OF_RANGE = "2"
+
+		<**
+			@description : not used
+		**>
+		E_NOT_USED = "3"
+
+		<**
+			@description : a database error occurred 
+		**>
+		E_DATABASE_ERROR = "4"
+
+		<**
+			@description : the desired object already exists
+		**>
+		E_ALREADY_EXISTS = "5"
+
+		<**
+			@description : there is no change
+		**>
+		E_NO_CHANGE = "6"
+
+		<**
+			@description : the desired action is not possible
+		**>
+		E_NOT_POSSIBLE = "7"
+
+		<**
+			@description : the desired object is non existent
+		**>
+		E_NON_EXISTENT = "8"
+
+		<**
+			@description : the asynchronous action was aborted
+		**>
+		E_ABORTED = "9"
+
+		<**
+			@description : This error is returned in case a connect is issued with a connectionFormat that cannot be selected for the connection. This could be either due to the capabilities of a source or a sink or gateway compatibilities for example
+		**>
+		E_WRONG_FORMAT = "10"
+		E_MAX
+	}
+
+	enumeration am_MuteState_e {
+
+		<**
+			@description : default
+		**>
+		MS_UNKNOWN = "0"
+
+		<**
+			@description : the source / sink is muted
+		**>
+		MS_MUTED = "1"
+
+		<**
+			@description : the source / sink is unmuted
+		**>
+		MS_UNMUTED = "2"
+		MS_MAX
+	}
+
+	enumeration am_InterruptState_e {
+
+		<**
+			@description : default
+		**>
+		IS_UNKNOWN = "0"
+
+		<**
+			@description : the interrupt state is off - no interrupt 
+		**>
+		IS_OFF = "1"
+
+		<**
+			@description : the interrupt state is interrupted - the interrupt is active
+		**>
+		IS_INTERRUPTED = "2"
+		IS_MAX
+	}
+
+	<**
+		@description : This datatype determines if a sourceID or a sinkID is used in the union following
+	**>
+	enumeration am_VolumeType_e {
+		VT_UNKNOWN = "0"
+
+		<**
+			@description : the following type is a sink
+		**>
+		VT_SINK = "1"
+
+		<**
+			@description : the following type is a source
+		**>
+		VT_SOURCE = "2"
+		VT_MAX
+	}
+
+	enumeration am_NotificationStatus_e {
+		NS_UNKNOWN = "0"
+
+		<**
+			@description : No notification, the function is turned off
+		**>
+		NS_OFF = "1"
+
+		<**
+			@description : Periodic notifications are sent out. The period in ms is given by am_NotificationParameter
+		**>
+		NS_PERIODIC = "2"
+
+		<**
+			@description : The notification is sent out when the minimum given by am_NotificationParameter is reached.
+		**>
+		NS_MINIMUM = "3"
+
+		<**
+			@description : The notification is sent out when the maximum given by am_NotificationParameter is reached.
+		**>
+		NS_MAXIMUM = "4"
+
+		<**
+			@description : The notification is sent out when a change happened. The Resolution of the change is defined by am_NotificationParameter.
+		**>
+		NS_CHANGE_ = "5"
+		NS_MAX
+	}
+
+	<**
+		@description : This enumeration is used to define the type of the action that is correlated to a handle.
+	**>
+	enumeration am_Handle_e {
+		H_UNKNOWN = "0"
+		H_CONNECT = "1"
+		H_DISCONNECT = "2"
+		H_SETSOURCESTATE = "3"
+		H_SETSINKVOLUME = "4"
+		H_SETSOURCEVOLUME = "5"
+		H_SETSINKSOUNDPROPERTY = "6"
+		H_SETSOURCESOUNDPROPERTY = "7"
+		H_SETSINKSOUNDPROPERTIES = "8"
+		H_SETSOURCESOUNDPROPERTIES = "9"
+		H_CROSSFADE = "10"
+		H_SETVOLUMES = "11"
+		H_SETSINKNOTIFICATION = "12"
+		H_SETSOURCENOTIFICATION = "13"
+		H_MAX
+	}
+
+	<**
+		@description : The source state reflects the state of the source
+	**>
+	enumeration am_SourceState_e {
+		SS_UNKNNOWN = "0"
+
+		<**
+			@description : The source can be activly heared
+		**>
+		SS_ON = "1"
+
+		<**
+			@description : The source cannot be heared
+		**>
+		SS_OFF = "2"
+
+		<**
+			@description : The source is paused. Meaning it cannot be heared but should be prepared to play again soon.
+		**>
+		SS_PAUSED = "3"
+		SS_MAX
+	}
+
+	<**
+		@description : This enum describes the ready state of the routing part
+	**>
+	enumeration am_RoutingReady_e {
+		RR_UNKNOWN = "0"
+		RR_READY = "1"
+		RR_RUNDOWN = "2"
+	}
+
+	<**
+		@description : a list of routing elements that lead from source to sink
+	**>
+	struct am_Route_s {
+
+		<**
+			@description : the sourceID where the route starts
+		**>
+		am_sourceID_t sourceID
+
+		<**
+			@description : the sinkID where the route ends
+		**>
+		am_sinkID_t sinkID
+
+		<**
+			@description : the actual route as list of routing elements
+		**>
+		am_RoutingElement_L route
+	}
+
+	<**
+		@description : this describes the availability of a sink or a source together with the latest change
+	**>
+	struct am_Availability_s {
+
+		<**
+			@description : the current availability state
+		**>
+		am_Availability_e availability
+
+		<**
+			@description : the reason for the last change. This can be used to trigger events that deal with state changes.
+		**>
+		am_CustomAvailabilityReason_t availabilityReason
+	}
+
+	<**
+		@description : describes class properties
+	**>
+	struct am_ClassProperty_s {
+
+		<**
+			@description : the property as enum
+		**>
+		am_CustomClassProperty_t classProperty
+
+		<**
+			@description : the value of the property
+		**>
+		Int16 value
+	}
+
+	<**
+		@description : This struct describes the attribiutes of a crossfader.
+	**>
+	struct am_Crossfader_s {
+
+		<**
+			@description : This is the ID of the crossfader, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManager daemon), or it is a fixed (the project has to ensure the uniqueness of the ID).
+		**>
+		am_crossfaderID_t crossfaderID
+
+		<**
+			@description : The name of the crossfader. Must be unique in the whole system. 
+		**>
+		String name
+
+		<**
+			@description : The sinkID of the SinkA. Sinks shall be registered before registering the crossfader.
+		**>
+		am_sinkID_t sinkID_A
+
+		<**
+			@description : The sinkID of the SinkB. Sinks shall be registered before registering the crossfader.
+		**>
+		am_sinkID_t sinkID_B
+
+		<**
+			@description : The sourceID of the crossfader source. The source shall be registered before the crossfader.
+		**>
+		am_sourceID_t sourceID
+
+		<**
+			@description : This enum can have 3 states:
 

     HS_SINKA sinkA is the current hot one, sinkB is not audible

     HS_SINKB sinkB is the current hot one, sinkB is not audible

     HS_INTERMEDIATE the fader is stuck in between a cross-fading action. This could be due to an abort or an error. Before using the crossfader, it must be set to either HS_SINKA or HS_SINKB.

-        **>

-        am_HotSink_e hotSink

-    }

-

-    <**

-        @description : This struct describes the attributes of a gateway.

-    **>

-    struct am_Gateway_s {

-

-        <**

-            @description : This is the ID of the gateway, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it is a fixed (the project has to ensure the uniqueness of the ID).

-        **>

-        am_gatewayID_t gatewayID

-

-        <**

-            @description : The name of the gateway. Must be unique in the whole system.

-        **>

-        String name

-

-        <**

-            @description : The sinkID of the gateway sink-end. The sink is a full blown sink with connectionFormats, sinkClassIDs etc... It makes sense to register the sinks of a gateway as non-visible. Care needs to be taken that the connectionsFormats match with the ones in the conversionMatrix. If the sink is located in the controllingDomain, the ID needs to be retrieved by registering the sink before registering the gateway. In case the sink is in a different domain, the ID needs to be retrieved via peeking.

-        **>

-        am_sinkID_t sinkID

-

-        <**

-            @description : The sourceID of the gateway sink-end. The sink is a full blown source with connectionFormats, sinkClassIDs etc... It makes sense to register the sources of a gateway as non-visible. Care needs to be taken that the connectionsFormats match with the ones in the conversionMatrix. If the source is located in the controllingDomain, the ID needs to be retrieved by registering the source before registering the gateway. In case the source is in a different domain, the ID needs to be retrieved via peeking.

-        **>

-        am_sourceID_t sourceID

-

-        <**

-            @description : The ID of the sink. If the domain is the same like the controlling domain, the ID is known due to registration. If the domain is different, the ID needs to be retrieved via peeking.

-        **>

-        am_domainID_t domainSinkID

-

-        <**

-            @description : The ID of the source. If the domain is the same like the controlling domain, the ID is known due to registration. If the domain is different, the ID needs to be retrieved via peeking.

-        **>

-        am_domainID_t domainSourceID

-

-        <**

-            @description : This is the ID of the domain that registers the gateway.

-        **>

-        am_domainID_t controlDomainID

-

-        <**

-            @description : This is the list of available formats on the source side of the gateway. It is not defined during the gateway registration but copied from the source registration.

-        **>

-        am_ConnectionFormat_L listSourceFormats

-

-        <**

-            @description : This is the list of available formats on the sink side of the gateway. It is not defined during the gateway registration but copied from the sink registration.

-        **>

-        am_ConnectionFormat_L listSinkFormats

-

-        <**

-            @description : This is matrix holding information about the conversion capability of the gateway, it's length is defined by the length(listSinkFormats) x length(listSourceFormats).

+		**>
+		am_HotSink_e hotSink
+	}
+
+	<**
+		@description : This struct describes the attributes of a gateway.
+	**>
+	struct am_Gateway_s {
+
+		<**
+			@description : This is the ID of the gateway, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it is a fixed (the project has to ensure the uniqueness of the ID).
+		**>
+		am_gatewayID_t gatewayID
+
+		<**
+			@description : The name of the gateway. Must be unique in the whole system.
+		**>
+		String name
+
+		<**
+			@description : The sinkID of the gateway sink-end. The sink is a full blown sink with connectionFormats, sinkClassIDs etc... It makes sense to register the sinks of a gateway as non-visible. Care needs to be taken that the connectionsFormats match with the ones in the conversionMatrix. If the sink is located in the controllingDomain, the ID needs to be retrieved by registering the sink before registering the gateway. In case the sink is in a different domain, the ID needs to be retrieved via peeking.
+		**>
+		am_sinkID_t sinkID
+
+		<**
+			@description : The sourceID of the gateway sink-end. The sink is a full blown source with connectionFormats, sinkClassIDs etc... It makes sense to register the sources of a gateway as non-visible. Care needs to be taken that the connectionsFormats match with the ones in the conversionMatrix. If the source is located in the controllingDomain, the ID needs to be retrieved by registering the source before registering the gateway. In case the source is in a different domain, the ID needs to be retrieved via peeking.
+		**>
+		am_sourceID_t sourceID
+
+		<**
+			@description : The ID of the sink. If the domain is the same like the controlling domain, the ID is known due to registration. If the domain is different, the ID needs to be retrieved via peeking.
+		**>
+		am_domainID_t domainSinkID
+
+		<**
+			@description : The ID of the source. If the domain is the same like the controlling domain, the ID is known due to registration. If the domain is different, the ID needs to be retrieved via peeking.
+		**>
+		am_domainID_t domainSourceID
+
+		<**
+			@description : This is the ID of the domain that registers the gateway.
+		**>
+		am_domainID_t controlDomainID
+
+		<**
+			@description : This is the list of available formats on the source side of the gateway. It is not defined during the gateway registration but copied from the source registration.
+		**>
+		am_ConnectionFormat_L listSourceFormats
+
+		<**
+			@description : This is the list of available formats on the sink side of the gateway. It is not defined during the gateway registration but copied from the sink registration.
+		**>
+		am_ConnectionFormat_L listSinkFormats
+
+		<**
+			@description : This is matrix holding information about the conversion capability of the gateway, it's length is defined by the length(listSinkFormats) x length(listSourceFormats).
 If a SinkFormat can be converted into a SourceFormat, the vector will hold a 1, if no conversion is possible, a 0.

 The data is stored row orientated, where the rows are related to the sinksFormats and the columns to the sourceFormats. The first value will hold the conversion information from the first sourceFormat to the first sinkFormat for example and the seventh value the information about the 3rd sinkFormat to the 1st sourceFormat in case we would have 3 sourceFormats.

-        **>

-        am_Convertion_L convertionMatrix

-    }

-

-    <**

-        @description : This represents one "hopp" in a route

-    **>

-    struct am_RoutingElement_s {

-

-        <**

-            @description : the source ID

-        **>

-        am_sourceID_t sourceID

-

-        <**

-            @description : the sinkID

-        **>

-        am_sinkID_t sinkID

-

-        <**

-            @description : the domainID the routeElement is in

-        **>

-        am_domainID_t domainID

-

-        <**

-            @description : the connectionformat that is used for the route

-        **>

-        am_ConnectionFormat_pe connectionFormat

-    }

-

-    <**

-        @description : struct describing the sound property

-    **>

-    struct am_SoundProperty_s {

-

-        <**

-            @description : the type of the property - a project specific enum

-        **>

-        am_SoundPropertyType_pe type

-

-        <**

-            @description : the actual value of the property

-        **>

-        Int16 value

-    }

-

-    <**

-        @description : struct describing system properties

-    **>

-    struct am_SystemProperty_s {

-

-        <**

-            @description : the type that is set

-        **>

-        am_SystemPropertyType_pe type

-

-        <**

-            @description : the value

-        **>

-        Int16 value

-    }

-

-    <**

-        @description : struct describing sinkclasses

-    **>

-    struct am_SinkClass_s {

-

-        <**

-            @description : the ID of the sinkClass

-        **>

-        am_sinkClass_t sinkClassID

-

-        <**

-            @description : the name of the sinkClass - must be unique in the system

-        **>

-        String name

-

-        <**

-            @description : the list of the class properties. These are pairs of  a project specific enum describing the type of the value and an integer holding the real value.

-        **>

-        am_ClassProperty_L listClassProperties

-    }

-

-    <**

-        @description : struct describing source classes

-    **>

-    struct am_SourceClass_s {

-

-        <**

-            @description : the source ID

-        **>

-        am_sourceClass_t sourceClassID

-

-        <**

-            @description : the name of the sourceClass - must be unique in the system

-        **>

-        String name

-

-        <**

-            @description : the list of the class properties. These are pairs of  a project specific enum describing the type of the value and an integer holding the real value.

-        **>

-        am_ClassProperty_L listClassProperties

-    }

-

-    <**

-        @description : this type holds all information of sources relevant to the HMI

-    **>

-    struct am_SourceType_s {

-

-        <**

-            @description : This is the ID of the source, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it is a fixed (the project has to ensure the uniqueness of the ID).

-        **>

-        am_sourceID_t sourceID

-

-        <**

-            @description : The name of the source. Must be unique in the whole system.

-        **>

-        String name

-

-        <**

-            @description : the availability of the source

-        **>

-        am_Availability_s availability

-

-        <**

-            @description : the sourceClassID, indicates the class the source is in. This information can be used by the Controller to implement different behaviour for different classes.

-        **>

-        am_sourceClass_t sourceClassID

-    }

-

-    <**

-        @description : this type holds all information of sinks relevant to the HMI

-    **>

-    struct am_SinkType_s {

-

-        <**

-            @description : This is the ID of the sink, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it is a fixed (the project has to ensure the uniqueness of the ID).

-        **>

-        am_sinkID_t sinkID

-

-        <**

-            @description : The name of the sink. Must be unique in the whole system. 

-        **>

-        String name

-

-        <**

-            @description : This attribute reflects the availability of the sink. There are several reasons why a sink could be not available for the moment: for example the shutdown of a sink because of overtemperature or over- &amp; undervoltage. The availability consists of two pieces of information:

+		**>
+		am_Convertion_L convertionMatrix
+	}
+
+	<**
+		@description : This represents one "hopp" in a route
+	**>
+	struct am_RoutingElement_s {
+
+		<**
+			@description : the source ID
+		**>
+		am_sourceID_t sourceID
+
+		<**
+			@description : the sinkID
+		**>
+		am_sinkID_t sinkID
+
+		<**
+			@description : the domainID the routeElement is in
+		**>
+		am_domainID_t domainID
+
+		<**
+			@description : the connectionformat that is used for the route
+		**>
+		am_CustomConnectionFormat_t connectionFormat
+	}
+
+	<**
+		@description : struct describing the sound property
+	**>
+	struct am_SoundProperty_s {
+
+		<**
+			@description : the type of the property - a project specific enum
+		**>
+		am_CustomSoundPropertyType_t type
+
+		<**
+			@description : the actual value of the property
+		**>
+		Int16 value
+	}
+
+	<**
+		@description : struct describing system properties
+	**>
+	struct am_SystemProperty_s {
+
+		<**
+			@description : the type that is set
+		**>
+		am_CustomSystemPropertyType_t type
+
+		<**
+			@description : the value
+		**>
+		Int16 value
+	}
+
+	<**
+		@description : struct describing sinkclasses
+	**>
+	struct am_SinkClass_s {
+
+		<**
+			@description : the ID of the sinkClass
+		**>
+		am_sinkClass_t sinkClassID
+
+		<**
+			@description : the name of the sinkClass - must be unique in the system
+		**>
+		String name
+
+		<**
+			@description : the list of the class properties. These are pairs of  a project specific enum describing the type of the value and an integer holding the real value.
+		**>
+		am_ClassProperty_L listClassProperties
+	}
+
+	<**
+		@description : struct describing source classes
+	**>
+	struct am_SourceClass_s {
+
+		<**
+			@description : the source ID
+		**>
+		am_sourceClass_t sourceClassID
+
+		<**
+			@description : the name of the sourceClass - must be unique in the system
+		**>
+		String name
+
+		<**
+			@description : the list of the class properties. These are pairs of  a project specific enum describing the type of the value and an integer holding the real value.
+		**>
+		am_ClassProperty_L listClassProperties
+	}
+
+	<**
+		@description : this type holds all information of sources relevant to the HMI
+	**>
+	struct am_SourceType_s {
+
+		<**
+			@description : This is the ID of the source, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it is a fixed (the project has to ensure the uniqueness of the ID).
+		**>
+		am_sourceID_t sourceID
+
+		<**
+			@description : The name of the source. Must be unique in the whole system.
+		**>
+		String name
+
+		<**
+			@description : the availability of the source
+		**>
+		am_Availability_s availability
+
+		<**
+			@description : the sourceClassID, indicates the class the source is in. This information can be used by the Controller to implement different behaviour for different classes.
+		**>
+		am_sourceClass_t sourceClassID
+	}
+
+	<**
+		@description : this type holds all information of sinks relevant to the HMI
+	**>
+	struct am_SinkType_s {
+
+		<**
+			@description : This is the ID of the sink, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it is a fixed (the project has to ensure the uniqueness of the ID).
+		**>
+		am_sinkID_t sinkID
+
+		<**
+			@description : The name of the sink. Must be unique in the whole system. 
+		**>
+		String name
+
+		<**
+			@description : This attribute reflects the availability of the sink. There are several reasons why a sink could be not available for the moment: for example the shutdown of a sink because of overtemperature or over- &amp; undervoltage. The availability consists of two pieces of information:
 

     Availablility: the status itself, can be A_AVAILABLE, A_UNAVAILABLE or A_UNKNOWN

     AvailabilityReason: this informs about the last reason for a change in availability. The reasons itself are product specific.

-        **>

-        am_Availability_s availability

-

-        <**

-            @description : This is the representation of the Volume for the commandInterface. It is used by the HMI to set the volume of a sink, the AudioManagerController has to transform this into real source and sink volumes.

-        **>

-        am_mainVolume_t volume

-        am_MuteState_e muteState

-

-        <**

-            @description : The sinkClassID references to a sinkClass. With the help of classification, rules can be setup to define the system behaviour.

-        **>

-        am_sinkClass_t sinkClassID

-    }

-

-    <**

-        @description : a handle is used for asynchronous operations and is uniquely assigned for each of this operations 

-    **>

-    struct am_Handle_s {

-

-        <**

-            @description : the handletype

-        **>

-        am_Handle_e handleType

-

-        <**

-            @description : the handle as value

-        **>

-        UInt16 handle

-    }

-

-    <**

-        @description : struct describung mainsound property

-    **>

-    struct am_MainSoundProperty_s {

-

-        <**

-            @description : the type of the property 

-        **>

-        am_MainSoundPropertyType_pe type

-

-        <**

-            @description : the actual value

-        **>

-        Int16 value

-    }

-

-    <**

-        @description : this type holds all information of connections relevant to the HMI

-    **>

-    struct am_MainConnectionType_s {

-

-        <**

-            @description : the ID of the mainconnection

-        **>

-        am_mainConnectionID_t mainConnectionID

-

-        <**

-            @description : the sourceID where the connection starts

-        **>

-        am_sourceID_t sourceID

-

-        <**

-            @description : the sinkID where the connection ends

-        **>

-        am_sinkID_t sinkID

-

-        <**

-            @description : the delay of the mainconnection

-        **>

-        am_timeSync_t delay

-

-        <**

-            @description : the current connection state

-        **>

-        am_ConnectionState_e connectionState

-    }

-

-    <**

-        @description : struct that holds attribiutes of a mainconnection

-    **>

-    struct am_MainConnection_s {

-

-        <**

-            @description : the assigned ID

-        **>

-        am_mainConnectionID_t mainConnectionID

-

-        <**

-            @description : the current connection state

-        **>

-        am_ConnectionState_e connectionState

-

-        <**

-            @description : the sinkID

-        **>

-        am_sinkID_t sinkID

-

-        <**

-            @description : the sourceID

-        **>

-        am_sourceID_t sourceID

-

-        <**

-            @description : the delay of the connection

-        **>

-        am_timeSync_t delay

-

-        <**

-            @description : the list of sub connection IDs the mainconnection consists of 

-        **>

-        am_ConnectionID_L listConnectionID

-    }

-

-    <**

-        @description : This struct holds the payload of a notification.

-    **>

-    struct am_NotificationPayload_s {

-

-        <**

-            @description : This defines the notification type

-        **>

-        am_NotificationType_pe type

-

-        <**

-            @description : This is finally the value of the notification. It's meaning depends on the notificationType

-        **>

-        Int16 value

-    }

-

-    <**

-        @description : This struct holds information about the configuration for notifications

-    **>

-    struct am_NotificationConfiguration_s {

-

-        <**

-            @description : The notification type of the notification

-        **>

-        am_NotificationType_pe type

-

-        <**

-            @description : The Notification status. This can be periodic, min/max value based or even off for example

-        **>

-        am_NotificationStatus_e status

-

-        <**

-            @description : This gives additional information to the notification status. 

+		**>
+		am_Availability_s availability
+
+		<**
+			@description : This is the representation of the Volume for the commandInterface. It is used by the HMI to set the volume of a sink, the AudioManagerController has to transform this into real source and sink volumes.
+		**>
+		am_mainVolume_t volume
+		am_MuteState_e muteState
+
+		<**
+			@description : The sinkClassID references to a sinkClass. With the help of classification, rules can be setup to define the system behaviour.
+		**>
+		am_sinkClass_t sinkClassID
+	}
+
+	<**
+		@description : a handle is used for asynchronous operations and is uniquely assigned for each of this operations 
+	**>
+	struct am_Handle_s {
+
+		<**
+			@description : the handletype
+		**>
+		am_Handle_e handleType
+
+		<**
+			@description : the handle as value
+		**>
+		UInt16 handle
+	}
+
+	<**
+		@description : struct describung mainsound property
+	**>
+	struct am_MainSoundProperty_s {
+
+		<**
+			@description : the type of the property 
+		**>
+		am_CustomMainSoundPropertyType_t type
+
+		<**
+			@description : the actual value
+		**>
+		Int16 value
+	}
+
+	<**
+		@description : this type holds all information of connections relevant to the HMI
+	**>
+	struct am_MainConnectionType_s {
+
+		<**
+			@description : the ID of the mainconnection
+		**>
+		am_mainConnectionID_t mainConnectionID
+
+		<**
+			@description : the sourceID where the connection starts
+		**>
+		am_sourceID_t sourceID
+
+		<**
+			@description : the sinkID where the connection ends
+		**>
+		am_sinkID_t sinkID
+
+		<**
+			@description : the delay of the mainconnection
+		**>
+		am_timeSync_t delay
+
+		<**
+			@description : the current connection state
+		**>
+		am_ConnectionState_e connectionState
+	}
+
+	<**
+		@description : struct that holds attribiutes of a mainconnection
+	**>
+	struct am_MainConnection_s {
+
+		<**
+			@description : the assigned ID
+		**>
+		am_mainConnectionID_t mainConnectionID
+
+		<**
+			@description : the current connection state
+		**>
+		am_ConnectionState_e connectionState
+
+		<**
+			@description : the sinkID
+		**>
+		am_sinkID_t sinkID
+
+		<**
+			@description : the sourceID
+		**>
+		am_sourceID_t sourceID
+
+		<**
+			@description : the delay of the connection
+		**>
+		am_timeSync_t delay
+
+		<**
+			@description : the list of sub connection IDs the mainconnection consists of 
+		**>
+		am_ConnectionID_L listConnectionID
+	}
+
+	<**
+		@description : This struct holds the payload of a notification.
+	**>
+	struct am_NotificationPayload_s {
+
+		<**
+			@description : This defines the notification type
+		**>
+		am_CustomNotificationType_t type
+
+		<**
+			@description : This is finally the value of the notification. It's meaning depends on the notificationType
+		**>
+		Int16 value
+	}
+
+	<**
+		@description : This struct holds information about the configuration for notifications
+	**>
+	struct am_NotificationConfiguration_s {
+
+		<**
+			@description : The notification type of the notification
+		**>
+		am_CustomNotificationType_t type
+
+		<**
+			@description : The Notification status. This can be periodic, min/max value based or even off for example
+		**>
+		am_NotificationStatus_e status
+
+		<**
+			@description : This gives additional information to the notification status. 
 Relation between notification status and the value:

 NS_PERIODIC - the period in ms

 NS_MINIMUM - the minimum value that triggers the notification

 NS_MAXIMUM - the maximum value that triggers the notifcation

 NS_CHANGE - the resolution of the change value

-        **>

-        Int16 parameter

-    }

-

-    <**

-        @description : This struct describes the attribiutes of a sink

-    **>

-    struct am_Sink_s {

-

-        <**

-            @description : This is the ID of the sink, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it is a fixed (the project has to ensure the uniqueness of the ID).

-        **>

-        am_sinkID_t sinkID

-

-        <**

-            @description : The name of the sink. Must be unique in the whole system. 

-        **>

-        String name

-

-        <**

-            @description : The domainID is the domain the sink belongs to. A sink can only be in one domain.

-        **>

-        am_domainID_t domainID

-

-        <**

-            @description : The sinkClassID references to a sinkClass. With the help of classification, rules can be setup to define the system behaviour.

-        **>

-        am_sinkClass_t sinkClassID

-

-        <**

-            @description : This is the volume of the sink. It is set by the AudioManagerController. 

-        **>

-        am_volume_t volume

-

-        <**

-            @description : This Boolean flag indicates whether a sink is visible to the commandInterface or not. If the User must have the possibility to choose the source in the HMI, it must be visible. But there are also good reasons for invisible sinks, for example if the sink is part of a crossfader or gateway. HMI relevant changes in visible sinks will be automatically reported by the daemon to the commandInterface.

-        **>

-        Boolean visible

-

-        <**

-            @description : This attribute reflects the availability of the sink. There are several reasons why a sink could be not available for the moment: for example the shutdown of a sink because of overtemperature or over- &amp; undervoltage. The availability consists of two pieces of information:

+		**>
+		Int16 parameter
+	}
+
+	<**
+		@description : This struct describes the attribiutes of a sink
+	**>
+	struct am_Sink_s {
+
+		<**
+			@description : This is the ID of the sink, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it is a fixed (the project has to ensure the uniqueness of the ID).
+		**>
+		am_sinkID_t sinkID
+
+		<**
+			@description : The name of the sink. Must be unique in the whole system. 
+		**>
+		String name
+
+		<**
+			@description : The domainID is the domain the sink belongs to. A sink can only be in one domain.
+		**>
+		am_domainID_t domainID
+
+		<**
+			@description : The sinkClassID references to a sinkClass. With the help of classification, rules can be setup to define the system behaviour.
+		**>
+		am_sinkClass_t sinkClassID
+
+		<**
+			@description : This is the volume of the sink. It is set by the AudioManagerController. 
+		**>
+		am_volume_t volume
+
+		<**
+			@description : This Boolean flag indicates whether a sink is visible to the commandInterface or not. If the User must have the possibility to choose the source in the HMI, it must be visible. But there are also good reasons for invisible sinks, for example if the sink is part of a crossfader or gateway. HMI relevant changes in visible sinks will be automatically reported by the daemon to the commandInterface.
+		**>
+		Boolean visible
+
+		<**
+			@description : This attribute reflects the availability of the sink. There are several reasons why a sink could be not available for the moment: for example the shutdown of a sink because of overtemperature or over- &amp; undervoltage. The availability consists of two pieces of information:
 

     Availablility: the status itself, can be A_AVAILABLE, A_UNAVAILABLE or A_UNKNOWN

     AvailabilityReason: this informs about the last reason for a change in availability. The reasons itself are product specific.

-        **>

-        am_Availability_s available

-

-        <**

-            @description : This attribute reflects the muteState of the sink. The information is not the "real" state of the sink, but the HMI representation for he commandInterface controlled by the AudioManagerController.

-        **>

-        am_MuteState_e muteState

-

-        <**

-            @description : This is the representation of the Volume for the commandInterface. It is used by the HMI to set the volume of a sink, the AudioManagerController has to transform this into real source and sink volumes.

-        **>

-        am_mainVolume_t mainVolume

-

-        <**

-            @description : This is the list of soundProperties, that the sink is capable of. The soundProperties itself are project specific. For sinks, a possible soundProperty could be for example settings.

-        **>

-        am_SoundProperty_L listSoundProperties

-

-        <**

-            @description : This list holds information about the formats that the Source is capable of supporting when delivering audio.

-        **>

-        am_ConnectionFormat_L listConnectionFormats

-

-        <**

-            @description : This is the list of the available mainSoundProperties. The principle is the same than with soundProperties, but they are only visible to the CommandInterface.

-        **>

-        am_MainSoundProperty_L listMainSoundProperties

-

-        <**

-            @description : This is the list of the MainNotificationConfigurations. These notifications work on the level of command interface.

-        **>

-        am_NotificationConfiguration_L listMainNotificationConfigurations

-

-        <**

-            @description : This is the list of the NotificationConfigurations. These notifications work on the level of RoutingPlugins.

-        **>

-        am_NotificationConfiguration_L listNotificationConfigurations

-    }

-

-    <**

-        @description : This struct describes the attribiutes of a source

-    **>

-    struct am_Source_s {

-

-        <**

-            @description : This is the ID of the source, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it is a fixed (the project has to ensure the uniqueness of the ID).

-        **>

-        am_sourceID_t sourceID

-

-        <**

-            @description : The domainID is the domain the source belongs to. A source can only be in one domain.

-        **>

-        am_domainID_t domainID

-

-        <**

-            @description : The name of the source. Must be unique in the whole system.

-        **>

-        String name

-

-        <**

-            @description : the sourceClassID, indicates the class the source is in. This information can be used by the Controller to implement different behaviour for different classes.

-        **>

-        am_sourceClass_t sourceClassID

-

-        <**

-            @description : The source state is an indication towards the source if it is actively heard or not. The source can use this information to implement features like automatic spin down of CD's in case the CD is not the active source or AF following of a tuner that is not actively heard. The source state is set by the AudioManagerController.There are 3 possible states:

+		**>
+		am_Availability_s available
+
+		<**
+			@description : This attribute reflects the muteState of the sink. The information is not the "real" state of the sink, but the HMI representation for he commandInterface controlled by the AudioManagerController.
+		**>
+		am_MuteState_e muteState
+
+		<**
+			@description : This is the representation of the Volume for the commandInterface. It is used by the HMI to set the volume of a sink, the AudioManagerController has to transform this into real source and sink volumes.
+		**>
+		am_mainVolume_t mainVolume
+
+		<**
+			@description : This is the list of soundProperties, that the sink is capable of. The soundProperties itself are project specific. For sinks, a possible soundProperty could be for example settings.
+		**>
+		am_SoundProperty_L listSoundProperties
+
+		<**
+			@description : This list holds information about the formats that the Source is capable of supporting when delivering audio.
+		**>
+		am_ConnectionFormat_L listConnectionFormats
+
+		<**
+			@description : This is the list of the available mainSoundProperties. The principle is the same than with soundProperties, but they are only visible to the CommandInterface.
+		**>
+		am_MainSoundProperty_L listMainSoundProperties
+
+		<**
+			@description : This is the list of the MainNotificationConfigurations. These notifications work on the level of command interface.
+		**>
+		am_NotificationConfiguration_L listMainNotificationConfigurations
+
+		<**
+			@description : This is the list of the NotificationConfigurations. These notifications work on the level of RoutingPlugins.
+		**>
+		am_NotificationConfiguration_L listNotificationConfigurations
+	}
+
+	<**
+		@description : This struct describes the attribiutes of a source
+	**>
+	struct am_Source_s {
+
+		<**
+			@description : This is the ID of the source, it is unique in the system. There are 2 ways, ID can be created: either it is assigned during the registration process (in a dynamic context, uniqueness will be ensured by the AudioManagerDaemon), or it is a fixed (the project has to ensure the uniqueness of the ID).
+		**>
+		am_sourceID_t sourceID
+
+		<**
+			@description : The domainID is the domain the source belongs to. A source can only be in one domain.
+		**>
+		am_domainID_t domainID
+
+		<**
+			@description : The name of the source. Must be unique in the whole system.
+		**>
+		String name
+
+		<**
+			@description : the sourceClassID, indicates the class the source is in. This information can be used by the Controller to implement different behaviour for different classes.
+		**>
+		am_sourceClass_t sourceClassID
+
+		<**
+			@description : The source state is an indication towards the source if it is actively heard or not. The source can use this information to implement features like automatic spin down of CD's in case the CD is not the active source or AF following of a tuner that is not actively heard. The source state is set by the AudioManagerController.There are 3 possible states:
 

     SS_ON: the source is active

     SS_OFF: the source is off

     SS_PAUSED: the source is paused and not active.

-        **>

-        am_SourceState_e sourceState

+		**>
+		am_SourceState_e sourceState
 

-        <**

-            @description : This is the volume of the source. It is set by the AudioManagerController. It is used to adopt different audiolevels in a system and mixing of sources (e.g. navigation hints &amp; music). 

-        **>

-        am_volume_t volume

+		<**
+			@description : This is the volume of the source. It is set by the AudioManagerController. It is used to adopt different audiolevels in a system and mixing of sources (e.g. navigation hints &amp; music). 
+		**>
+		am_volume_t volume
 

-        <**

-            @description : This Boolean flag indicates whether a source is visible to the commandInterface or not. If the User must have the possibility to choose the source in the HMI, it must be visible. But there are also good reasons for invisible sources, for example if the source is part of a crossfader or gateway. HMI relevant changes in visible sources will be automatically reported by the daemon to the commandInterface.

-        **>

-        Boolean visible

+		<**
+			@description : This Boolean flag indicates whether a source is visible to the commandInterface or not. If the User must have the possibility to choose the source in the HMI, it must be visible. But there are also good reasons for invisible sources, for example if the source is part of a crossfader or gateway. HMI relevant changes in visible sources will be automatically reported by the daemon to the commandInterface.
+		**>
+		Boolean visible
 

-        <**

-            @description : This attribute reflects the availability of the source. There are several reasons why a source could be not available for the moment. For example a CD player which has no CD entered in the slot can be unavailable, or a USB player with no or unreadable stick attached. Other scenarios involve the shutdown of a source because of overtemperature or over- &amp; undervoltage. The availability consists of two informations:

+		<**
+			@description : This attribute reflects the availability of the source. There are several reasons why a source could be not available for the moment. For example a CD player which has no CD entered in the slot can be unavailable, or a USB player with no or unreadable stick attached. Other scenarios involve the shutdown of a source because of overtemperature or over- &amp; undervoltage. The availability consists of two informations:
 

     Availablility: the status itself, can be A_AVAILABLE, A_UNAVAILABLE or A_UNKNOWN

     AvailabilityReason: this informs about the last reason for a change in availability. The reasons itself are product specific.

-        **>

-        am_Availability_s available

+		**>
+		am_Availability_s available
 

-        <**

-            @description : Some special sources can have special behaviors, the are so called "Low Level Interrupts". Here the current status is documented. The information can be used by the AudioManagerController to react to the changes by for example lowering the volume of the mainSources. The two states are

+		<**
+			@description : Some special sources can have special behaviors, the are so called "Low Level Interrupts". Here the current status is documented. The information can be used by the AudioManagerController to react to the changes by for example lowering the volume of the mainSources. The two states are
 

     IS_OFF: the interrupt is not active at the moment

     IS_INTERRUPTED: the interrupt is playing at the moment.

-        **>

-        am_InterruptState_e interruptState

-

-        <**

-            @description : This is the list of soundProperties, that the source is capable of. The soundProperties itself are project specific. For sources, a possible soundProperty could be navigation volume offset, for example. 

-        **>

-        am_SoundProperty_L listSoundProperties

-

-        <**

-            @description : This list holds information about the formats that the Source is capable of supporting when delivering audio.

-        **>

-        am_ConnectionFormat_L listConnectionFormats

-

-        <**

-            @description : This is the list of the available mainSoundProperties. The principle is the same than with soundProperties, but they are only visible to the CommandInterface.

-        **>

-        am_MainSoundProperty_L listMainSoundProperties

-

-        <**

-            @description : The list of MainNotificationConfigurations. These notifications work on the level of CommandInterface.

-        **>

-        am_NotificationConfiguration_L listMainNotificationConfigurations

-

-        <**

-            @description : The list of MainNotificationConfigurations. These notifications work on the level of RoutingInterface.

-        **>

-        am_NotificationConfiguration_L listNotificationConfigurations

-    }

-

-    <**

-        @description : This struct describes the attribiutes of a domain

-    **>

-    struct am_Domain_s {

-

-        <**

-            @description : the domain ID

-        **>

-        am_domainID_t domainID

-

-        <**

-            @description : the name of the domain

-        **>

-        String name

-

-        <**

-            @description : the busname. This is equal to a plugin name and is used to dispatch messages to the elements of a plugin

-        **>

-        String busname

-

-        <**

-            @description : the name of the node

-        **>

-        String nodename

-

-        <**

-            @description : indicated if the domain is independent at startup or not

-        **>

-        Boolean early

-

-        <**

-            @description : indicates if the domain registration is complete or not

-        **>

-        Boolean complete

-

-        <**

-            @description : the current domain state

-        **>

-        am_DomainState_e ^state

-    }

-

-    struct am_EarlyData_s {

-        am_EarlyDataType_e type

-        am_DataType_u sinksource

-        am_EarlyData_u data

-    }

-

-    <**

-        @description : a connection

-    **>

-    struct am_Connection_s {

-

-        <**

-            @description : the assigned ID

-        **>

-        am_connectionID_t connectionID

-

-        <**

-            @description : the source the audio flows from

-        **>

-        am_sourceID_t sourceID

-

-        <**

-            @description : the sink the audio flows to

-        **>

-        am_sinkID_t sinkID

-

-        <**

-            @description : the delay of the conneciton

-        **>

-        am_timeSync_t delay

-

-        <**

-            @description : the used connectionformat

-        **>

-        am_ConnectionFormat_pe connectionFormat

-    }

-

-    <**

-        @description : This types describe a mixed description for source and sinks volumes.

-    **>

-    struct am_Volumes_s {

-

-        <**

-            @description : describes the type of the volume: source or sink.

-        **>

-        am_VolumeType_e volumeType

-

-        <**

-            @description : either sourceID or sinkID

-        **>

-        am_DataType_u volumeID

-

-        <**

-            @description : The volume

-        **>

-        am_volume_t volume

-

-        <**

-            @description : the ramp that shall be driven

-        **>

-        am_RampType_pe ramp

-

-        <**

-            @description : the time for the ramp

-        **>

-        am_time_t time

-    }

-

-    <**

-        @description : data type depends of am_EarlyDataType_e:

+		**>
+		am_InterruptState_e interruptState
+
+		<**
+			@description : This is the list of soundProperties, that the source is capable of. The soundProperties itself are project specific. For sources, a possible soundProperty could be navigation volume offset, for example. 
+		**>
+		am_SoundProperty_L listSoundProperties
+
+		<**
+			@description : This list holds information about the formats that the Source is capable of supporting when delivering audio.
+		**>
+		am_ConnectionFormat_L listConnectionFormats
+
+		<**
+			@description : This is the list of the available mainSoundProperties. The principle is the same than with soundProperties, but they are only visible to the CommandInterface.
+		**>
+		am_MainSoundProperty_L listMainSoundProperties
+
+		<**
+			@description : The list of MainNotificationConfigurations. These notifications work on the level of CommandInterface.
+		**>
+		am_NotificationConfiguration_L listMainNotificationConfigurations
+
+		<**
+			@description : The list of MainNotificationConfigurations. These notifications work on the level of RoutingInterface.
+		**>
+		am_NotificationConfiguration_L listNotificationConfigurations
+	}
+
+	<**
+		@description : This struct describes the attribiutes of a domain
+	**>
+	struct am_Domain_s {
+
+		<**
+			@description : the domain ID
+		**>
+		am_domainID_t domainID
+
+		<**
+			@description : the name of the domain
+		**>
+		String name
+
+		<**
+			@description : the busname. This is equal to a plugin name and is used to dispatch messages to the elements of a plugin
+		**>
+		String busname
+
+		<**
+			@description : the name of the node
+		**>
+		String nodename
+
+		<**
+			@description : indicated if the domain is independent at startup or not
+		**>
+		Boolean early
+
+		<**
+			@description : indicates if the domain registration is complete or not
+		**>
+		Boolean complete
+
+		<**
+			@description : the current domain state
+		**>
+		am_DomainState_e ^state
+	}
+
+	struct am_EarlyData_s {
+		am_EarlyDataType_e type
+		am_DataType_u sinksource
+		am_EarlyData_u data
+	}
+
+	<**
+		@description : a connection
+	**>
+	struct am_Connection_s {
+
+		<**
+			@description : the assigned ID
+		**>
+		am_connectionID_t connectionID
+
+		<**
+			@description : the source the audio flows from
+		**>
+		am_sourceID_t sourceID
+
+		<**
+			@description : the sink the audio flows to
+		**>
+		am_sinkID_t sinkID
+
+		<**
+			@description : the delay of the conneciton
+		**>
+		am_timeSync_t delay
+
+		<**
+			@description : the used connectionformat
+		**>
+		am_CustomConnectionFormat_t connectionFormat
+	}
+
+	<**
+		@description : This types describe a mixed description for source and sinks volumes.
+	**>
+	struct am_Volumes_s {
+
+		<**
+			@description : describes the type of the volume: source or sink.
+		**>
+		am_VolumeType_e volumeType
+
+		<**
+			@description : either sourceID or sinkID
+		**>
+		am_DataType_u volumeID
+
+		<**
+			@description : The volume
+		**>
+		am_volume_t volume
+
+		<**
+			@description : the ramp that shall be driven
+		**>
+		am_CustomRampType_t ramp
+
+		<**
+			@description : the time for the ramp
+		**>
+		am_time_t time
+	}
+
+	<**
+		@description : data type depends of am_EarlyDataType_e:
 volume_t in case of ED_SOURCE_VOLUME, ED_SINK_VOLUME 

 soundProperty_t in case of ED_SOURCE_PROPERTY, ED_SINK_PROPERTY 

-    **>

-    union am_EarlyData_u {

-        am_volume_t volume

-        am_SoundProperty_s soundProperty

-    }

-

-    <**

-        @description : data type depends of am_EarlyDataType_e:

+	**>
+	union am_EarlyData_u {
+		am_volume_t volume
+		am_SoundProperty_s soundProperty
+	}
+
+	<**
+		@description : data type depends of am_EarlyDataType_e:
 sourceID in case of ED_SOURCE_VOLUME, ED_SOURCE_PROPERTY

 sinkID in case of ED_SINK_VOLUME, ED_SINK_PROPERTY 

-    **>

-    union am_DataType_u {

-        am_sinkID_t sink

-        am_sourceID_t source

-    }

+	**>
+	union am_DataType_u {
+		am_sinkID_t sink
+		am_sourceID_t source
+	}
 

 }
\ No newline at end of file
diff --git a/AudioManagerDaemon/include/CAmControlReceiver.h b/AudioManagerDaemon/include/CAmControlReceiver.h
index 56c4be8..9487d17 100644
--- a/AudioManagerDaemon/include/CAmControlReceiver.h
+++ b/AudioManagerDaemon/include/CAmControlReceiver.h
@@ -44,13 +44,13 @@ public:
     CAmControlReceiver(IAmDatabaseHandler *iDatabaseHandler, CAmRoutingSender *iRoutingSender, CAmCommandSender *iCommandSender, CAmSocketHandler *iSocketHandler, CAmRouter* iRouter);
     ~CAmControlReceiver();
     am_Error_e getRoute(const bool onlyfree, const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector<am_Route_s>& returnList);
-    am_Error_e connect(am_Handle_s& handle, am_connectionID_t& connectionID, const am_ConnectionFormat_e format, const am_sourceID_t sourceID, const am_sinkID_t sinkID);
+    am_Error_e connect(am_Handle_s& handle, am_connectionID_t& connectionID, const am_CustomConnectionFormat_t format, const am_sourceID_t sourceID, const am_sinkID_t sinkID);
     am_Error_e disconnect(am_Handle_s& handle, const am_connectionID_t connectionID);
-    am_Error_e crossfade(am_Handle_s& handle, const am_HotSink_e hotSource, const am_crossfaderID_t crossfaderID, const am_RampType_e rampType, const am_time_t rampTime);
+    am_Error_e crossfade(am_Handle_s& handle, const am_HotSink_e hotSource, const am_crossfaderID_t crossfaderID, const am_CustomRampType_t rampType, const am_time_t rampTime);
     am_Error_e abortAction(const am_Handle_s handle);
     am_Error_e setSourceState(am_Handle_s& handle, const am_sourceID_t sourceID, const am_SourceState_e state);
-    am_Error_e setSinkVolume(am_Handle_s& handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time);
-    am_Error_e setSourceVolume(am_Handle_s& handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e rampType, const am_time_t time);
+    am_Error_e setSinkVolume(am_Handle_s& handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time);
+    am_Error_e setSourceVolume(am_Handle_s& handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_CustomRampType_t rampType, const am_time_t time);
     am_Error_e setSinkSoundProperties(am_Handle_s& handle, const am_sinkID_t sinkID, const std::vector<am_SoundProperty_s>& soundProperty);
     am_Error_e setSinkSoundProperty(am_Handle_s& handle, const am_sinkID_t sinkID, const am_SoundProperty_s& soundProperty);
     am_Error_e setSourceSoundProperties(am_Handle_s& handle, const am_sourceID_t sourceID, const std::vector<am_SoundProperty_s>& soundProperty);
@@ -115,9 +115,9 @@ public:
     void confirmControllerRundown(const am_Error_e error);
     am_Error_e getSocketHandler(CAmSocketHandler*& socketHandler);
     void getInterfaceVersion(std::string& version) const;
-    am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
-    am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
-    am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix) ;
+    am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
+    am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
+    am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceConnectionFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix) ;
     am_Error_e setVolumes(am_Handle_s& handle, const std::vector<am_Volumes_s>& listVolumes) ;
     am_Error_e setSinkNotificationConfiguration(am_Handle_s& handle, const am_sinkID_t sinkID, const am_NotificationConfiguration_s& notificationConfiguration) ;
     am_Error_e setSourceNotificationConfiguration(am_Handle_s& handle, const am_sourceID_t sourceID, const am_NotificationConfiguration_s& notificationConfiguration) ;
diff --git a/AudioManagerDaemon/include/CAmControlSender.h b/AudioManagerDaemon/include/CAmControlSender.h
index c6eab50..58bae0b 100644
--- a/AudioManagerDaemon/include/CAmControlSender.h
+++ b/AudioManagerDaemon/include/CAmControlSender.h
@@ -83,15 +83,15 @@ public:
     void cbAckSetSourceSoundProperty(const am_Handle_s handle, const am_Error_e error) ;
     void cbAckSetSinkSoundProperties(const am_Handle_s handle, const am_Error_e error) ;
     void cbAckSetSinkSoundProperty(const am_Handle_s handle, const am_Error_e error) ;
-    am_Error_e getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats) ;
+    am_Error_e getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_CustomConnectionFormat_t> listPossibleConnectionFormats, std::vector<am_CustomConnectionFormat_t>& listPrioConnectionFormats) ;
     void confirmCommandReady(const am_Error_e error) ;
     void confirmRoutingReady(const am_Error_e error) ;
     void confirmCommandRundown(const am_Error_e error) ;
     void confirmRoutingRundown(const am_Error_e error) ;
     void getInterfaceVersion(std::string& version) const ;
-    am_Error_e hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
-    am_Error_e hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
-    am_Error_e hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFromats, const std::vector<bool>& convertionMatrix) ;
+    am_Error_e hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
+    am_Error_e hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
+    am_Error_e hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceConnectionFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkConnectionFromats, const std::vector<bool>& convertionMatrix) ;
     void cbAckSetVolume(const am_Handle_s handle, const std::vector<am_Volumes_s>& listVolumes, const am_Error_e error) ;
     void cbAckSetSinkNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) ;
     void cbAckSetSourceNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) ;
diff --git a/AudioManagerDaemon/include/CAmDatabaseHandlerMap.h b/AudioManagerDaemon/include/CAmDatabaseHandlerMap.h
index 0d590a8..218f928 100644
--- a/AudioManagerDaemon/include/CAmDatabaseHandlerMap.h
+++ b/AudioManagerDaemon/include/CAmDatabaseHandlerMap.h
@@ -117,8 +117,8 @@ public:
     am_Error_e getMainConnectionInfoDB(const am_mainConnectionID_t mainConnectionID, am_MainConnection_s& mainConnectionData) const;
     am_Error_e getSinkVolume(const am_sinkID_t sinkID, am_volume_t& volume) const;
     am_Error_e getSourceVolume(const am_sourceID_t sourceID, am_volume_t& volume) const;
-    am_Error_e getSinkSoundPropertyValue(const am_sinkID_t sinkID, const am_SoundPropertyType_e propertyType, int16_t& value) const;
-    am_Error_e getSourceSoundPropertyValue(const am_sourceID_t sourceID, const am_SoundPropertyType_e propertyType, int16_t& value) const;
+    am_Error_e getSinkSoundPropertyValue(const am_sinkID_t sinkID, const am_CustomSoundPropertyType_t propertyType, int16_t& value) const;
+    am_Error_e getSourceSoundPropertyValue(const am_sourceID_t sourceID, const am_CustomSoundPropertyType_t propertyType, int16_t& value) const;
     am_Error_e getListSinksOfDomain(const am_domainID_t domainID, std::vector<am_sinkID_t>& listSinkID) const;
     am_Error_e getListSourcesOfDomain(const am_domainID_t domainID, std::vector<am_sourceID_t>& listSourceID) const;
     am_Error_e getListCrossfadersOfDomain(const am_domainID_t domainID, std::vector<am_crossfaderID_t>& listGatewaysID) const;
@@ -138,8 +138,8 @@ public:
     am_Error_e getListMainSinkSoundProperties(const am_sinkID_t sinkID, std::vector<am_MainSoundProperty_s>& listSoundProperties) const;
     am_Error_e getListMainSourceSoundProperties(const am_sourceID_t sourceID, std::vector<am_MainSoundProperty_s>& listSourceProperties) const;
     am_Error_e getListSystemProperties(std::vector<am_SystemProperty_s>& listSystemProperties) const;
-    am_Error_e getListSinkConnectionFormats(const am_sinkID_t sinkID, std::vector<am_ConnectionFormat_e> & listConnectionFormats) const;
-    am_Error_e getListSourceConnectionFormats(const am_sourceID_t sourceID, std::vector<am_ConnectionFormat_e> & listConnectionFormats) const;
+    am_Error_e getListSinkConnectionFormats(const am_sinkID_t sinkID, std::vector<am_CustomAvailabilityReason_t> & listConnectionFormats) const;
+    am_Error_e getListSourceConnectionFormats(const am_sourceID_t sourceID, std::vector<am_CustomAvailabilityReason_t> & listConnectionFormats) const;
     am_Error_e getListGatewayConnectionFormats(const am_gatewayID_t gatewayID, std::vector<bool> & listConnectionFormat) const;
     am_Error_e getTimingInformation(const am_mainConnectionID_t mainConnectionID, am_timeSync_t& delay) const;
     am_Error_e getDomainOfSource(const am_sourceID_t sourceID, am_domainID_t& domainID) const;
@@ -152,13 +152,13 @@ public:
     am_Error_e peekSource(const std::string& name, am_sourceID_t& sourceID);
     am_Error_e peekSinkClassID(const std::string& name, am_sinkClass_t& sinkClassID);
     am_Error_e peekSourceClassID(const std::string& name, am_sourceClass_t& sourceClassID);
-    am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties);
-    am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties);
+    am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomAvailabilityReason_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties);
+    am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomAvailabilityReason_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties);
     am_Error_e getListMainSinkNotificationConfigurations(const am_sinkID_t sinkID, std::vector<am_NotificationConfiguration_s>& listMainNotificationConfigurations);
     am_Error_e getListMainSourceNotificationConfigurations(const am_sourceID_t sourceID, std::vector<am_NotificationConfiguration_s>& listMainNotificationConfigurations);
     am_Error_e changeMainSinkNotificationConfigurationDB(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration);
     am_Error_e changeMainSourceNotificationConfigurationDB(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration);
-    am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix);
+    am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_CustomAvailabilityReason_t>& listSourceConnectionFormats, const std::vector<am_CustomAvailabilityReason_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix);
     am_Error_e changeSinkNotificationConfigurationDB(const am_sinkID_t sinkID,const am_NotificationConfiguration_s notificationConfiguration);
     am_Error_e changeSourceNotificationConfigurationDB(const am_sourceID_t sourceID,const am_NotificationConfiguration_s notificationConfiguration);
 
diff --git a/AudioManagerDaemon/include/CAmDatabaseHandlerSQLite.h b/AudioManagerDaemon/include/CAmDatabaseHandlerSQLite.h
index 4741121..fad2e57 100644
--- a/AudioManagerDaemon/include/CAmDatabaseHandlerSQLite.h
+++ b/AudioManagerDaemon/include/CAmDatabaseHandlerSQLite.h
@@ -115,8 +115,8 @@ public:
     am_Error_e getMainConnectionInfoDB(const am_mainConnectionID_t mainConnectionID, am_MainConnection_s& mainConnectionData) const;
     am_Error_e getSinkVolume(const am_sinkID_t sinkID, am_volume_t& volume) const;
     am_Error_e getSourceVolume(const am_sourceID_t sourceID, am_volume_t& volume) const;
-    am_Error_e getSinkSoundPropertyValue(const am_sinkID_t sinkID, const am_SoundPropertyType_e propertyType, int16_t& value) const;
-    am_Error_e getSourceSoundPropertyValue(const am_sourceID_t sourceID, const am_SoundPropertyType_e propertyType, int16_t& value) const;
+    am_Error_e getSinkSoundPropertyValue(const am_sinkID_t sinkID, const am_CustomSoundPropertyType_t propertyType, int16_t& value) const;
+    am_Error_e getSourceSoundPropertyValue(const am_sourceID_t sourceID, const am_CustomSoundPropertyType_t propertyType, int16_t& value) const;
     am_Error_e getListSinksOfDomain(const am_domainID_t domainID, std::vector<am_sinkID_t>& listSinkID) const;
     am_Error_e getListSourcesOfDomain(const am_domainID_t domainID, std::vector<am_sourceID_t>& listSourceID) const;
     am_Error_e getListCrossfadersOfDomain(const am_domainID_t domainID, std::vector<am_crossfaderID_t>& listGatewaysID) const;
@@ -136,8 +136,8 @@ public:
     am_Error_e getListMainSinkSoundProperties(const am_sinkID_t sinkID, std::vector<am_MainSoundProperty_s>& listSoundProperties) const;
     am_Error_e getListMainSourceSoundProperties(const am_sourceID_t sourceID, std::vector<am_MainSoundProperty_s>& listSourceProperties) const;
     am_Error_e getListSystemProperties(std::vector<am_SystemProperty_s>& listSystemProperties) const;
-    am_Error_e getListSinkConnectionFormats(const am_sinkID_t sinkID, std::vector<am_ConnectionFormat_e> & listConnectionFormats) const;
-    am_Error_e getListSourceConnectionFormats(const am_sourceID_t sourceID, std::vector<am_ConnectionFormat_e> & listConnectionFormats) const;
+    am_Error_e getListSinkConnectionFormats(const am_sinkID_t sinkID, std::vector<am_CustomAvailabilityReason_t> & listConnectionFormats) const;
+    am_Error_e getListSourceConnectionFormats(const am_sourceID_t sourceID, std::vector<am_CustomAvailabilityReason_t> & listConnectionFormats) const;
     am_Error_e getListGatewayConnectionFormats(const am_gatewayID_t gatewayID, std::vector<bool> & listConnectionFormat) const;
     am_Error_e getTimingInformation(const am_mainConnectionID_t mainConnectionID, am_timeSync_t& delay) const;
     am_Error_e getDomainOfSource(const am_sourceID_t sourceID, am_domainID_t& domainID) const;
@@ -150,13 +150,13 @@ public:
     am_Error_e peekSource(const std::string& name, am_sourceID_t& sourceID);
     am_Error_e peekSinkClassID(const std::string& name, am_sinkClass_t& sinkClassID);
     am_Error_e peekSourceClassID(const std::string& name, am_sourceClass_t& sourceClassID);
-    am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties);
-    am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties);
+    am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomAvailabilityReason_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties);
+    am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomAvailabilityReason_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties);
     am_Error_e getListMainSinkNotificationConfigurations(const am_sinkID_t sinkID, std::vector<am_NotificationConfiguration_s>& listMainNotificationConfigurations);
     am_Error_e getListMainSourceNotificationConfigurations(const am_sourceID_t sourceID, std::vector<am_NotificationConfiguration_s>& listMainNotificationConfigurations);
     am_Error_e changeMainSinkNotificationConfigurationDB(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration);
     am_Error_e changeMainSourceNotificationConfigurationDB(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration);
-    am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix);
+    am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_CustomAvailabilityReason_t>& listSourceConnectionFormats, const std::vector<am_CustomAvailabilityReason_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix);
     am_Error_e changeSinkNotificationConfigurationDB(const am_sinkID_t sinkID,const am_NotificationConfiguration_s notificationConfiguration);
     am_Error_e changeSourceNotificationConfigurationDB(const am_sourceID_t sourceID,const am_NotificationConfiguration_s notificationConfiguration);
 
diff --git a/AudioManagerDaemon/include/CAmRouter.h b/AudioManagerDaemon/include/CAmRouter.h
index 275f075..76cf5fc 100644
--- a/AudioManagerDaemon/include/CAmRouter.h
+++ b/AudioManagerDaemon/include/CAmRouter.h
@@ -42,8 +42,8 @@ public:
 
 private:
     am_Error_e findBestWay(am_sinkID_t sinkID, am_sourceID_t sourceID, std::vector<am_RoutingElement_s>& listRoute, std::vector<am_RoutingElement_s>::iterator routeIterator, std::vector<am_gatewayID_t>::iterator gatewayIterator);
-    void listPossibleConnectionFormats(const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector<am_ConnectionFormat_e>& listFormats) const;
-    void listRestrictedOutputFormatsGateways(const am_gatewayID_t gatewayID, const am_ConnectionFormat_e sinkConnectionFormat, std::vector<am_ConnectionFormat_e>& listFormats) const;
+    void listPossibleConnectionFormats(const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector<am_CustomConnectionFormat_t>& listFormats) const;
+    void listRestrictedOutputFormatsGateways(const am_gatewayID_t gatewayID, const am_CustomConnectionFormat_t sinkConnectionFormat, std::vector<am_CustomConnectionFormat_t>& listFormats) const;
     IAmDatabaseHandler* mpDatabaseHandler; //!< pointer to database handler
     CAmControlSender* mpControlSender; //!< pointer the controlsender - is used to retrieve information for the optimal route
 };
diff --git a/AudioManagerDaemon/include/CAmRoutingReceiver.h b/AudioManagerDaemon/include/CAmRoutingReceiver.h
index b83ae2c..4eca2aa 100644
--- a/AudioManagerDaemon/include/CAmRoutingReceiver.h
+++ b/AudioManagerDaemon/include/CAmRoutingReceiver.h
@@ -81,9 +81,9 @@ public:
     void getInterfaceVersion(std::string& version) const;
     void confirmRoutingReady(const uint16_t handle, const am_Error_e error);
     void confirmRoutingRundown(const uint16_t handle, const am_Error_e error);
-    am_Error_e updateGateway(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceFormats, const std::vector<am_ConnectionFormat_e>& listSinkFormats, const std::vector<bool>& convertionMatrix) ;
-    am_Error_e updateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
-    am_Error_e updateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
+    am_Error_e updateGateway(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkFormats, const std::vector<bool>& convertionMatrix) ;
+    am_Error_e updateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
+    am_Error_e updateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
     void ackSetVolumes(const am_Handle_s handle, const std::vector<am_Volumes_s>& listvolumes, const am_Error_e error) ;
     void ackSinkNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) ;
     void ackSourceNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) ;
diff --git a/AudioManagerDaemon/include/CAmRoutingSender.h b/AudioManagerDaemon/include/CAmRoutingSender.h
index ac3f9a2..ec31560 100644
--- a/AudioManagerDaemon/include/CAmRoutingSender.h
+++ b/AudioManagerDaemon/include/CAmRoutingSender.h
@@ -58,16 +58,16 @@ public:
     void setRoutingReady();
     void setRoutingRundown();
     am_Error_e asyncAbort(const am_Handle_s& handle);
-    am_Error_e asyncConnect(am_Handle_s& handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat);
+    am_Error_e asyncConnect(am_Handle_s& handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_CustomConnectionFormat_t connectionFormat);
     am_Error_e asyncDisconnect(am_Handle_s& handle, const am_connectionID_t connectionID);
-    am_Error_e asyncSetSinkVolume(am_Handle_s& handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time);
-    am_Error_e asyncSetSourceVolume(am_Handle_s& handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time);
+    am_Error_e asyncSetSinkVolume(am_Handle_s& handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time);
+    am_Error_e asyncSetSourceVolume(am_Handle_s& handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time);
     am_Error_e asyncSetSourceState(am_Handle_s& handle, const am_sourceID_t sourceID, const am_SourceState_e state);
     am_Error_e asyncSetSinkSoundProperty(am_Handle_s& handle, const am_sinkID_t sinkID, const am_SoundProperty_s& soundProperty);
     am_Error_e asyncSetSourceSoundProperties(am_Handle_s& handle, const std::vector<am_SoundProperty_s>& listSoundProperties, const am_sourceID_t sourceID);
     am_Error_e asyncSetSinkSoundProperties(am_Handle_s& handle, const std::vector<am_SoundProperty_s>& listSoundProperties, const am_sinkID_t sinkID);
     am_Error_e asyncSetSourceSoundProperty(am_Handle_s& handle, const am_sourceID_t sourceID, const am_SoundProperty_s& soundProperty);
-    am_Error_e asyncCrossFade(am_Handle_s& handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_RampType_e rampType, const am_time_t time);
+    am_Error_e asyncCrossFade(am_Handle_s& handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_CustomRampType_t rampType, const am_time_t time);
     am_Error_e setDomainState(const am_domainID_t domainID, const am_DomainState_e domainState);
     am_Error_e getListHandles(std::vector<am_Handle_s> & listHandles) const;
     am_Error_e getListPlugins(std::vector<std::string>& interfaces) const;
diff --git a/AudioManagerDaemon/include/IAmDatabaseHandler.h b/AudioManagerDaemon/include/IAmDatabaseHandler.h
index 4f20eee..8a36801 100644
--- a/AudioManagerDaemon/include/IAmDatabaseHandler.h
+++ b/AudioManagerDaemon/include/IAmDatabaseHandler.h
@@ -106,8 +106,8 @@ public:
     virtual am_Error_e getMainConnectionInfoDB(const am_mainConnectionID_t mainConnectionID, am_MainConnection_s& mainConnectionData) const = 0;
     virtual am_Error_e getSinkVolume(const am_sinkID_t sinkID, am_volume_t& volume) const = 0;
     virtual am_Error_e getSourceVolume(const am_sourceID_t sourceID, am_volume_t& volume) const = 0;
-    virtual am_Error_e getSinkSoundPropertyValue(const am_sinkID_t sinkID, const am_SoundPropertyType_e propertyType, int16_t& value) const = 0;
-    virtual am_Error_e getSourceSoundPropertyValue(const am_sourceID_t sourceID, const am_SoundPropertyType_e propertyType, int16_t& value) const = 0;
+    virtual am_Error_e getSinkSoundPropertyValue(const am_sinkID_t sinkID, const am_CustomSoundPropertyType_t propertyType, int16_t& value) const = 0;
+    virtual am_Error_e getSourceSoundPropertyValue(const am_sourceID_t sourceID, const am_CustomSoundPropertyType_t propertyType, int16_t& value) const = 0;
     virtual am_Error_e getListSinksOfDomain(const am_domainID_t domainID, std::vector<am_sinkID_t>& listSinkID) const = 0;
     virtual am_Error_e getListSourcesOfDomain(const am_domainID_t domainID, std::vector<am_sourceID_t>& listSourceID) const = 0;
     virtual am_Error_e getListCrossfadersOfDomain(const am_domainID_t domainID, std::vector<am_crossfaderID_t>& listGatewaysID) const = 0;
@@ -127,8 +127,8 @@ public:
     virtual am_Error_e getListMainSinkSoundProperties(const am_sinkID_t sinkID, std::vector<am_MainSoundProperty_s>& listSoundProperties) const = 0;
     virtual am_Error_e getListMainSourceSoundProperties(const am_sourceID_t sourceID, std::vector<am_MainSoundProperty_s>& listSourceProperties) const = 0;
     virtual am_Error_e getListSystemProperties(std::vector<am_SystemProperty_s>& listSystemProperties) const = 0;
-    virtual am_Error_e getListSinkConnectionFormats(const am_sinkID_t sinkID, std::vector<am_ConnectionFormat_e> & listConnectionFormats) const = 0;
-    virtual am_Error_e getListSourceConnectionFormats(const am_sourceID_t sourceID, std::vector<am_ConnectionFormat_e> & listConnectionFormats) const = 0;
+    virtual am_Error_e getListSinkConnectionFormats(const am_sinkID_t sinkID, std::vector<am_CustomConnectionFormat_t> & listConnectionFormats) const = 0;
+    virtual am_Error_e getListSourceConnectionFormats(const am_sourceID_t sourceID, std::vector<am_CustomConnectionFormat_t> & listConnectionFormats) const = 0;
     virtual am_Error_e getListGatewayConnectionFormats(const am_gatewayID_t gatewayID, std::vector<bool> & listConnectionFormat) const = 0;
     virtual am_Error_e getTimingInformation(const am_mainConnectionID_t mainConnectionID, am_timeSync_t& delay) const = 0;
     virtual am_Error_e getDomainOfSource(const am_sourceID_t sourceID, am_domainID_t& domainID) const = 0;
@@ -141,13 +141,13 @@ public:
     virtual am_Error_e peekSource(const std::string& name, am_sourceID_t& sourceID) = 0;
     virtual am_Error_e peekSinkClassID(const std::string& name, am_sinkClass_t& sinkClassID) = 0;
     virtual am_Error_e peekSourceClassID(const std::string& name, am_sourceClass_t& sourceClassID) = 0;
-    virtual am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) = 0;
-    virtual am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) = 0;
+    virtual am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) = 0;
+    virtual am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) = 0;
     virtual am_Error_e getListMainSinkNotificationConfigurations(const am_sinkID_t sinkID, std::vector<am_NotificationConfiguration_s>& listMainNotificationConfigurations) = 0;
     virtual am_Error_e getListMainSourceNotificationConfigurations(const am_sourceID_t sourceID, std::vector<am_NotificationConfiguration_s>& listMainNotificationConfigurations) = 0;
     virtual am_Error_e changeMainSinkNotificationConfigurationDB(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration) = 0;
     virtual am_Error_e changeMainSourceNotificationConfigurationDB(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration) = 0;
-    virtual am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix) = 0;
+    virtual am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceConnectionFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix) = 0;
     virtual am_Error_e changeSinkNotificationConfigurationDB(const am_sinkID_t sinkID,const am_NotificationConfiguration_s notificationConfiguration) = 0;
     virtual am_Error_e changeSourceNotificationConfigurationDB(const am_sourceID_t sourceID,const am_NotificationConfiguration_s notificationConfiguration) = 0;
 
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h
index 4c20911..916c744 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h
@@ -1,24 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-* 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/.
+* 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 Christian Linke
@@ -28,6 +15,7 @@
 
 
 
+
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
 #endif
@@ -69,7 +57,7 @@ namespace CommonAPI {
 
 namespace std {
     //hashes for types
-    
+
     //hashes for error types
 }
 
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp
index 44bc944..6971e07 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp
@@ -1,24 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-* 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/.
+* 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 Christian Linke
@@ -52,10 +39,10 @@ ConsumerDBusProxy::ConsumerDBusProxy(
                     const std::string& objectPath,
                     const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusProxyconnection):
         CommonAPI::DBus::DBusProxy(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyconnection)
-,bootMode_(*this, interfaceName.c_str(), "BootMode"),
-restartReason_(*this, interfaceName.c_str(), "RestartReason"),
-shutdownReason_(*this, interfaceName.c_str(), "ShutdownReason"),
-wakeUpReason_(*this, interfaceName.c_str(), "WakeUpReason")
+,bootMode_(*this, "i", "getBootModeAttribute"),
+restartReason_(*this, "i", "getRestartReasonAttribute"),
+shutdownReason_(*this, "i", "getShutdownReasonAttribute"),
+wakeUpReason_(*this, "i", "getWakeUpReasonAttribute")
 ,        nodeApplicationMode_(*this, "NodeApplicationMode", "i"),
         sessionStateChanged_(*this, "SessionStateChanged", "sii"),
         nodeState_(*this, "NodeState", "i")
@@ -108,7 +95,7 @@ void ConsumerDBusProxy::LifecycleRequestComplete(const uint32_t& RequestId, cons
         *this,
         "LifecycleRequestComplete",
         "ui",
-        RequestId, Status, 
+        RequestId, Status,
         callStatus
         , ErrorCode);
 }
@@ -161,7 +148,7 @@ void ConsumerDBusProxy::UnRegisterSession(const std::string& SessionName, const
         *this,
         "UnRegisterSession",
         "ssi",
-        SessionName, SessionOwner, SeatID, 
+        SessionName, SessionOwner, SeatID,
         callStatus
         , ErrorCode);
 }
@@ -180,7 +167,7 @@ void ConsumerDBusProxy::RegisterSession(const std::string& SessionName, const st
         *this,
         "RegisterSession",
         "ssii",
-        SessionName, SessionOwner, SeatID, SessionState, 
+        SessionName, SessionOwner, SeatID, SessionState,
         callStatus
         , ErrorCode);
 }
@@ -199,7 +186,7 @@ void ConsumerDBusProxy::UnRegisterShutdownClient(const std::string& BusName, con
         *this,
         "UnRegisterShutdownClient",
         "ssu",
-        BusName, ObjName, ShutdownMode, 
+        BusName, ObjName, ShutdownMode,
         callStatus
         , ErrorCode);
 }
@@ -218,7 +205,7 @@ void ConsumerDBusProxy::RegisterShutdownClient(const std::string& BusName, const
         *this,
         "RegisterShutdownClient",
         "ssuu",
-        BusName, ObjName, ShutdownMode, TimeoutMs, 
+        BusName, ObjName, ShutdownMode, TimeoutMs,
         callStatus
         , ErrorCode);
 }
@@ -254,7 +241,7 @@ void ConsumerDBusProxy::GetSessionState(const std::string& SessionName, const in
         *this,
         "GetSessionState",
         "si",
-        SessionName, SeatID, 
+        SessionName, SeatID,
         callStatus
         , SessionState, ErrorCode);
 }
@@ -273,7 +260,7 @@ void ConsumerDBusProxy::SetSessionState(const std::string& SessionName, const st
         *this,
         "SetSessionState",
         "ssii",
-        SessionName, SessionOwner, SessionState, SeatID, 
+        SessionName, SessionOwner, SessionState, SeatID,
         callStatus
         , ErrorCode);
 }
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h
index a753d63..2e08248 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h
@@ -1,24 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-* 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/.
+* 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 Christian Linke
@@ -88,20 +75,20 @@ class ConsumerDBusProxy: virtual public ConsumerProxyBase, virtual public Common
     virtual std::future<CommonAPI::CallStatus> GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback);
     virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode);
     virtual std::future<CommonAPI::CallStatus> SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback);
-    
+
 
     virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
 
  private:
-   CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<BootModeAttribute> bootMode_;
-   CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<RestartReasonAttribute> restartReason_;
-   CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<ShutdownReasonAttribute> shutdownReason_;
-   CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<WakeUpReasonAttribute> wakeUpReason_;
+   CommonAPI::DBus::DBusReadonlyAttribute<BootModeAttribute> bootMode_;
+   CommonAPI::DBus::DBusReadonlyAttribute<RestartReasonAttribute> restartReason_;
+   CommonAPI::DBus::DBusReadonlyAttribute<ShutdownReasonAttribute> shutdownReason_;
+   CommonAPI::DBus::DBusReadonlyAttribute<WakeUpReasonAttribute> wakeUpReason_;
 
     CommonAPI::DBus::DBusEvent<NodeApplicationModeEvent> nodeApplicationMode_;
     CommonAPI::DBus::DBusEvent<SessionStateChangedEvent> sessionStateChanged_;
     CommonAPI::DBus::DBusEvent<NodeStateEvent> nodeState_;
-    
+
 };
 
 
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.cpp
new file mode 100755
index 0000000..7c00c67
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.cpp
@@ -0,0 +1,299 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
+*/
+#include "ConsumerDBusStubAdapter.h"
+#include <org/genivi/NodeStateManager/Consumer.h>
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+
+std::shared_ptr<CommonAPI::DBus::DBusStubAdapter> createConsumerDBusStubAdapter(
+                   const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+                   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>(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection, stubBase);
+}
+
+__attribute__((constructor)) void registerConsumerDBusStubAdapter(void) {
+    CommonAPI::DBus::DBusFactory::registerAdapterFactoryMethod(Consumer::getInterfaceId(),
+                                                               &createConsumerDBusStubAdapter);
+}
+
+
+
+ConsumerDBusStubAdapterInternal::~ConsumerDBusStubAdapterInternal() {
+    deactivateManagedInstances();
+    ConsumerDBusStubAdapterHelper::deinit();
+}
+
+void ConsumerDBusStubAdapterInternal::deactivateManagedInstances() {
+}
+
+const char* ConsumerDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const {
+    static const std::string introspectionData =
+        "<method name=\"getInterfaceVersion\">\n"
+            "<arg name=\"value\" type=\"uu\" direction=\"out\" />"
+        "</method>\n"
+        "<method name=\"getBootModeAttribute\">\n"
+            "<arg name=\"value\" type=\"i\" direction=\"out\" />"
+        "</method>\n"
+        "<method name=\"getRestartReasonAttribute\">\n"
+            "<arg name=\"value\" type=\"i\" direction=\"out\" />"
+        "</method>\n"
+        "<method name=\"getShutdownReasonAttribute\">\n"
+            "<arg name=\"value\" type=\"i\" direction=\"out\" />"
+        "</method>\n"
+        "<method name=\"getWakeUpReasonAttribute\">\n"
+            "<arg name=\"value\" type=\"i\" direction=\"out\" />"
+        "</method>\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"
+        "<signal name=\"NodeState\">\n"
+            "<arg name=\"NodeState\" type=\"i\" />\n"
+        "</signal>\n"
+        "<method name=\"GetAppHealthCount\">\n"
+            "<arg name=\"Count\" 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"
+        "<method name=\"GetInterfaceVersion\">\n"
+            "<arg name=\"Version\" type=\"u\" direction=\"out\" />\n"
+        "</method>\n"
+        "<method name=\"GetApplicationMode\">\n"
+            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
+            "<arg name=\"ApplicationModeId\" 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=\"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=\"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=\"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=\"GetNodeState\">\n"
+            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
+            "<arg name=\"NodeStateId\" 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=\"SetSessionState\">\n"
+            "<arg name=\"SessionName\" type=\"s\" direction=\"in\" />\n"
+            "<arg name=\"SessionOwner\" type=\"s\" direction=\"in\" />\n"
+            "<arg name=\"SessionState\" type=\"i\" direction=\"in\" />\n"
+            "<arg name=\"SeatID\" type=\"i\" direction=\"in\" />\n"
+            "<arg name=\"ErrorCode\" type=\"i\" direction=\"out\" />\n"
+        "</method>\n"
+
+    ;
+    return introspectionData.c_str();
+}
+
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+        ConsumerStub,
+        CommonAPI::Version
+        > getConsumerInterfaceVersionStubDispatcher(&ConsumerStub::getInterfaceVersion, "uu");
+
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+        ConsumerStub,
+        int32_t
+        > getBootModeAttributeStubDispatcher(&ConsumerStub::getBootModeAttribute, "i");
+
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+        ConsumerStub,
+        int32_t
+        > getRestartReasonAttributeStubDispatcher(&ConsumerStub::getRestartReasonAttribute, "i");
+
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+        ConsumerStub,
+        int32_t
+        > getShutdownReasonAttributeStubDispatcher(&ConsumerStub::getShutdownReasonAttribute, "i");
+
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+        ConsumerStub,
+        int32_t
+        > getWakeUpReasonAttributeStubDispatcher(&ConsumerStub::getWakeUpReasonAttribute, "i");
+
+
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ConsumerStub,
+    std::tuple<>,
+    std::tuple<uint32_t>
+    > getAppHealthCountStubDispatcher(&ConsumerStub::GetAppHealthCount, "u");
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ConsumerStub,
+    std::tuple<uint32_t, int32_t>,
+    std::tuple<int32_t>
+    > lifecycleRequestCompleteStubDispatcher(&ConsumerStub::LifecycleRequestComplete, "i");
+static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
+    ConsumerStub,
+    std::tuple<>,
+    std::tuple<uint32_t>
+    > getInterfaceVersionStubDispatcher(&ConsumerStub::GetInterfaceVersion, "u");
+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, int32_t>,
+    std::tuple<int32_t>
+    > unRegisterSessionStubDispatcher(&ConsumerStub::UnRegisterSession, "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, uint32_t>,
+    std::tuple<int32_t>
+    > unRegisterShutdownClientStubDispatcher(&ConsumerStub::UnRegisterShutdownClient, "i");
+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::tuple<int32_t, int32_t>
+    > getNodeStateStubDispatcher(&ConsumerStub::GetNodeState, "ii");
+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::string, std::string, int32_t, int32_t>,
+    std::tuple<int32_t>
+    > setSessionStateStubDispatcher(&ConsumerStub::SetSessionState, "i");
+
+
+void ConsumerDBusStubAdapterInternal::fireNodeApplicationModeEvent(const int32_t& ApplicationModeId) {
+    CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
+            ::sendSignal(
+                *this,
+                "NodeApplicationMode",
+                "i",
+                ApplicationModeId
+        );
+}
+void ConsumerDBusStubAdapterInternal::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
+        );
+}
+void ConsumerDBusStubAdapterInternal::fireNodeStateEvent(const int32_t& NodeState) {
+    CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<int32_t>>
+            ::sendSignal(
+                *this,
+                "NodeState",
+                "i",
+                NodeState
+        );
+}
+
+const ConsumerDBusStubAdapterHelper::StubDispatcherTable& ConsumerDBusStubAdapterInternal::getStubDispatcherTable() {
+    return stubDispatcherTable_;
+}
+
+
+ConsumerDBusStubAdapterInternal::ConsumerDBusStubAdapterInternal(
+        const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+        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):
+        CommonAPI::DBus::DBusStubAdapter(
+                factory,
+                commonApiAddress,
+                dbusInterfaceName,
+                dbusBusName,
+                dbusObjectPath,
+                dbusConnection,
+                false),
+        ConsumerDBusStubAdapterHelper(
+            factory,
+            commonApiAddress,
+            dbusInterfaceName,
+            dbusBusName,
+            dbusObjectPath,
+            dbusConnection,
+            std::dynamic_pointer_cast<ConsumerStub>(stub),
+            false),
+        stubDispatcherTable_({
+            { { "getBootModeAttribute", "" }, &org::genivi::NodeStateManager::getBootModeAttributeStubDispatcher },
+            { { "getRestartReasonAttribute", "" }, &org::genivi::NodeStateManager::getRestartReasonAttributeStubDispatcher },
+            { { "getShutdownReasonAttribute", "" }, &org::genivi::NodeStateManager::getShutdownReasonAttributeStubDispatcher },
+            { { "getWakeUpReasonAttribute", "" }, &org::genivi::NodeStateManager::getWakeUpReasonAttributeStubDispatcher }
+            ,
+            { { "GetAppHealthCount", "" }, &org::genivi::NodeStateManager::getAppHealthCountStubDispatcher },
+            { { "LifecycleRequestComplete", "ui" }, &org::genivi::NodeStateManager::lifecycleRequestCompleteStubDispatcher },
+            { { "GetInterfaceVersion", "" }, &org::genivi::NodeStateManager::getInterfaceVersionStubDispatcher },
+            { { "GetApplicationMode", "" }, &org::genivi::NodeStateManager::getApplicationModeStubDispatcher },
+            { { "UnRegisterSession", "ssi" }, &org::genivi::NodeStateManager::unRegisterSessionStubDispatcher },
+            { { "RegisterSession", "ssii" }, &org::genivi::NodeStateManager::registerSessionStubDispatcher },
+            { { "UnRegisterShutdownClient", "ssu" }, &org::genivi::NodeStateManager::unRegisterShutdownClientStubDispatcher },
+            { { "RegisterShutdownClient", "ssuu" }, &org::genivi::NodeStateManager::registerShutdownClientStubDispatcher },
+            { { "GetNodeState", "" }, &org::genivi::NodeStateManager::getNodeStateStubDispatcher },
+            { { "GetSessionState", "si" }, &org::genivi::NodeStateManager::getSessionStateStubDispatcher },
+            { { "SetSessionState", "ssii" }, &org::genivi::NodeStateManager::setSessionStateStubDispatcher }
+            }) {
+
+    stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::NodeStateManager::getConsumerInterfaceVersionStubDispatcher });
+}
+
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.h
new file mode 100755
index 0000000..d8335d7
--- /dev/null
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusStubAdapter.h
@@ -0,0 +1,98 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
+*
+* 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 Christian Linke
+ */
+#ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_DBUS_STUB_ADAPTER_H_
+#define ORG_GENIVI_NODESTATEMANAGER_Consumer_DBUS_STUB_ADAPTER_H_
+
+#include <org/genivi/NodeStateManager/ConsumerStub.h>
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+#include <CommonAPI/DBus/DBusStubAdapterHelper.h>
+#include <CommonAPI/DBus/DBusStubAdapter.h>
+#include <CommonAPI/DBus/DBusFactory.h>
+#include <CommonAPI/DBus/DBusServicePublisher.h>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace org {
+namespace genivi {
+namespace NodeStateManager {
+
+typedef CommonAPI::DBus::DBusStubAdapterHelper<ConsumerStub> ConsumerDBusStubAdapterHelper;
+
+class ConsumerDBusStubAdapterInternal: public ConsumerStubAdapter, public ConsumerDBusStubAdapterHelper {
+ public:
+    ConsumerDBusStubAdapterInternal(
+            const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+            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);
+
+    ~ConsumerDBusStubAdapterInternal();
+
+
+    void fireNodeApplicationModeEvent(const int32_t& ApplicationModeId);
+    void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState);
+    void fireNodeStateEvent(const int32_t& NodeState);
+
+
+    const ConsumerDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable();
+
+    void deactivateManagedInstances();
+
+
+ protected:
+    virtual const char* getMethodsDBusIntrospectionXmlData() const;
+    
+  private:
+    ConsumerDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_;
+};
+
+class ConsumerDBusStubAdapter: public ConsumerDBusStubAdapterInternal, public std::enable_shared_from_this<ConsumerDBusStubAdapter> {
+public:
+    ConsumerDBusStubAdapter(
+                         const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+                         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) :
+            CommonAPI::DBus::DBusStubAdapter(
+                            factory,
+                            commonApiAddress,
+                            dbusInterfaceName,
+                            dbusBusName,
+                            dbusObjectPath,
+                            dbusConnection,
+                            false),
+            ConsumerDBusStubAdapterInternal(
+                            factory,
+                            commonApiAddress,
+                            dbusInterfaceName,
+                            dbusBusName,
+                            dbusObjectPath,
+                            dbusConnection,
+                            stub) { }
+};
+
+} // namespace NodeStateManager
+} // namespace genivi
+} // namespace org
+
+#endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_DBUS_STUB_ADAPTER_H_
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h
index 1aadb11..bd473f1 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h
@@ -1,24 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-* 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/.
+* 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 Christian Linke
@@ -28,6 +15,7 @@
 
 #include "ConsumerProxyBase.h"
 
+
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
 #endif
@@ -42,11 +30,15 @@ namespace genivi {
 namespace NodeStateManager {
 
 template <typename ... _AttributeExtensions>
-class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase, public _AttributeExtensions... {
- public:
+class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase
+, public _AttributeExtensions... {
+public:
     ConsumerProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
     ~ConsumerProxy();
 
+    typedef Consumer InterfaceType;
+
+
     /**
      * Returns the wrapper class that provides access to the attribute BootMode.
      */
@@ -318,7 +310,7 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase,
      * 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& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback);
-    
+
 
     /**
      * Returns the CommonAPI address of the remote partner this proxy communicates with.
@@ -598,7 +590,6 @@ CommonAPI::InterfaceVersionAttribute& ConsumerProxy<_AttributeExtensions...>::ge
     return delegate_->getInterfaceVersionAttribute();
 }
 
-        
 
 } // namespace NodeStateManager
 } // namespace genivi
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h
index cd757f8..a5d9ed8 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxyBase.h
@@ -1,24 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-* 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/.
+* 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 Christian Linke
@@ -34,6 +21,7 @@
 #define COMMONAPI_INTERNAL_COMPILATION
 #endif
 
+#include <vector>
 
 #include <CommonAPI/Attribute.h>
 #include <CommonAPI/Event.h>
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h
index 287cd56..c56949a 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h
@@ -1,24 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-* 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/.
+* 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 Christian Linke
@@ -36,6 +23,7 @@
 #endif
 
 #include <unordered_set>
+#include <vector>
 
 #include <CommonAPI/Stub.h>
 
@@ -69,10 +57,9 @@ class ConsumerStubAdapter: virtual public CommonAPI::StubAdapter, public Consume
      * Instead, the "fire<broadcastName>Event" methods of the stub should be used.
      */
     virtual void fireNodeStateEvent(const int32_t& NodeState) = 0;
-    
-    
+
+
     virtual void deactivateManagedInstances() = 0;
-    
 protected:
     /**
      * Defines properties for storing the ClientIds of clients / proxies that have
@@ -110,9 +97,10 @@ class ConsumerStubRemoteEvent {
  * 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:
+class ConsumerStub : public virtual CommonAPI::Stub<ConsumerStubAdapter, ConsumerStubRemoteEvent> {
+public:
     virtual ~ConsumerStub() { }
+    virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0;
 
     /// Provides getter access to the attribute BootMode
     virtual const int32_t& getBootModeAttribute(const std::shared_ptr<CommonAPI::ClientId> clientId) = 0;
@@ -151,7 +139,10 @@ class ConsumerStub : public CommonAPI::Stub<ConsumerStubAdapter , ConsumerStubRe
     virtual void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState) = 0;
     /// Sends a broadcast event for NodeState.
     virtual void fireNodeStateEvent(const int32_t& NodeState) = 0;
-    
+
+    using CommonAPI::Stub<ConsumerStubAdapter, ConsumerStubRemoteEvent>::initStubAdapter;
+    typedef CommonAPI::Stub<ConsumerStubAdapter, ConsumerStubRemoteEvent>::StubAdapterType StubAdapterType;
+    typedef CommonAPI::Stub<ConsumerStubAdapter, ConsumerStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType;
 };
 
 } // namespace NodeStateManager
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp
index 489d57d..1e34da5 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp
@@ -1,24 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-* 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/.
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
 */
 #include <org/genivi/NodeStateManager/ConsumerStubDefault.h>
 
@@ -27,11 +14,16 @@ namespace genivi {
 namespace NodeStateManager {
 
 ConsumerStubDefault::ConsumerStubDefault():
-        remoteEventHandler_(this) {
+        remoteEventHandler_(this),
+        interfaceVersion_(Consumer::getInterfaceVersion()) {
+}
+
+const CommonAPI::Version& ConsumerStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) {
+    return interfaceVersion_;
 }
 
 ConsumerStubRemoteEvent* ConsumerStubDefault::initStubAdapter(const std::shared_ptr<ConsumerStubAdapter>& stubAdapter) {
-    stubAdapter_ = stubAdapter;
+    CommonAPI::Stub<ConsumerStubAdapter, ConsumerStubRemoteEvent>::stubAdapter_ = stubAdapter;
     return &remoteEventHandler_;
 }
 
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h
index 57de061..80dc926 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h
@@ -1,24 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-* 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/.
+* 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 Christian Linke
@@ -26,6 +13,7 @@
 #ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_DEFAULT_H_
 #define ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_DEFAULT_H_
 
+
 #include <org/genivi/NodeStateManager/ConsumerStub.h>
 #include <sstream>
 
@@ -43,12 +31,14 @@ namespace NodeStateManager {
  * that would be defined for this service, and/or if you do not need any non-default
  * behaviour.
  */
-class ConsumerStubDefault : public ConsumerStub {
- public:
+class ConsumerStubDefault : public virtual ConsumerStub {
+public:
     ConsumerStubDefault();
 
     ConsumerStubRemoteEvent* initStubAdapter(const std::shared_ptr<ConsumerStubAdapter>& stubAdapter);
 
+    const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId);
+
     virtual const int32_t& getBootModeAttribute();
     virtual const int32_t& getBootModeAttribute(const std::shared_ptr<CommonAPI::ClientId> clientId);
     virtual void setBootModeAttribute(int32_t value);
@@ -99,9 +89,9 @@ class ConsumerStubDefault : public ConsumerStub {
     virtual void fireNodeApplicationModeEvent(const int32_t& ApplicationModeId);
     virtual void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState);
     virtual void fireNodeStateEvent(const int32_t& NodeState);
-    
 
- protected:
+
+protected:
     virtual bool trySetBootModeAttribute(int32_t value);
     virtual bool validateBootModeAttributeRequestedValue(const int32_t& value);
     virtual bool trySetRestartReasonAttribute(int32_t value);
@@ -110,8 +100,7 @@ class ConsumerStubDefault : public ConsumerStub {
     virtual bool validateShutdownReasonAttributeRequestedValue(const int32_t& value);
     virtual bool trySetWakeUpReasonAttribute(int32_t value);
     virtual bool validateWakeUpReasonAttributeRequestedValue(const int32_t& value);
-    std::shared_ptr<ConsumerStubAdapter> stubAdapter_;
- private:
+private:
     class RemoteEventHandler: public ConsumerStubRemoteEvent {
      public:
         RemoteEventHandler(ConsumerStubDefault* defaultStub);
@@ -131,6 +120,8 @@ class ConsumerStubDefault : public ConsumerStub {
     int32_t restartReasonAttributeValue_;
     int32_t shutdownReasonAttributeValue_;
     int32_t wakeUpReasonAttributeValue_;
+
+    CommonAPI::Version interfaceVersion_;
 };
 
 } // namespace NodeStateManager
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h
index ffadf23..56cbf4c 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h
@@ -1,24 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-* 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/.
+* 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 Christian Linke
@@ -28,6 +15,7 @@
 
 
 
+
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
 #endif
@@ -69,7 +57,7 @@ namespace CommonAPI {
 
 namespace std {
     //hashes for types
-    
+
     //hashes for error types
 }
 
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp
index 6fe5ecb..ab06c26 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp
@@ -1,24 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-* 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/.
+* 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 Christian Linke
@@ -63,7 +50,7 @@ void LifeCycleConsumerDBusProxy::LifecycleRequest(const uint32_t& Request, const
         *this,
         "LifecycleRequest",
         "uu",
-        Request, RequestId, 
+        Request, RequestId,
         callStatus
         , ErrorCode);
 }
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h
index 8c1dc9b..d69d805 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h
@@ -1,24 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-* 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/.
+* 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 Christian Linke
@@ -59,13 +46,13 @@ class LifeCycleConsumerDBusProxy: virtual public LifeCycleConsumerProxyBase, vir
 
     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:
 
-    
+
 };
 
 
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp
index a59a683..96ac35b 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp
@@ -1,24 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-* 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/.
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
 */
 #include "LifeCycleConsumerDBusStubAdapter.h"
 #include <org/genivi/NodeStateManager/LifeCycleConsumer.h>
@@ -43,40 +30,35 @@ __attribute__((constructor)) void registerLifeCycleConsumerDBusStubAdapter(void)
                                                                &createLifeCycleConsumerDBusStubAdapter);
 }
 
-LifeCycleConsumerDBusStubAdapter::LifeCycleConsumerDBusStubAdapter(
-        const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
-        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(factory, commonApiAddress, dbusInterfaceName, dbusBusName, dbusObjectPath, 
-            dbusConnection, std::dynamic_pointer_cast<LifeCycleConsumerStub>(stub),
-            NULL)
-            {
-}
 
-LifeCycleConsumerDBusStubAdapter::~LifeCycleConsumerDBusStubAdapter() {
+
+LifeCycleConsumerDBusStubAdapterInternal::~LifeCycleConsumerDBusStubAdapterInternal() {
     deactivateManagedInstances();
-    deinit();
-    stub_.reset();
+    LifeCycleConsumerDBusStubAdapterHelper::deinit();
 }
 
-void LifeCycleConsumerDBusStubAdapter::deactivateManagedInstances() {
+void LifeCycleConsumerDBusStubAdapterInternal::deactivateManagedInstances() {
 }
 
-const char* LifeCycleConsumerDBusStubAdapter::getMethodsDBusIntrospectionXmlData() const {
-    static const char* introspectionData =
+const char* LifeCycleConsumerDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const {
+    static const std::string introspectionData =
+        "<method name=\"getInterfaceVersion\">\n"
+            "<arg name=\"value\" type=\"uu\" direction=\"out\" />"
+        "</method>\n"
         "<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"
+
     ;
-    return introspectionData;
+    return introspectionData.c_str();
 }
 
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
+        LifeCycleConsumerStub,
+        CommonAPI::Version
+        > getLifeCycleConsumerInterfaceVersionStubDispatcher(&LifeCycleConsumerStub::getInterfaceVersion, "uu");
 
 
 static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
@@ -87,14 +69,43 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher<
 
 
 
-const LifeCycleConsumerDBusStubAdapter::StubDispatcherTable& LifeCycleConsumerDBusStubAdapter::getStubDispatcherTable() {
-    static const LifeCycleConsumerDBusStubAdapter::StubDispatcherTable stubDispatcherTable = {
-            { { "LifecycleRequest", "uu" }, &org::genivi::NodeStateManager::lifecycleRequestStubDispatcher }
-            };
-    return stubDispatcherTable;
+const LifeCycleConsumerDBusStubAdapterHelper::StubDispatcherTable& LifeCycleConsumerDBusStubAdapterInternal::getStubDispatcherTable() {
+    return stubDispatcherTable_;
 }
 
 
+LifeCycleConsumerDBusStubAdapterInternal::LifeCycleConsumerDBusStubAdapterInternal(
+        const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+        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):
+        CommonAPI::DBus::DBusStubAdapter(
+                factory,
+                commonApiAddress,
+                dbusInterfaceName,
+                dbusBusName,
+                dbusObjectPath,
+                dbusConnection,
+                false),
+        LifeCycleConsumerDBusStubAdapterHelper(
+            factory,
+            commonApiAddress,
+            dbusInterfaceName,
+            dbusBusName,
+            dbusObjectPath,
+            dbusConnection,
+            std::dynamic_pointer_cast<LifeCycleConsumerStub>(stub),
+            false),
+        stubDispatcherTable_({
+            { { "LifecycleRequest", "uu" }, &org::genivi::NodeStateManager::lifecycleRequestStubDispatcher }
+            }) {
+
+    stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &org::genivi::NodeStateManager::getLifeCycleConsumerInterfaceVersionStubDispatcher });
+}
+
 } // namespace NodeStateManager
 } // namespace genivi
 } // namespace org
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h
index 915d30f..c03f0c3 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h
@@ -1,24 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-* 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/.
+* 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 Christian Linke
@@ -45,9 +32,9 @@ namespace NodeStateManager {
 
 typedef CommonAPI::DBus::DBusStubAdapterHelper<LifeCycleConsumerStub> LifeCycleConsumerDBusStubAdapterHelper;
 
-class LifeCycleConsumerDBusStubAdapter: public LifeCycleConsumerStubAdapter, public LifeCycleConsumerDBusStubAdapterHelper {
+class LifeCycleConsumerDBusStubAdapterInternal: public LifeCycleConsumerStubAdapter, public LifeCycleConsumerDBusStubAdapterHelper {
  public:
-    LifeCycleConsumerDBusStubAdapter(
+    LifeCycleConsumerDBusStubAdapterInternal(
             const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
             const std::string& commonApiAddress,
             const std::string& dbusInterfaceName,
@@ -56,19 +43,49 @@ class LifeCycleConsumerDBusStubAdapter: public LifeCycleConsumerStubAdapter, pub
             const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection>& dbusConnection,
             const std::shared_ptr<CommonAPI::StubBase>& stub);
 
-    ~LifeCycleConsumerDBusStubAdapter();
+    ~LifeCycleConsumerDBusStubAdapterInternal();
 
 
-    
 
-    const StubDispatcherTable& getStubDispatcherTable();
-    
+
+    const LifeCycleConsumerDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable();
+
     void deactivateManagedInstances();
 
+
  protected:
     virtual const char* getMethodsDBusIntrospectionXmlData() const;
     
   private:
+    LifeCycleConsumerDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_;
+};
+
+class LifeCycleConsumerDBusStubAdapter: public LifeCycleConsumerDBusStubAdapterInternal, public std::enable_shared_from_this<LifeCycleConsumerDBusStubAdapter> {
+public:
+    LifeCycleConsumerDBusStubAdapter(
+                         const std::shared_ptr<CommonAPI::DBus::DBusFactory>& factory,
+                         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) :
+            CommonAPI::DBus::DBusStubAdapter(
+                            factory,
+                            commonApiAddress,
+                            dbusInterfaceName,
+                            dbusBusName,
+                            dbusObjectPath,
+                            dbusConnection,
+                            false),
+            LifeCycleConsumerDBusStubAdapterInternal(
+                            factory,
+                            commonApiAddress,
+                            dbusInterfaceName,
+                            dbusBusName,
+                            dbusObjectPath,
+                            dbusConnection,
+                            stub) { }
 };
 
 } // namespace NodeStateManager
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h
index a86373e..374ef1e 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h
@@ -1,24 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-* 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/.
+* 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 Christian Linke
@@ -28,6 +15,7 @@
 
 #include "LifeCycleConsumerProxyBase.h"
 
+
 #if !defined (COMMONAPI_INTERNAL_COMPILATION)
 #define COMMONAPI_INTERNAL_COMPILATION
 #endif
@@ -40,11 +28,15 @@ namespace genivi {
 namespace NodeStateManager {
 
 template <typename ... _AttributeExtensions>
-class LifeCycleConsumerProxy: virtual public LifeCycleConsumer, virtual public LifeCycleConsumerProxyBase, public _AttributeExtensions... {
- public:
+class LifeCycleConsumerProxy: virtual public LifeCycleConsumer, virtual public LifeCycleConsumerProxyBase
+, public _AttributeExtensions... {
+public:
     LifeCycleConsumerProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
     ~LifeCycleConsumerProxy();
 
+    typedef LifeCycleConsumer InterfaceType;
+
+
 
 
     /**
@@ -68,7 +60,7 @@ class LifeCycleConsumerProxy: virtual public LifeCycleConsumer, virtual public L
      * 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.
@@ -180,7 +172,6 @@ CommonAPI::InterfaceVersionAttribute& LifeCycleConsumerProxy<_AttributeExtension
     return delegate_->getInterfaceVersionAttribute();
 }
 
-        
 
 } // namespace NodeStateManager
 } // namespace genivi
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h
index 297c465..ad8ee6a 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h
@@ -1,24 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-* 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/.
+* 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 Christian Linke
@@ -34,6 +21,7 @@
 #define COMMONAPI_INTERNAL_COMPILATION
 #endif
 
+#include <vector>
 
 #include <CommonAPI/Proxy.h>
 #include <functional>
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h
index 0b949d5..58f5bb0 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h
@@ -1,24 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-* 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/.
+* 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 Christian Linke
@@ -35,6 +22,7 @@
 #define COMMONAPI_INTERNAL_COMPILATION
 #endif
 
+#include <vector>
 
 #include <CommonAPI/Stub.h>
 
@@ -53,10 +41,9 @@ namespace NodeStateManager {
 class LifeCycleConsumerStubAdapter: virtual public CommonAPI::StubAdapter, public LifeCycleConsumer {
  public:
 
-    
-    
+
+
     virtual void deactivateManagedInstances() = 0;
-    
 protected:
     /**
      * Defines properties for storing the ClientIds of clients / proxies that have
@@ -90,14 +77,18 @@ class LifeCycleConsumerStubRemoteEvent {
  * 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:
+class LifeCycleConsumerStub : public virtual CommonAPI::Stub<LifeCycleConsumerStubAdapter, LifeCycleConsumerStubRemoteEvent> {
+public:
     virtual ~LifeCycleConsumerStub() { }
+    virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0;
 
 
     /// This is the method that will be called on remote calls on the method LifecycleRequest.
     virtual void LifecycleRequest(const std::shared_ptr<CommonAPI::ClientId> clientId, uint32_t Request, uint32_t RequestId, int32_t& ErrorCode) = 0;
-    
+
+    using CommonAPI::Stub<LifeCycleConsumerStubAdapter, LifeCycleConsumerStubRemoteEvent>::initStubAdapter;
+    typedef CommonAPI::Stub<LifeCycleConsumerStubAdapter, LifeCycleConsumerStubRemoteEvent>::StubAdapterType StubAdapterType;
+    typedef CommonAPI::Stub<LifeCycleConsumerStubAdapter, LifeCycleConsumerStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType;
 };
 
 } // namespace NodeStateManager
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp
index 3883923..03801fa 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp
@@ -1,24 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-* 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/.
+* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+* If a copy of the MPL was not distributed with this file, You can obtain one at
+* http://mozilla.org/MPL/2.0/.
 */
 #include <org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h>
 
@@ -27,11 +14,16 @@ namespace genivi {
 namespace NodeStateManager {
 
 LifeCycleConsumerStubDefault::LifeCycleConsumerStubDefault():
-        remoteEventHandler_(this) {
+        remoteEventHandler_(this),
+        interfaceVersion_(LifeCycleConsumer::getInterfaceVersion()) {
+}
+
+const CommonAPI::Version& LifeCycleConsumerStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) {
+    return interfaceVersion_;
 }
 
 LifeCycleConsumerStubRemoteEvent* LifeCycleConsumerStubDefault::initStubAdapter(const std::shared_ptr<LifeCycleConsumerStubAdapter>& stubAdapter) {
-    stubAdapter_ = stubAdapter;
+    CommonAPI::Stub<LifeCycleConsumerStubAdapter, LifeCycleConsumerStubRemoteEvent>::stubAdapter_ = stubAdapter;
     return &remoteEventHandler_;
 }
 
diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h
index d59a8e2..fe35b9f 100644
--- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h
+++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h
@@ -1,24 +1,11 @@
 /*
-* This file was generated by the CommonAPI Generators. 
-* Used org.genivi.commonapi.core 2.1.2.201309301424.
-* Used org.franca.core 0.8.9.201308271211.
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 2.1.5.201312121915.
+* Used org.franca.core 0.8.11.201401091023.
 *
-* 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/.
+* 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 Christian Linke
@@ -26,6 +13,7 @@
 #ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_DEFAULT_H_
 #define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_DEFAULT_H_
 
+
 #include <org/genivi/NodeStateManager/LifeCycleConsumerStub.h>
 #include <sstream>
 
@@ -43,22 +31,23 @@ namespace NodeStateManager {
  * that would be defined for this service, and/or if you do not need any non-default
  * behaviour.
  */
-class LifeCycleConsumerStubDefault : public LifeCycleConsumerStub {
- public:
+class LifeCycleConsumerStubDefault : public virtual LifeCycleConsumerStub {
+public:
     LifeCycleConsumerStubDefault();
 
     LifeCycleConsumerStubRemoteEvent* initStubAdapter(const std::shared_ptr<LifeCycleConsumerStubAdapter>& stubAdapter);
 
+    const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId);
+
 
     virtual void LifecycleRequest(const std::shared_ptr<CommonAPI::ClientId> clientId, uint32_t Request, uint32_t RequestId, int32_t& ErrorCode);
     virtual void LifecycleRequest(uint32_t Request, uint32_t RequestId, int32_t& ErrorCode);
 
 
-    
 
- protected:
-    std::shared_ptr<LifeCycleConsumerStubAdapter> stubAdapter_;
- private:
+
+protected:
+private:
     class RemoteEventHandler: public LifeCycleConsumerStubRemoteEvent {
      public:
         RemoteEventHandler(LifeCycleConsumerStubDefault* defaultStub);
@@ -70,6 +59,8 @@ class LifeCycleConsumerStubDefault : public LifeCycleConsumerStub {
 
     RemoteEventHandler remoteEventHandler_;
 
+
+    CommonAPI::Version interfaceVersion_;
 };
 
 } // namespace NodeStateManager
diff --git a/AudioManagerDaemon/src/CAmControlReceiver.cpp b/AudioManagerDaemon/src/CAmControlReceiver.cpp
index 54346f1..ae017e2 100644
--- a/AudioManagerDaemon/src/CAmControlReceiver.cpp
+++ b/AudioManagerDaemon/src/CAmControlReceiver.cpp
@@ -78,7 +78,7 @@ am_Error_e CAmControlReceiver::getRoute(const bool onlyfree, const am_sourceID_t
     return (mRouter->getRoute(onlyfree, sourceID, sinkID, returnList));
 }
 
-am_Error_e CAmControlReceiver::connect(am_Handle_s & handle, am_connectionID_t & connectionID, const am_ConnectionFormat_e format, const am_sourceID_t sourceID, const am_sinkID_t sinkID)
+am_Error_e CAmControlReceiver::connect(am_Handle_s & handle, am_connectionID_t & connectionID, const am_CustomConnectionFormat_t format, const am_sourceID_t sourceID, const am_sinkID_t sinkID)
 {
     logInfo("CAmControlReceiver::connect got called, connectionFormat=", format, "sourceID=", sourceID, "sinkID=", sinkID);
 
@@ -99,7 +99,7 @@ am_Error_e CAmControlReceiver::disconnect(am_Handle_s & handle, const am_connect
     return (mRoutingSender->asyncDisconnect(handle, connectionID));
 }
 
-am_Error_e CAmControlReceiver::crossfade(am_Handle_s & handle, const am_HotSink_e hotSource, const am_crossfaderID_t crossfaderID, const am_RampType_e rampType, const am_time_t rampTime)
+am_Error_e CAmControlReceiver::crossfade(am_Handle_s & handle, const am_HotSink_e hotSource, const am_crossfaderID_t crossfaderID, const am_CustomRampType_t rampType, const am_time_t rampTime)
 {
     logInfo("CAmControlReceiver::crossfade got called, hotSource=", hotSource, "crossfaderID=", crossfaderID, "rampType=", rampType, "rampTime=", rampTime);
     return (mRoutingSender->asyncCrossFade(handle, crossfaderID, hotSource, rampType, rampTime));
@@ -111,13 +111,13 @@ am_Error_e CAmControlReceiver::setSourceState(am_Handle_s & handle, const am_sou
     return (mRoutingSender->asyncSetSourceState(handle, sourceID, state));
 }
 
-am_Error_e CAmControlReceiver::setSinkVolume(am_Handle_s & handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time)
+am_Error_e CAmControlReceiver::setSinkVolume(am_Handle_s & handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time)
 {
     logInfo("CAmControlReceiver::setSinkVolume got called, sinkID=", sinkID, "volume=", volume, "ramp=", ramp, "time=", time);
     return (mRoutingSender->asyncSetSinkVolume(handle, sinkID, volume, ramp, time));
 }
 
-am_Error_e CAmControlReceiver::setSourceVolume(am_Handle_s & handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e rampType, const am_time_t time)
+am_Error_e CAmControlReceiver::setSourceVolume(am_Handle_s & handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_CustomRampType_t rampType, const am_time_t time)
 {
     logInfo("CAmControlReceiver::setSourceVolume got called, sourceID=", sourceID, "volume=", volume, "ramp=", rampType, "time=", time);
     return (mRoutingSender->asyncSetSourceVolume(handle, sourceID, volume, rampType, time));
@@ -471,19 +471,19 @@ void CAmControlReceiver::getInterfaceVersion(std::string & version) const
     version = ControlReceiveVersion;
 }
 
-am_Error_e CAmControlReceiver::changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmControlReceiver::changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
 {
     logInfo("CAmControlReceiver::changeSourceDB was called, sourceID", sourceID);
     return (mDatabaseHandler->changeSourceDB(sourceID,sourceClassID,listSoundProperties,listConnectionFormats,listMainSoundProperties));
 }
 
-am_Error_e CAmControlReceiver::changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmControlReceiver::changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
 {
     logInfo("CAmControlReceiver::changeSinkDB was called with sinkID", sinkID);
     return (mDatabaseHandler->changeSinkDB(sinkID,sinkClassID,listSoundProperties,listConnectionFormats,listMainSoundProperties));
 }
 
-am_Error_e CAmControlReceiver::changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix)
+am_Error_e CAmControlReceiver::changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceConnectionFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix)
 {
     logInfo("CAmControlReceiver::changeGatewayDB was called with gatewayID", gatewayID);
     return (mDatabaseHandler->changeGatewayDB(gatewayID,listSourceConnectionFormats,listSinkConnectionFormats,convertionMatrix));
diff --git a/AudioManagerDaemon/src/CAmControlSender.cpp b/AudioManagerDaemon/src/CAmControlSender.cpp
index dbbc539..229a28b 100644
--- a/AudioManagerDaemon/src/CAmControlSender.cpp
+++ b/AudioManagerDaemon/src/CAmControlSender.cpp
@@ -349,7 +349,7 @@ void CAmControlSender::setControllerRundown(const int16_t signal)
     mController->setControllerRundown(signal);
 }
 
-am_Error_e am::CAmControlSender::getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e> & listPrioConnectionFormats)
+am_Error_e am::CAmControlSender::getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_CustomConnectionFormat_t> listPossibleConnectionFormats, std::vector<am_CustomConnectionFormat_t> & listPrioConnectionFormats)
 {
     assert(mController);
     return (mController->getConnectionFormatChoice(sourceID, sinkID, listRoute, listPossibleConnectionFormats, listPrioConnectionFormats));
@@ -396,19 +396,19 @@ void CAmControlSender::hookSystemNodeApplicationModeChanged(const NsmApplication
     mController->hookSystemNodeApplicationModeChanged(ApplicationModeId);
 }
 
-am_Error_e CAmControlSender::hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmControlSender::hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
 {
     assert(mController);
     return (mController->hookSystemUpdateSink(sinkID,sinkClassID,listSoundProperties,listConnectionFormats,listMainSoundProperties));
 }
 
-am_Error_e CAmControlSender::hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmControlSender::hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
 {
     assert(mController);
     return (mController->hookSystemUpdateSource(sourceID,sourceClassID,listSoundProperties,listConnectionFormats,listMainSoundProperties));
 }
 
-am_Error_e CAmControlSender::hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFromats, const std::vector<bool>& convertionMatrix)
+am_Error_e CAmControlSender::hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceConnectionFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkConnectionFromats, const std::vector<bool>& convertionMatrix)
 {
     assert(mController);
     return (mController->hookSystemUpdateGateway(gatewayID,listSourceConnectionFormats,listSinkConnectionFromats,convertionMatrix));
diff --git a/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp b/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp
index ee2f35c..0aec9f2 100644
--- a/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp
+++ b/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp
@@ -179,7 +179,7 @@ void CAmDatabaseHandlerMap::CAmSource::getDescription (std::string & outString)
 				fmt << "[type:" << ref.type << " value:" << ref.value <<"]";
 			});
 			fmt << ") listConnectionFormats (";
-			std::for_each(listConnectionFormats.begin(), listConnectionFormats.end(), [&](const am_ConnectionFormat_e & ref) {
+			std::for_each(listConnectionFormats.begin(), listConnectionFormats.end(), [&](const am_CustomConnectionFormat_t & ref) {
 				fmt << "[" << ref << "]";
 			});
 			fmt << ") listMainSoundProperties (";
@@ -217,7 +217,7 @@ void CAmDatabaseHandlerMap::CAmSink::getDescription (std::string & outString) co
 				fmt << "[type:" << ref.type << " value:" << ref.value <<"]";
 			});
 			fmt << ") listConnectionFormats (";
-			std::for_each(listConnectionFormats.begin(), listConnectionFormats.end(), [&](const am_ConnectionFormat_e & ref) {
+			std::for_each(listConnectionFormats.begin(), listConnectionFormats.end(), [&](const am_CustomConnectionFormat_t & ref) {
 				fmt << "[" << ref << "]";
 			});
 			fmt << ") listMainSoundProperties (";
@@ -328,11 +328,11 @@ void CAmDatabaseHandlerMap::CAmGateway::getDescription (std::string & outString)
 			") domainSourceID(" << domainSourceID <<
 			") controlDomainID(" << controlDomainID <<
 			") listSourceFormats (";
-			std::for_each(listSourceFormats.begin(), listSourceFormats.end(), [&](const am_ConnectionFormat_e & ref) {
+			std::for_each(listSourceFormats.begin(), listSourceFormats.end(), [&](const am_CustomConnectionFormat_t & ref) {
 				fmt << "[" << ref << "]";
 			});
 			fmt << ") listSinkFormats (";
-			std::for_each(listSinkFormats.begin(), listSinkFormats.end(), [&](const am_ConnectionFormat_e & ref) {
+			std::for_each(listSinkFormats.begin(), listSinkFormats.end(), [&](const am_CustomConnectionFormat_t & ref) {
 				fmt << "[" << ref << "]";
 			});
 			fmt << ") convertionMatrix (";
@@ -1056,7 +1056,6 @@ am_Error_e CAmDatabaseHandlerMap::changeSinkAvailabilityDB(const am_Availability
 {
     assert(sinkID!=0);
     assert(availability.availability>=A_UNKNOWN && availability.availability<=A_MAX);
-    assert(availability.availabilityReason>=AR_UNKNOWN && availability.availabilityReason<=AR_MAX);
 
     if (!existSink(sinkID))
     {
@@ -1110,7 +1109,6 @@ am_Error_e CAmDatabaseHandlerMap::changeSinkMuteStateDB(const am_MuteState_e mut
 
 am_Error_e CAmDatabaseHandlerMap::changeMainSinkSoundPropertyDB(const am_MainSoundProperty_s & soundProperty, const am_sinkID_t sinkID)
 {
-    assert(soundProperty.type>=MSP_UNKNOWN && soundProperty.type<=MSP_MAX);
     assert(sinkID!=0);
 
     if (!existSink(sinkID))
@@ -1133,7 +1131,6 @@ am_Error_e CAmDatabaseHandlerMap::changeMainSinkSoundPropertyDB(const am_MainSou
 
 am_Error_e CAmDatabaseHandlerMap::changeMainSourceSoundPropertyDB(const am_MainSoundProperty_s & soundProperty, const am_sourceID_t sourceID)
 {
-    assert(soundProperty.type>=MSP_UNKNOWN && soundProperty.type<=MSP_MAX);
     assert(sourceID!=0);
 
     if (!existSource(sourceID))
@@ -1159,7 +1156,6 @@ am_Error_e CAmDatabaseHandlerMap::changeSourceAvailabilityDB(const am_Availabili
 {
     assert(sourceID!=0);
     assert(availability.availability>=A_UNKNOWN && availability.availability<=A_MAX);
-    assert(availability.availabilityReason>=AR_UNKNOWN && availability.availabilityReason<=AR_MAX);
 
     if (!existSource(sourceID))
     {
@@ -1177,8 +1173,6 @@ am_Error_e CAmDatabaseHandlerMap::changeSourceAvailabilityDB(const am_Availabili
 
 am_Error_e CAmDatabaseHandlerMap::changeSystemPropertyDB(const am_SystemProperty_s & property)
 {
-    assert(property.type>=SYP_UNKNOWN && property.type<=SYP_MAX);
-
     std::vector<am_SystemProperty_s>::iterator elementIterator = mMappedData.mSystemProperties.begin();
 	for (;elementIterator != mMappedData.mSystemProperties.end(); ++elementIterator)
 	{
@@ -1757,7 +1751,7 @@ am_Error_e CAmDatabaseHandlerMap::getListSystemProperties(std::vector<am_SystemP
     return (E_OK);
 }
 
-am_Error_e am::CAmDatabaseHandlerMap::getListSinkConnectionFormats(const am_sinkID_t sinkID, std::vector<am_ConnectionFormat_e> & listConnectionFormats) const
+am_Error_e am::CAmDatabaseHandlerMap::getListSinkConnectionFormats(const am_sinkID_t sinkID, std::vector<am_CustomConnectionFormat_t> & listConnectionFormats) const
 {
    if (!existSink(sinkID))
 	   return E_NON_EXISTENT;
@@ -1767,7 +1761,7 @@ am_Error_e am::CAmDatabaseHandlerMap::getListSinkConnectionFormats(const am_sink
     return (E_OK);
 }
 
-am_Error_e am::CAmDatabaseHandlerMap::getListSourceConnectionFormats(const am_sourceID_t sourceID, std::vector<am_ConnectionFormat_e> & listConnectionFormats) const
+am_Error_e am::CAmDatabaseHandlerMap::getListSourceConnectionFormats(const am_sourceID_t sourceID, std::vector<am_CustomConnectionFormat_t> & listConnectionFormats) const
 {
    if (!existSource(sourceID))
 	   return E_NON_EXISTENT;
@@ -2201,7 +2195,7 @@ am_Error_e CAmDatabaseHandlerMap::getSourceVolume(const am_sourceID_t sourceID,
 	return (E_NON_EXISTENT);
 }
 
-am_Error_e CAmDatabaseHandlerMap::getSinkSoundPropertyValue(const am_sinkID_t sinkID, const am_SoundPropertyType_e propertyType, int16_t & value) const
+am_Error_e CAmDatabaseHandlerMap::getSinkSoundPropertyValue(const am_sinkID_t sinkID, const am_CustomSoundPropertyType_t propertyType, int16_t & value) const
 {
     assert(sinkID!=0);
 
@@ -2222,7 +2216,7 @@ am_Error_e CAmDatabaseHandlerMap::getSinkSoundPropertyValue(const am_sinkID_t si
 	return (E_NON_EXISTENT);
 }
 
-am_Error_e CAmDatabaseHandlerMap::getSourceSoundPropertyValue(const am_sourceID_t sourceID, const am_SoundPropertyType_e propertyType, int16_t & value) const
+am_Error_e CAmDatabaseHandlerMap::getSourceSoundPropertyValue(const am_sourceID_t sourceID, const am_CustomSoundPropertyType_t propertyType, int16_t & value) const
 {
     assert(sourceID!=0);
 
@@ -2377,7 +2371,6 @@ am_Error_e CAmDatabaseHandlerMap::changeSourceVolume(const am_sourceID_t sourceI
 
 am_Error_e CAmDatabaseHandlerMap::changeSourceSoundPropertyDB(const am_SoundProperty_s & soundProperty, const am_sourceID_t sourceID)
 {
-    assert(soundProperty.type>=SP_UNKNOWN && soundProperty.type<=SP_MAX);
     assert(sourceID!=0);
 
     if (!existSource(sourceID))
@@ -2399,7 +2392,6 @@ am_Error_e CAmDatabaseHandlerMap::changeSourceSoundPropertyDB(const am_SoundProp
 
 am_Error_e CAmDatabaseHandlerMap::changeSinkSoundPropertyDB(const am_SoundProperty_s & soundProperty, const am_sinkID_t sinkID)
 {
-    assert(soundProperty.type>=SP_UNKNOWN && soundProperty.type<=SP_MAX);
     assert(sinkID!=0);
 
     if (!existSink(sinkID))
@@ -2422,7 +2414,7 @@ am_Error_e CAmDatabaseHandlerMap::changeSinkSoundPropertyDB(const am_SoundProper
 am_Error_e CAmDatabaseHandlerMap::changeCrossFaderHotSink(const am_crossfaderID_t crossfaderID, const am_HotSink_e hotsink)
 {
     assert(crossfaderID!=0);
-    assert(hotsink>=HS_UNKNOWN && hotsink>=HS_MAX);
+    assert(hotsink!=HS_UNKNOWN);
 
     if (!existcrossFader(crossfaderID))
     {
@@ -2512,7 +2504,7 @@ am_Error_e am::CAmDatabaseHandlerMap::peekSourceClassID(const std::string & name
 }
 
 
-am_Error_e CAmDatabaseHandlerMap::changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmDatabaseHandlerMap::changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
 {
     assert(sourceID!=0);
 
@@ -2570,7 +2562,7 @@ am_Error_e CAmDatabaseHandlerMap::changeSourceDB(const am_sourceID_t sourceID, c
 
 }
 
-am_Error_e CAmDatabaseHandlerMap::changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmDatabaseHandlerMap::changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
 {
     assert(sinkID!=0);
 
@@ -2703,7 +2695,7 @@ am_Error_e CAmDatabaseHandlerMap::changeMainSourceNotificationConfigurationDB(co
     return (E_OK);
 }
 
-am_Error_e CAmDatabaseHandlerMap::changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix)
+am_Error_e CAmDatabaseHandlerMap::changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceConnectionFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix)
 {
     assert(gatewayID!=0);
 
diff --git a/AudioManagerDaemon/src/CAmDatabaseHandlerSQLite.cpp b/AudioManagerDaemon/src/CAmDatabaseHandlerSQLite.cpp
index df0fbcb..1390fc4 100644
--- a/AudioManagerDaemon/src/CAmDatabaseHandlerSQLite.cpp
+++ b/AudioManagerDaemon/src/CAmDatabaseHandlerSQLite.cpp
@@ -457,7 +457,7 @@ am_Error_e CAmDatabaseHandlerSQLite::enterSinkDB(const am_Sink_s & sinkData, am_
     //fill ConnectionFormats
     command = "INSERT INTO SinkConnectionFormat" + i2s(sinkID) + std::string("(soundFormat) VALUES (?)");
     MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
-    std::vector<am_ConnectionFormat_e>::const_iterator connectionFormatIterator = sinkData.listConnectionFormats.begin();
+    std::vector<am_CustomConnectionFormat_t>::const_iterator connectionFormatIterator = sinkData.listConnectionFormats.begin();
     for (; connectionFormatIterator < sinkData.listConnectionFormats.end(); ++connectionFormatIterator)
     {
         MY_SQLITE_BIND_INT(query, 1, *connectionFormatIterator)
@@ -722,7 +722,7 @@ am_Error_e CAmDatabaseHandlerSQLite::enterGatewayDB(const am_Gateway_s & gateway
     //fill ConnectionFormats
     command = "INSERT INTO GatewaySourceFormat" + i2s(gatewayID) + std::string("(soundFormat) VALUES (?)");
     MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
-    std::vector<am_ConnectionFormat_e>::const_iterator connectionFormatIterator = gatewayData.listSourceFormats.begin();
+    std::vector<am_CustomConnectionFormat_t>::const_iterator connectionFormatIterator = gatewayData.listSourceFormats.begin();
     for (; connectionFormatIterator < gatewayData.listSourceFormats.end(); ++connectionFormatIterator)
     {
         MY_SQLITE_BIND_INT(query, 1, *connectionFormatIterator)
@@ -874,7 +874,7 @@ am_Error_e CAmDatabaseHandlerSQLite::enterSourceDB(const am_Source_s & sourceDat
     //fill ConnectionFormats
     command = "INSERT INTO SourceConnectionFormat" + i2s(sourceID) + std::string("(soundFormat) VALUES (?)");
     MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
-    std::vector<am_ConnectionFormat_e>::const_iterator connectionFormatIterator = sourceData.listConnectionFormats.begin();
+    std::vector<am_CustomConnectionFormat_t>::const_iterator connectionFormatIterator = sourceData.listConnectionFormats.begin();
     for (; connectionFormatIterator != sourceData.listConnectionFormats.end(); ++connectionFormatIterator)
     {
         MY_SQLITE_BIND_INT(query, 1, *connectionFormatIterator)
@@ -1111,7 +1111,6 @@ am_Error_e CAmDatabaseHandlerSQLite::changeSinkAvailabilityDB(const am_Availabil
 {
     assert(sinkID!=0);
     assert(availability.availability>=A_UNKNOWN && availability.availability<=A_MAX);
-    assert(availability.availabilityReason>=AR_UNKNOWN && availability.availabilityReason<=AR_MAX);
 
     sqlite3_stmt* query = NULL;
     int eCode = 0;
@@ -1203,7 +1202,6 @@ am_Error_e CAmDatabaseHandlerSQLite::changeSinkMuteStateDB(const am_MuteState_e
 
 am_Error_e CAmDatabaseHandlerSQLite::changeMainSinkSoundPropertyDB(const am_MainSoundProperty_s & soundProperty, const am_sinkID_t sinkID)
 {
-    assert(soundProperty.type>=MSP_UNKNOWN && soundProperty.type<=MSP_MAX);
     assert(sinkID!=0);
 
     sqlite3_stmt* query = NULL;
@@ -1233,7 +1231,6 @@ am_Error_e CAmDatabaseHandlerSQLite::changeMainSinkSoundPropertyDB(const am_Main
 
 am_Error_e CAmDatabaseHandlerSQLite::changeMainSourceSoundPropertyDB(const am_MainSoundProperty_s & soundProperty, const am_sourceID_t sourceID)
 {
-    assert(soundProperty.type>=MSP_UNKNOWN && soundProperty.type<=MSP_MAX);
     assert(sourceID!=0);
 
     sqlite3_stmt* query = NULL;
@@ -1266,7 +1263,6 @@ am_Error_e CAmDatabaseHandlerSQLite::changeSourceAvailabilityDB(const am_Availab
 {
     assert(sourceID!=0);
     assert(availability.availability>=A_UNKNOWN && availability.availability<=A_MAX);
-    assert(availability.availabilityReason>=AR_UNKNOWN && availability.availabilityReason<=AR_MAX);
 
     sqlite3_stmt* query = NULL;
     int eCode = 0;
@@ -1298,7 +1294,6 @@ am_Error_e CAmDatabaseHandlerSQLite::changeSourceAvailabilityDB(const am_Availab
 
 am_Error_e CAmDatabaseHandlerSQLite::changeSystemPropertyDB(const am_SystemProperty_s & property)
 {
-    assert(property.type>=SYP_UNKNOWN && property.type<=SYP_MAX);
     sqlite3_stmt* query = NULL;
     int eCode = 0;
     std::string command = "UPDATE " + std::string(SYSTEM_TABLE) + " set value=? WHERE type=?";
@@ -1580,7 +1575,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSourceClassInfoDB(const am_sourceID_t so
     MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
     while ((eCode = sqlite3_step(query)) == SQLITE_ROW)
     {
-        propertyTemp.classProperty = (am_ClassProperty_e) sqlite3_column_int(query, 0);
+        propertyTemp.classProperty = (am_CustomClassProperty_t) sqlite3_column_int(query, 0);
         propertyTemp.value = sqlite3_column_int(query, 1);
         classInfo.listClassProperties.push_back(propertyTemp);
     }
@@ -1608,7 +1603,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSinkInfoDB(const am_sinkID_t sinkID, am_
 
     sqlite3_stmt* query = NULL, *qConnectionFormat = NULL, *qSoundProperty = NULL, *qMAinSoundProperty = NULL, *qMainNotification = NULL, *qNotification = NULL;
     int eCode = 0;
-    am_ConnectionFormat_e tempConnectionFormat;
+    am_CustomConnectionFormat_t tempConnectionFormat;
     am_SoundProperty_s tempSoundProperty;
     am_MainSoundProperty_s tempMainSoundProperty;
     am_NotificationConfiguration_s tempNotificationConfiguration,tempMainNotification;
@@ -1623,7 +1618,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSinkInfoDB(const am_sinkID_t sinkID, am_
         sinkData.volume = sqlite3_column_int(query, 3);
         sinkData.visible = sqlite3_column_int(query, 4);
         sinkData.available.availability = (am_Availability_e) sqlite3_column_int(query, 5);
-        sinkData.available.availabilityReason = (am_AvailabilityReason_e) sqlite3_column_int(query, 6);
+        sinkData.available.availabilityReason = (am_CustomAvailabilityReason_t) sqlite3_column_int(query, 6);
         sinkData.muteState = (am_MuteState_e) sqlite3_column_int(query, 7);
         sinkData.mainVolume = sqlite3_column_int(query, 8);
         sinkData.sinkID = sqlite3_column_int(query, 9);
@@ -1633,7 +1628,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSinkInfoDB(const am_sinkID_t sinkID, am_
         MY_SQLITE_PREPARE_V2(mpDatabase, commandConnectionFormat.c_str(), -1, &qConnectionFormat, NULL)
         while ((eCode = sqlite3_step(qConnectionFormat)) == SQLITE_ROW)
         {
-            tempConnectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(qConnectionFormat, 0);
+            tempConnectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(qConnectionFormat, 0);
             sinkData.listConnectionFormats.push_back(tempConnectionFormat);
         }
 
@@ -1644,7 +1639,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSinkInfoDB(const am_sinkID_t sinkID, am_
         MY_SQLITE_PREPARE_V2(mpDatabase, commandSoundProperty.c_str(), -1, &qSoundProperty, NULL)
         while ((eCode = sqlite3_step(qSoundProperty)) == SQLITE_ROW)
         {
-            tempSoundProperty.type = (am_SoundPropertyType_e) sqlite3_column_int(qSoundProperty, 0);
+            tempSoundProperty.type = (am_CustomSoundPropertyType_t) sqlite3_column_int(qSoundProperty, 0);
             tempSoundProperty.value = sqlite3_column_int(qSoundProperty, 1);
             sinkData.listSoundProperties.push_back(tempSoundProperty);
         }
@@ -1656,7 +1651,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSinkInfoDB(const am_sinkID_t sinkID, am_
 
         while ((eCode = sqlite3_step(qNotification)) == SQLITE_ROW)
         {
-            tempNotificationConfiguration.type =  static_cast<am_NotificationType_e>(sqlite3_column_int(qNotification, 0));
+            tempNotificationConfiguration.type =  static_cast<am_CustomNotificationType_t>(sqlite3_column_int(qNotification, 0));
             tempNotificationConfiguration.status = static_cast<am_NotificationStatus_e>(sqlite3_column_int(qNotification, 1));
             tempNotificationConfiguration.parameter= static_cast<int16_t>(sqlite3_column_int(qNotification, 2));
             sinkData.listNotificationConfigurations.push_back(tempNotificationConfiguration);
@@ -1671,7 +1666,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSinkInfoDB(const am_sinkID_t sinkID, am_
             MY_SQLITE_PREPARE_V2(mpDatabase, commandMainSoundProperty.c_str(), -1, &qMAinSoundProperty, NULL)
             while ((eCode = sqlite3_step(qMAinSoundProperty)) == SQLITE_ROW)
             {
-                tempMainSoundProperty.type = (am_MainSoundPropertyType_e) sqlite3_column_int(qMAinSoundProperty, 0);
+                tempMainSoundProperty.type = (am_CustomMainSoundPropertyType_t) sqlite3_column_int(qMAinSoundProperty, 0);
                 tempMainSoundProperty.value = sqlite3_column_int(qMAinSoundProperty, 1);
                 sinkData.listMainSoundProperties.push_back(tempMainSoundProperty);
             }
@@ -1683,7 +1678,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSinkInfoDB(const am_sinkID_t sinkID, am_
 
             while ((eCode = sqlite3_step(qMainNotification)) == SQLITE_ROW)
             {
-                tempMainNotification.type =  static_cast<am_NotificationType_e>(sqlite3_column_int(qMainNotification, 0));
+                tempMainNotification.type =  static_cast<am_CustomNotificationType_t>(sqlite3_column_int(qMainNotification, 0));
                 tempMainNotification.status = static_cast<am_NotificationStatus_e>(sqlite3_column_int(qMainNotification, 1));
                 tempMainNotification.parameter= static_cast<int16_t>(sqlite3_column_int(qMainNotification, 2));
                 sinkData.listMainNotificationConfigurations.push_back(tempMainNotification);
@@ -1715,7 +1710,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSourceInfoDB(const am_sourceID_t sourceI
 
     sqlite3_stmt* query = NULL, *qConnectionFormat = NULL, *qSoundProperty = NULL, *qMAinSoundProperty = NULL, *qMainNotification = NULL, *qNotification = NULL;
     int eCode = 0;
-    am_ConnectionFormat_e tempConnectionFormat;
+    am_CustomConnectionFormat_t tempConnectionFormat;
     am_SoundProperty_s tempSoundProperty;
     am_MainSoundProperty_s tempMainSoundProperty;
     am_NotificationConfiguration_s tempNotificationConfiguration,tempMainNotification;
@@ -1731,7 +1726,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSourceInfoDB(const am_sourceID_t sourceI
         sourceData.volume = sqlite3_column_int(query, 4);
         sourceData.visible = sqlite3_column_int(query, 5);
         sourceData.available.availability = (am_Availability_e) sqlite3_column_int(query, 6);
-        sourceData.available.availabilityReason = (am_AvailabilityReason_e) sqlite3_column_int(query, 7);
+        sourceData.available.availabilityReason = (am_CustomAvailabilityReason_t) sqlite3_column_int(query, 7);
         sourceData.interruptState = (am_InterruptState_e) sqlite3_column_int(query, 8);
         sourceData.sourceID = sqlite3_column_int(query, 9);
 
@@ -1740,7 +1735,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSourceInfoDB(const am_sourceID_t sourceI
         MY_SQLITE_PREPARE_V2(mpDatabase, commandConnectionFormat.c_str(), -1, &qConnectionFormat, NULL)
         while ((eCode = sqlite3_step(qConnectionFormat)) == SQLITE_ROW)
         {
-            tempConnectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(qConnectionFormat, 0);
+            tempConnectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(qConnectionFormat, 0);
             sourceData.listConnectionFormats.push_back(tempConnectionFormat);
         }
 
@@ -1751,7 +1746,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSourceInfoDB(const am_sourceID_t sourceI
         MY_SQLITE_PREPARE_V2(mpDatabase, commandSoundProperty.c_str(), -1, &qSoundProperty, NULL);
         while ((eCode = sqlite3_step(qSoundProperty)) == SQLITE_ROW)
         {
-            tempSoundProperty.type = (am_SoundPropertyType_e) sqlite3_column_int(qSoundProperty, 0);
+            tempSoundProperty.type = (am_CustomSoundPropertyType_t) sqlite3_column_int(qSoundProperty, 0);
             tempSoundProperty.value = sqlite3_column_int(qSoundProperty, 1);
             sourceData.listSoundProperties.push_back(tempSoundProperty);
         }
@@ -1763,7 +1758,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSourceInfoDB(const am_sourceID_t sourceI
 
         while ((eCode = sqlite3_step(qNotification)) == SQLITE_ROW)
         {
-            tempNotificationConfiguration.type =  static_cast<am_NotificationType_e>(sqlite3_column_int(qNotification, 0));
+            tempNotificationConfiguration.type =  static_cast<am_CustomNotificationType_t>(sqlite3_column_int(qNotification, 0));
             tempNotificationConfiguration.status = static_cast<am_NotificationStatus_e>(sqlite3_column_int(qNotification, 1));
             tempNotificationConfiguration.parameter= static_cast<int16_t>(sqlite3_column_int(qNotification, 2));
             sourceData.listNotificationConfigurations.push_back(tempNotificationConfiguration);
@@ -1778,7 +1773,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSourceInfoDB(const am_sourceID_t sourceI
             MY_SQLITE_PREPARE_V2(mpDatabase, commandMainSoundProperty.c_str(), -1, &qMAinSoundProperty, NULL)
             while ((eCode = sqlite3_step(qMAinSoundProperty)) == SQLITE_ROW)
             {
-                tempMainSoundProperty.type = (am_MainSoundPropertyType_e) sqlite3_column_int(qMAinSoundProperty, 0);
+                tempMainSoundProperty.type = (am_CustomMainSoundPropertyType_t) sqlite3_column_int(qMAinSoundProperty, 0);
                 tempMainSoundProperty.value = sqlite3_column_int(qMAinSoundProperty, 1);
                 sourceData.listMainSoundProperties.push_back(tempMainSoundProperty);
             }
@@ -1790,7 +1785,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSourceInfoDB(const am_sourceID_t sourceI
 
             while ((eCode = sqlite3_step(qMainNotification)) == SQLITE_ROW)
             {
-                tempMainNotification.type =  static_cast<am_NotificationType_e>(sqlite3_column_int(qMainNotification, 0));
+                tempMainNotification.type =  static_cast<am_CustomNotificationType_t>(sqlite3_column_int(qMainNotification, 0));
                 tempMainNotification.status = static_cast<am_NotificationStatus_e>(sqlite3_column_int(qMainNotification, 1));
                 tempMainNotification.parameter= static_cast<int16_t>(sqlite3_column_int(qMainNotification, 2));
                 sourceData.listMainNotificationConfigurations.push_back(tempMainNotification);
@@ -1979,7 +1974,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSinkClassInfoDB(const am_sinkID_t sinkID
     MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
     while ((eCode = sqlite3_step(query)) == SQLITE_ROW)
     {
-        propertyTemp.classProperty = (am_ClassProperty_e) sqlite3_column_int(query, 0);
+        propertyTemp.classProperty = (am_CustomClassProperty_t) sqlite3_column_int(query, 0);
         propertyTemp.value = sqlite3_column_int(query, 1);
         sinkClass.listClassProperties.push_back(propertyTemp);
     }
@@ -2004,7 +1999,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getGatewayInfoDB(const am_gatewayID_t gatew
     }
     sqlite3_stmt* query = NULL, *qSinkConnectionFormat = NULL, *qSourceConnectionFormat = NULL;
     int eCode = 0;
-    am_ConnectionFormat_e tempConnectionFormat;
+    am_CustomConnectionFormat_t tempConnectionFormat;
     std::string command = "SELECT name, sinkID, sourceID, domainSinkID, domainSourceID, controlDomainID, gatewayID FROM " + std::string(GATEWAY_TABLE) + " WHERE gatewayID=" + i2s(gatewayID);
     MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
 
@@ -2034,7 +2029,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getGatewayInfoDB(const am_gatewayID_t gatew
         MY_SQLITE_PREPARE_V2(mpDatabase, commandConnectionFormat.c_str(), -1, &qSourceConnectionFormat, NULL)
         while ((eCode = sqlite3_step(qSourceConnectionFormat)) == SQLITE_ROW)
         {
-            tempConnectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(qSourceConnectionFormat, 0);
+            tempConnectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(qSourceConnectionFormat, 0);
             gatewayData.listSourceFormats.push_back(tempConnectionFormat);
         }
 
@@ -2045,7 +2040,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getGatewayInfoDB(const am_gatewayID_t gatew
         MY_SQLITE_PREPARE_V2(mpDatabase, commandConnectionFormat.c_str(), -1, &qSinkConnectionFormat, NULL)
         while ((eCode = sqlite3_step(qSinkConnectionFormat)) == SQLITE_ROW)
         {
-            tempConnectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(qSinkConnectionFormat, 0);
+            tempConnectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(qSinkConnectionFormat, 0);
             gatewayData.listSinkFormats.push_back(tempConnectionFormat);
         }
 
@@ -2318,7 +2313,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListConnections(std::vector<am_Connectio
         temp.sourceID = sqlite3_column_int(query, 1);
         temp.sinkID = sqlite3_column_int(query, 2);
         temp.delay = sqlite3_column_int(query, 3);
-        temp.connectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(query, 4);
+        temp.connectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(query, 4);
         listConnections.push_back(temp);
     }
 
@@ -2340,7 +2335,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSinks(std::vector<am_Sink_s> & listS
     sqlite3_stmt* query = NULL, *qConnectionFormat = NULL, *qSoundProperty = NULL, *qNotificationConfiguration= NULL, *qMAinSoundProperty = NULL, *qMainNotificationConfiguration= NULL;
     int eCode = 0;
     am_Sink_s temp;
-    am_ConnectionFormat_e tempConnectionFormat;
+    am_CustomConnectionFormat_t tempConnectionFormat;
     am_SoundProperty_s tempSoundProperty;
     am_MainSoundProperty_s tempMainSoundProperty;
     am_NotificationConfiguration_s tempNotificationConfiguration;
@@ -2356,7 +2351,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSinks(std::vector<am_Sink_s> & listS
         temp.volume = sqlite3_column_int(query, 3);
         temp.visible = sqlite3_column_int(query, 4);
         temp.available.availability = (am_Availability_e) sqlite3_column_int(query, 5);
-        temp.available.availabilityReason = (am_AvailabilityReason_e) sqlite3_column_int(query, 6);
+        temp.available.availabilityReason = (am_CustomAvailabilityReason_t) sqlite3_column_int(query, 6);
         temp.muteState = (am_MuteState_e) sqlite3_column_int(query, 7);
         temp.mainVolume = sqlite3_column_int(query, 8);
         temp.sinkID = sqlite3_column_int(query, 9);
@@ -2366,7 +2361,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSinks(std::vector<am_Sink_s> & listS
         MY_SQLITE_PREPARE_V2(mpDatabase, commandConnectionFormat.c_str(), -1, &qConnectionFormat, NULL)
         while ((eCode = sqlite3_step(qConnectionFormat)) == SQLITE_ROW)
         {
-            tempConnectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(qConnectionFormat, 0);
+            tempConnectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(qConnectionFormat, 0);
             temp.listConnectionFormats.push_back(tempConnectionFormat);
         }
 
@@ -2377,7 +2372,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSinks(std::vector<am_Sink_s> & listS
         MY_SQLITE_PREPARE_V2(mpDatabase, commandSoundProperty.c_str(), -1, &qSoundProperty, NULL)
         while ((eCode = sqlite3_step(qSoundProperty)) == SQLITE_ROW)
         {
-            tempSoundProperty.type = (am_SoundPropertyType_e) sqlite3_column_int(qSoundProperty, 0);
+            tempSoundProperty.type = (am_CustomSoundPropertyType_t) sqlite3_column_int(qSoundProperty, 0);
             tempSoundProperty.value = sqlite3_column_int(qSoundProperty, 1);
             temp.listSoundProperties.push_back(tempSoundProperty);
         }
@@ -2389,7 +2384,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSinks(std::vector<am_Sink_s> & listS
         MY_SQLITE_PREPARE_V2(mpDatabase, commandNotificationConfiguration.c_str(), -1, &qNotificationConfiguration, NULL)
         while ((eCode = sqlite3_step(qNotificationConfiguration)) == SQLITE_ROW)
         {
-            tempNotificationConfiguration.type = static_cast<am_NotificationType_e> (sqlite3_column_int(qNotificationConfiguration, 0));
+            tempNotificationConfiguration.type = static_cast<am_CustomNotificationType_t> (sqlite3_column_int(qNotificationConfiguration, 0));
             tempNotificationConfiguration.status = static_cast<am_NotificationStatus_e> (sqlite3_column_int(qNotificationConfiguration, 1));
             tempNotificationConfiguration.parameter = static_cast<int16_t> (sqlite3_column_int(qNotificationConfiguration, 2));
             temp.listNotificationConfigurations.push_back(tempNotificationConfiguration);
@@ -2404,7 +2399,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSinks(std::vector<am_Sink_s> & listS
             MY_SQLITE_PREPARE_V2(mpDatabase, commandMainSoundProperty.c_str(), -1, &qMAinSoundProperty, NULL)
             while ((eCode = sqlite3_step(qMAinSoundProperty)) == SQLITE_ROW)
             {
-                tempMainSoundProperty.type = (am_MainSoundPropertyType_e) sqlite3_column_int(qMAinSoundProperty, 0);
+                tempMainSoundProperty.type = (am_CustomMainSoundPropertyType_t) sqlite3_column_int(qMAinSoundProperty, 0);
                 tempMainSoundProperty.value = sqlite3_column_int(qMAinSoundProperty, 1);
                 temp.listMainSoundProperties.push_back(tempMainSoundProperty);
             }
@@ -2416,7 +2411,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSinks(std::vector<am_Sink_s> & listS
             MY_SQLITE_PREPARE_V2(mpDatabase, commandMainNotificationConfiguration.c_str(), -1, &qMainNotificationConfiguration, NULL)
             while ((eCode = sqlite3_step(qMainNotificationConfiguration)) == SQLITE_ROW)
             {
-                tempMainNotificationConfiguration.type = static_cast <am_NotificationType_e> (sqlite3_column_int(qMainNotificationConfiguration, 0));
+                tempMainNotificationConfiguration.type = static_cast <am_CustomNotificationType_t> (sqlite3_column_int(qMainNotificationConfiguration, 0));
                 tempMainNotificationConfiguration.status = static_cast <am_NotificationStatus_e> (sqlite3_column_int(qMainNotificationConfiguration, 1));
                 tempMainNotificationConfiguration.parameter = static_cast <uint16_t>(sqlite3_column_int(qMainNotificationConfiguration, 2));
                 temp.listMainNotificationConfigurations.push_back(tempMainNotificationConfiguration);
@@ -2449,7 +2444,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSources(std::vector<am_Source_s> & l
     sqlite3_stmt* query = NULL, *qConnectionFormat = NULL, *qSoundProperty = NULL, *qMAinSoundProperty = NULL, *qNotification(NULL), *qMainNotification(NULL);
     int eCode = 0;
     am_Source_s temp;
-    am_ConnectionFormat_e tempConnectionFormat;
+    am_CustomConnectionFormat_t tempConnectionFormat;
     am_SoundProperty_s tempSoundProperty;
     am_MainSoundProperty_s tempMainSoundProperty;
     am_NotificationConfiguration_s tempNotificationConfiguration;
@@ -2465,7 +2460,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSources(std::vector<am_Source_s> & l
         temp.volume = sqlite3_column_int(query, 4);
         temp.visible = sqlite3_column_int(query, 5);
         temp.available.availability = (am_Availability_e) sqlite3_column_int(query, 6);
-        temp.available.availabilityReason = (am_AvailabilityReason_e) sqlite3_column_int(query, 7);
+        temp.available.availabilityReason = (am_CustomAvailabilityReason_t) sqlite3_column_int(query, 7);
         temp.interruptState = (am_InterruptState_e) sqlite3_column_int(query, 8);
         temp.sourceID = sqlite3_column_int(query, 9);
 
@@ -2474,7 +2469,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSources(std::vector<am_Source_s> & l
         MY_SQLITE_PREPARE_V2(mpDatabase, commandConnectionFormat.c_str(), -1, &qConnectionFormat, NULL)
         while ((eCode = sqlite3_step(qConnectionFormat)) == SQLITE_ROW)
         {
-            tempConnectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(qConnectionFormat, 0);
+            tempConnectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(qConnectionFormat, 0);
             temp.listConnectionFormats.push_back(tempConnectionFormat);
         }
 
@@ -2485,7 +2480,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSources(std::vector<am_Source_s> & l
         MY_SQLITE_PREPARE_V2(mpDatabase, commandSoundProperty.c_str(), -1, &qSoundProperty, NULL)
         while ((eCode = sqlite3_step(qSoundProperty)) == SQLITE_ROW)
         {
-            tempSoundProperty.type = (am_SoundPropertyType_e) sqlite3_column_int(qSoundProperty, 0);
+            tempSoundProperty.type = (am_CustomSoundPropertyType_t) sqlite3_column_int(qSoundProperty, 0);
             tempSoundProperty.value = sqlite3_column_int(qSoundProperty, 1);
             temp.listSoundProperties.push_back(tempSoundProperty);
         }
@@ -2497,7 +2492,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSources(std::vector<am_Source_s> & l
 
         while ((eCode = sqlite3_step(qNotification)) == SQLITE_ROW)
         {
-            tempNotificationConfiguration.type =  static_cast<am_NotificationType_e>(sqlite3_column_int(qNotification, 0));
+            tempNotificationConfiguration.type =  static_cast<am_CustomNotificationType_t>(sqlite3_column_int(qNotification, 0));
             tempNotificationConfiguration.status = static_cast<am_NotificationStatus_e>(sqlite3_column_int(qNotification, 1));
             tempNotificationConfiguration.parameter= static_cast<int16_t>(sqlite3_column_int(qNotification, 2));
             temp.listNotificationConfigurations.push_back(tempNotificationConfiguration);
@@ -2511,7 +2506,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSources(std::vector<am_Source_s> & l
             MY_SQLITE_PREPARE_V2(mpDatabase, commandMainSoundProperty.c_str(), -1, &qMAinSoundProperty, NULL)
             while ((eCode = sqlite3_step(qMAinSoundProperty)) == SQLITE_ROW)
             {
-                tempMainSoundProperty.type = (am_MainSoundPropertyType_e) sqlite3_column_int(qMAinSoundProperty, 0);
+                tempMainSoundProperty.type = (am_CustomMainSoundPropertyType_t) sqlite3_column_int(qMAinSoundProperty, 0);
                 tempMainSoundProperty.value = sqlite3_column_int(qMAinSoundProperty, 1);
                 temp.listMainSoundProperties.push_back(tempMainSoundProperty);
             }
@@ -2523,7 +2518,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSources(std::vector<am_Source_s> & l
 
             while ((eCode = sqlite3_step(qMainNotification)) == SQLITE_ROW)
             {
-                tempNotificationConfiguration.type =  static_cast<am_NotificationType_e>(sqlite3_column_int(qMainNotification, 0));
+                tempNotificationConfiguration.type =  static_cast<am_CustomNotificationType_t>(sqlite3_column_int(qMainNotification, 0));
                 tempNotificationConfiguration.status = static_cast<am_NotificationStatus_e>(sqlite3_column_int(qMainNotification, 1));
                 tempNotificationConfiguration.parameter= static_cast<int16_t>(sqlite3_column_int(qMainNotification, 2));
                 temp.listMainNotificationConfigurations.push_back(tempNotificationConfiguration);
@@ -2574,7 +2569,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSourceClasses(std::vector<am_SourceC
 
         while ((eCode1 = sqlite3_step(subQuery)) == SQLITE_ROW)
         {
-            propertyTemp.classProperty = (am_ClassProperty_e) sqlite3_column_int(subQuery, 0);
+            propertyTemp.classProperty = (am_CustomClassProperty_t) sqlite3_column_int(subQuery, 0);
             propertyTemp.value = sqlite3_column_int(subQuery, 1);
             classTemp.listClassProperties.push_back(propertyTemp);
         }
@@ -2642,7 +2637,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListGateways(std::vector<am_Gateway_s> &
     sqlite3_stmt* query = NULL, *qSinkConnectionFormat = NULL, *qSourceConnectionFormat = NULL;
     int eCode = 0;
     am_Gateway_s temp;
-    am_ConnectionFormat_e tempConnectionFormat;
+    am_CustomConnectionFormat_t tempConnectionFormat;
 
     std::string command = "SELECT name, sinkID, sourceID, domainSinkID, domainSourceID, controlDomainID, gatewayID FROM " + std::string(GATEWAY_TABLE);
     MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
@@ -2673,7 +2668,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListGateways(std::vector<am_Gateway_s> &
         MY_SQLITE_PREPARE_V2(mpDatabase, commandConnectionFormat.c_str(), -1, &qSourceConnectionFormat, NULL)
         while ((eCode = sqlite3_step(qSourceConnectionFormat)) == SQLITE_ROW)
         {
-            tempConnectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(qSourceConnectionFormat, 0);
+            tempConnectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(qSourceConnectionFormat, 0);
             temp.listSourceFormats.push_back(tempConnectionFormat);
         }
 
@@ -2684,7 +2679,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListGateways(std::vector<am_Gateway_s> &
         MY_SQLITE_PREPARE_V2(mpDatabase, commandConnectionFormat.c_str(), -1, &qSinkConnectionFormat, NULL)
         while ((eCode = sqlite3_step(qSinkConnectionFormat)) == SQLITE_ROW)
         {
-            tempConnectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(qSinkConnectionFormat, 0);
+            tempConnectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(qSinkConnectionFormat, 0);
             temp.listSinkFormats.push_back(tempConnectionFormat);
         }
 
@@ -2731,7 +2726,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSinkClasses(std::vector<am_SinkClass
 
         while ((eCode = sqlite3_step(subQuery)) == SQLITE_ROW)
         {
-            propertyTemp.classProperty = (am_ClassProperty_e) sqlite3_column_int(subQuery, 0);
+            propertyTemp.classProperty = (am_CustomClassProperty_t) sqlite3_column_int(subQuery, 0);
             propertyTemp.value = sqlite3_column_int(subQuery, 1);
             classTemp.listClassProperties.push_back(propertyTemp);
         }
@@ -2807,7 +2802,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListMainSinks(std::vector<am_SinkType_s>
         temp.name = std::string((const char*) sqlite3_column_text(query, 0));
         temp.sinkID = sqlite3_column_int(query, 1);
         temp.availability.availability = (am_Availability_e) sqlite3_column_int(query, 2);
-        temp.availability.availabilityReason = (am_AvailabilityReason_e) sqlite3_column_int(query, 3);
+        temp.availability.availabilityReason = (am_CustomAvailabilityReason_t) sqlite3_column_int(query, 3);
         temp.muteState = (am_MuteState_e) sqlite3_column_int(query, 4);
         temp.volume = sqlite3_column_int(query, 5);
         temp.sinkClassID = sqlite3_column_int(query, 6);
@@ -2840,7 +2835,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListMainSources(std::vector<am_SourceTyp
         temp.name = std::string((const char*) sqlite3_column_text(query, 0));
         temp.sourceClassID = sqlite3_column_int(query, 1);
         temp.availability.availability = (am_Availability_e) sqlite3_column_int(query, 2);
-        temp.availability.availabilityReason = (am_AvailabilityReason_e) sqlite3_column_int(query, 3);
+        temp.availability.availabilityReason = (am_CustomAvailabilityReason_t) sqlite3_column_int(query, 3);
         temp.sourceID = sqlite3_column_int(query, 4);
 
         listMainSources.push_back(temp);
@@ -2873,7 +2868,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListMainSinkSoundProperties(const am_sin
 
     while ((eCode = sqlite3_step(query)) == SQLITE_ROW)
     {
-        temp.type = (am_MainSoundPropertyType_e) sqlite3_column_int(query, 0);
+        temp.type = (am_CustomMainSoundPropertyType_t) sqlite3_column_int(query, 0);
         temp.value = sqlite3_column_int(query, 1);
         listSoundProperties.push_back(temp);
     }
@@ -2905,7 +2900,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListMainSourceSoundProperties(const am_s
 
     while ((eCode = sqlite3_step(query)) == SQLITE_ROW)
     {
-        temp.type = (am_MainSoundPropertyType_e) sqlite3_column_int(query, 0);
+        temp.type = (am_CustomMainSoundPropertyType_t) sqlite3_column_int(query, 0);
         temp.value = sqlite3_column_int(query, 1);
         listSourceProperties.push_back(temp);
     }
@@ -2934,7 +2929,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSystemProperties(std::vector<am_Syst
 
     while ((eCode = sqlite3_step(query)) == SQLITE_ROW)
     {
-        temp.type = (am_SystemPropertyType_e) sqlite3_column_int(query, 0);
+        temp.type = (am_CustomSystemPropertyType_t) sqlite3_column_int(query, 0);
         temp.value = sqlite3_column_int(query, 1);
         listSystemProperties.push_back(temp);
     }
@@ -2951,17 +2946,17 @@ am_Error_e CAmDatabaseHandlerSQLite::getListSystemProperties(std::vector<am_Syst
     return (E_OK);
 }
 
-am_Error_e am::CAmDatabaseHandlerSQLite::getListSinkConnectionFormats(const am_sinkID_t sinkID, std::vector<am_ConnectionFormat_e> & listConnectionFormats) const
+am_Error_e am::CAmDatabaseHandlerSQLite::getListSinkConnectionFormats(const am_sinkID_t sinkID, std::vector<am_CustomConnectionFormat_t> & listConnectionFormats) const
 {
     listConnectionFormats.clear();
     sqlite3_stmt *qConnectionFormat = NULL;
     int eCode = 0;
-    am_ConnectionFormat_e tempConnectionFormat;
+    am_CustomConnectionFormat_t tempConnectionFormat;
     std::string commandConnectionFormat = "SELECT soundFormat FROM SinkConnectionFormat" + i2s(sinkID);
     MY_SQLITE_PREPARE_V2(mpDatabase, commandConnectionFormat.c_str(), -1, &qConnectionFormat, NULL)
     while ((eCode = sqlite3_step(qConnectionFormat)) == SQLITE_ROW)
     {
-        tempConnectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(qConnectionFormat, 0);
+        tempConnectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(qConnectionFormat, 0);
         listConnectionFormats.push_back(tempConnectionFormat);
     }
 
@@ -2970,19 +2965,19 @@ am_Error_e am::CAmDatabaseHandlerSQLite::getListSinkConnectionFormats(const am_s
     return (E_OK);
 }
 
-am_Error_e am::CAmDatabaseHandlerSQLite::getListSourceConnectionFormats(const am_sourceID_t sourceID, std::vector<am_ConnectionFormat_e> & listConnectionFormats) const
+am_Error_e am::CAmDatabaseHandlerSQLite::getListSourceConnectionFormats(const am_sourceID_t sourceID, std::vector<am_CustomConnectionFormat_t> & listConnectionFormats) const
 {
     listConnectionFormats.clear();
     sqlite3_stmt* qConnectionFormat = NULL;
     int eCode = 0;
-    am_ConnectionFormat_e tempConnectionFormat;
+    am_CustomConnectionFormat_t tempConnectionFormat;
 
     //read out the connectionFormats
     std::string commandConnectionFormat = "SELECT soundFormat FROM SourceConnectionFormat" + i2s(sourceID);
     MY_SQLITE_PREPARE_V2(mpDatabase, commandConnectionFormat.c_str(), -1, &qConnectionFormat, NULL)
     while ((eCode = sqlite3_step(qConnectionFormat)) == SQLITE_ROW)
     {
-        tempConnectionFormat = (am_ConnectionFormat_e) sqlite3_column_int(qConnectionFormat, 0);
+        tempConnectionFormat = (am_CustomConnectionFormat_t) sqlite3_column_int(qConnectionFormat, 0);
         listConnectionFormats.push_back(tempConnectionFormat);
     }
 
@@ -4039,7 +4034,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSourceVolume(const am_sourceID_t sourceI
     return (E_OK);
 }
 
-am_Error_e CAmDatabaseHandlerSQLite::getSinkSoundPropertyValue(const am_sinkID_t sinkID, const am_SoundPropertyType_e propertyType, int16_t & value) const
+am_Error_e CAmDatabaseHandlerSQLite::getSinkSoundPropertyValue(const am_sinkID_t sinkID, const am_CustomSoundPropertyType_t propertyType, int16_t & value) const
 {
     assert(sinkID!=0);
     if (!existSink(sinkID))
@@ -4066,7 +4061,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getSinkSoundPropertyValue(const am_sinkID_t
     return (E_OK);
 }
 
-am_Error_e CAmDatabaseHandlerSQLite::getSourceSoundPropertyValue(const am_sourceID_t sourceID, const am_SoundPropertyType_e propertyType, int16_t & value) const
+am_Error_e CAmDatabaseHandlerSQLite::getSourceSoundPropertyValue(const am_sourceID_t sourceID, const am_CustomSoundPropertyType_t propertyType, int16_t & value) const
 {
     assert(sourceID!=0);
     if (!existSource(sourceID))
@@ -4310,7 +4305,6 @@ am_Error_e CAmDatabaseHandlerSQLite::changeSourceVolume(const am_sourceID_t sour
 
 am_Error_e CAmDatabaseHandlerSQLite::changeSourceSoundPropertyDB(const am_SoundProperty_s & soundProperty, const am_sourceID_t sourceID)
 {
-    assert(soundProperty.type>=SP_UNKNOWN && soundProperty.type<=SP_MAX);
     assert(sourceID!=0);
 
     sqlite3_stmt* query = NULL;
@@ -4338,7 +4332,6 @@ am_Error_e CAmDatabaseHandlerSQLite::changeSourceSoundPropertyDB(const am_SoundP
 
 am_Error_e CAmDatabaseHandlerSQLite::changeSinkSoundPropertyDB(const am_SoundProperty_s & soundProperty, const am_sinkID_t sinkID)
 {
-    assert(soundProperty.type>=SP_UNKNOWN && soundProperty.type<=SP_MAX);
     assert(sinkID!=0);
 
     sqlite3_stmt* query = NULL;
@@ -4510,7 +4503,7 @@ am_Error_e am::CAmDatabaseHandlerSQLite::peekSourceClassID(const std::string & n
 }
 
 
-am_Error_e CAmDatabaseHandlerSQLite::changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmDatabaseHandlerSQLite::changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
 {
     assert(sourceID!=0);
 
@@ -4591,7 +4584,7 @@ am_Error_e CAmDatabaseHandlerSQLite::changeSourceDB(const am_sourceID_t sourceID
         //fill ConnectionFormats
        command = "INSERT INTO SourceConnectionFormat" + i2s(sourceID) + std::string("(soundFormat) VALUES (?)");
        MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
-       std::vector<am_ConnectionFormat_e>::const_iterator connectionFormatIterator = listConnectionFormats.begin();
+       std::vector<am_CustomConnectionFormat_t>::const_iterator connectionFormatIterator = listConnectionFormats.begin();
        for (; connectionFormatIterator < listConnectionFormats.end(); ++connectionFormatIterator)
        {
            MY_SQLITE_BIND_INT(query, 1, *connectionFormatIterator)
@@ -4647,7 +4640,7 @@ am_Error_e CAmDatabaseHandlerSQLite::changeSourceDB(const am_sourceID_t sourceID
 
 }
 
-am_Error_e CAmDatabaseHandlerSQLite::changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmDatabaseHandlerSQLite::changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
 {
     assert(sinkID!=0);
 
@@ -4728,7 +4721,7 @@ am_Error_e CAmDatabaseHandlerSQLite::changeSinkDB(const am_sinkID_t sinkID, cons
         //fill ConnectionFormats
        command = "INSERT INTO SinkConnectionFormat" + i2s(sinkID) + std::string("(soundFormat) VALUES (?)");
        MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
-       std::vector<am_ConnectionFormat_e>::const_iterator connectionFormatIterator = listConnectionFormats.begin();
+       std::vector<am_CustomConnectionFormat_t>::const_iterator connectionFormatIterator = listConnectionFormats.begin();
        for (; connectionFormatIterator < listConnectionFormats.end(); ++connectionFormatIterator)
        {
            MY_SQLITE_BIND_INT(query, 1, *connectionFormatIterator)
@@ -4798,7 +4791,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListMainSinkNotificationConfigurations(c
 
     while ((eCode = sqlite3_step(query)) == SQLITE_ROW)
     {
-        temp.type =  static_cast<am_NotificationType_e>(sqlite3_column_int(query, 0));
+        temp.type =  static_cast<am_CustomNotificationType_t>(sqlite3_column_int(query, 0));
         temp.status = static_cast<am_NotificationStatus_e>(sqlite3_column_int(query, 1));
         temp.parameter= static_cast<int16_t>(sqlite3_column_int(query, 2));
         listMainNotificationConfigurations.push_back(temp);
@@ -4832,7 +4825,7 @@ am_Error_e CAmDatabaseHandlerSQLite::getListMainSourceNotificationConfigurations
 
     while ((eCode = sqlite3_step(query)) == SQLITE_ROW)
     {
-        temp.type =  static_cast<am_NotificationType_e>(sqlite3_column_int(query, 0));
+        temp.type =  static_cast<am_CustomNotificationType_t>(sqlite3_column_int(query, 0));
         temp.status = static_cast<am_NotificationStatus_e>(sqlite3_column_int(query, 1));
         temp.parameter= static_cast<int16_t>(sqlite3_column_int(query, 2));
         listMainNotificationConfigurations.push_back(temp);
@@ -4912,7 +4905,7 @@ am_Error_e CAmDatabaseHandlerSQLite::changeMainSourceNotificationConfigurationDB
     return (E_OK);
 }
 
-am_Error_e CAmDatabaseHandlerSQLite::changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix)
+am_Error_e CAmDatabaseHandlerSQLite::changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceConnectionFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix)
 {
     assert(gatewayID!=0);
 
@@ -4935,7 +4928,7 @@ am_Error_e CAmDatabaseHandlerSQLite::changeGatewayDB(const am_gatewayID_t gatewa
        //fill ConnectionFormats
        command = "INSERT INTO GatewaySourceFormat" + i2s(gatewayID) + std::string("(soundFormat) VALUES (?)");
        MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
-       std::vector<am_ConnectionFormat_e>::const_iterator connectionFormatIterator = listSourceConnectionFormats.begin();
+       std::vector<am_CustomConnectionFormat_t>::const_iterator connectionFormatIterator = listSourceConnectionFormats.begin();
        for (; connectionFormatIterator < listSourceConnectionFormats.end(); ++connectionFormatIterator)
        {
            MY_SQLITE_BIND_INT(query, 1, *connectionFormatIterator)
@@ -4959,7 +4952,7 @@ am_Error_e CAmDatabaseHandlerSQLite::changeGatewayDB(const am_gatewayID_t gatewa
 
        command = "INSERT INTO GatewaySinkFormat" + i2s(gatewayID) + std::string("(soundFormat) VALUES (?)");
        MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL)
-       std::vector<am_ConnectionFormat_e>::const_iterator connectionFormatIterator = listSinkConnectionFormats.begin();
+       std::vector<am_CustomConnectionFormat_t>::const_iterator connectionFormatIterator = listSinkConnectionFormats.begin();
        for (; connectionFormatIterator < listSinkConnectionFormats.end(); ++connectionFormatIterator)
        {
          MY_SQLITE_BIND_INT(query, 1, *connectionFormatIterator)
diff --git a/AudioManagerDaemon/src/CAmRouter.cpp b/AudioManagerDaemon/src/CAmRouter.cpp
index c471ea3..d574e45 100644
--- a/AudioManagerDaemon/src/CAmRouter.cpp
+++ b/AudioManagerDaemon/src/CAmRouter.cpp
@@ -59,7 +59,7 @@ am_Error_e CAmRouter::getRoute(const bool onlyfree, const am_sourceID_t sourceID
     if (sourceDomainID == sinkDomainID) //shortcut if the domains are the same...
     {
         //first get the list of possible connection formats
-        std::vector<am_ConnectionFormat_e> listFormats, listPriorityConnectionFormats;
+        std::vector<am_CustomConnectionFormat_t> listFormats, listPriorityConnectionFormats;
         listPossibleConnectionFormats(sourceID, sinkID, listFormats);
 
         //dummy route
@@ -169,24 +169,24 @@ am_Error_e CAmRouter::getRoute(const bool onlyfree, const am_sourceID_t sourceID
     return (E_OK);
 }
 
-void CAmRouter::listPossibleConnectionFormats(const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector<am_ConnectionFormat_e>& listFormats) const
+void CAmRouter::listPossibleConnectionFormats(const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector<am_CustomConnectionFormat_t>& listFormats) const
 {
-    std::vector<am_ConnectionFormat_e> listSourceFormats;
-    std::vector<am_ConnectionFormat_e> listSinkFormats;
+    std::vector<am_CustomConnectionFormat_t> listSourceFormats;
+    std::vector<am_CustomConnectionFormat_t> listSinkFormats;
     mpDatabaseHandler->getListSinkConnectionFormats(sinkID, listSinkFormats);
     mpDatabaseHandler->getListSourceConnectionFormats(sourceID, listSourceFormats);
     std::sort(listSinkFormats.begin(), listSinkFormats.end()); //todo: this might be not needed if we use strictly sorted input
     std::sort(listSourceFormats.begin(), listSourceFormats.end()); //todo: this might be not needed if we use strictly sorted input
-    std::insert_iterator<std::vector<am_ConnectionFormat_e> > inserter(listFormats, listFormats.begin());
+    std::insert_iterator<std::vector<am_CustomConnectionFormat_t> > inserter(listFormats, listFormats.begin());
     set_intersection(listSourceFormats.begin(), listSourceFormats.end(), listSinkFormats.begin(), listSinkFormats.end(), inserter);
 }
 
 am_Error_e CAmRouter::findBestWay(am_sinkID_t sinkID, am_sourceID_t sourceID, std::vector<am_RoutingElement_s> & listRoute, std::vector<am_RoutingElement_s>::iterator routeIterator, std::vector<am_gatewayID_t>::iterator gatewayIterator)
 {
     am_Error_e returnError = E_NOT_POSSIBLE;
-    std::vector<am_ConnectionFormat_e> listConnectionFormats;
-    std::vector<am_ConnectionFormat_e> listMergeConnectionFormats;
-    std::vector<am_ConnectionFormat_e> listPriorityConnectionFormats;
+    std::vector<am_CustomConnectionFormat_t> listConnectionFormats;
+    std::vector<am_CustomConnectionFormat_t> listMergeConnectionFormats;
+    std::vector<am_CustomConnectionFormat_t> listPriorityConnectionFormats;
     std::vector<am_RoutingElement_s>::iterator nextIterator = routeIterator + 1;
     //get best connection format
     listPossibleConnectionFormats(routeIterator->sourceID, routeIterator->sinkID, listConnectionFormats);
@@ -195,8 +195,8 @@ am_Error_e CAmRouter::findBestWay(am_sinkID_t sinkID, am_sourceID_t sourceID, st
     if (routeIterator != listRoute.begin())
     {
         //since we have to deal with Gateways, there are restrictions what connectionFormat we can take. So we need to take the subset of connections that are restricted:
-        std::vector<am_ConnectionFormat_e> listRestrictedConnectionFormats;
-        std::insert_iterator<std::vector<am_ConnectionFormat_e> > inserter(listMergeConnectionFormats, listMergeConnectionFormats.begin());
+        std::vector<am_CustomConnectionFormat_t> listRestrictedConnectionFormats;
+        std::insert_iterator<std::vector<am_CustomConnectionFormat_t> > inserter(listMergeConnectionFormats, listMergeConnectionFormats.begin());
         std::vector<am_RoutingElement_s>::iterator tempIterator(routeIterator);
         tempIterator--;
         listRestrictedOutputFormatsGateways(*gatewayIterator, (tempIterator)->connectionFormat, listRestrictedConnectionFormats);
@@ -218,7 +218,7 @@ am_Error_e CAmRouter::findBestWay(am_sinkID_t sinkID, am_sourceID_t sourceID, st
     mpControlSender->getConnectionFormatChoice(routeIterator->sourceID, routeIterator->sinkID, route, listMergeConnectionFormats, listPriorityConnectionFormats);
 
     //we have the list sorted after prios - now we try one after the other with the next part of the route
-    std::vector<am_ConnectionFormat_e>::iterator connectionFormatIterator = listPriorityConnectionFormats.begin();
+    std::vector<am_CustomConnectionFormat_t>::iterator connectionFormatIterator = listPriorityConnectionFormats.begin();
 
     //here we need to check if we are at the end and stop
     if (nextIterator == listRoute.end())
@@ -244,12 +244,12 @@ am_Error_e CAmRouter::findBestWay(am_sinkID_t sinkID, am_sourceID_t sourceID, st
     return (returnError);
 }
 
-void CAmRouter::listRestrictedOutputFormatsGateways(const am_gatewayID_t gatewayID, const am_ConnectionFormat_e sinkConnectionFormat, std::vector<am_ConnectionFormat_e> & listFormats) const
+void CAmRouter::listRestrictedOutputFormatsGateways(const am_gatewayID_t gatewayID, const am_CustomConnectionFormat_t sinkConnectionFormat, std::vector<am_CustomConnectionFormat_t> & listFormats) const
 {
     listFormats.clear();
     am_Gateway_s gatewayData;
     mpDatabaseHandler->getGatewayInfoDB(gatewayID, gatewayData);
-    std::vector<am_ConnectionFormat_e>::const_iterator rowSinkIterator = gatewayData.listSinkFormats.begin();
+    std::vector<am_CustomConnectionFormat_t>::const_iterator rowSinkIterator = gatewayData.listSinkFormats.begin();
     std::vector<bool>::const_iterator matrixIterator = gatewayData.convertionMatrix.begin();
 
     //find the row number of the sink
diff --git a/AudioManagerDaemon/src/CAmRoutingReceiver.cpp b/AudioManagerDaemon/src/CAmRoutingReceiver.cpp
index a6c769f..eaa38e1 100644
--- a/AudioManagerDaemon/src/CAmRoutingReceiver.cpp
+++ b/AudioManagerDaemon/src/CAmRoutingReceiver.cpp
@@ -413,17 +413,17 @@ void CAmRoutingReceiver::ackSourceNotificationConfiguration(const am_Handle_s ha
     mpControlSender->cbAckSetSourceNotificationConfiguration(handle,error);
 }
 
-am_Error_e CAmRoutingReceiver::updateGateway(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceFormats, const std::vector<am_ConnectionFormat_e>& listSinkFormats, const std::vector<bool>& convertionMatrix)
+am_Error_e CAmRoutingReceiver::updateGateway(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkFormats, const std::vector<bool>& convertionMatrix)
 {
     return (mpControlSender->hookSystemUpdateGateway(gatewayID,listSourceFormats,listSinkFormats,convertionMatrix));
 }
 
-am_Error_e CAmRoutingReceiver::updateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmRoutingReceiver::updateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
 {
     return (mpControlSender->hookSystemUpdateSink(sinkID,sinkClassID,listSoundProperties,listConnectionFormats,listMainSoundProperties));
 }
 
-am_Error_e CAmRoutingReceiver::updateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
+am_Error_e CAmRoutingReceiver::updateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
 {
     return (mpControlSender->hookSystemUpdateSource(sourceID,sourceClassID,listSoundProperties,listConnectionFormats,listMainSoundProperties));
 }
diff --git a/AudioManagerDaemon/src/CAmRoutingSender.cpp b/AudioManagerDaemon/src/CAmRoutingSender.cpp
index 5f7f03a..1606761 100644
--- a/AudioManagerDaemon/src/CAmRoutingSender.cpp
+++ b/AudioManagerDaemon/src/CAmRoutingSender.cpp
@@ -202,7 +202,7 @@ am_Error_e CAmRoutingSender::asyncAbort(const am_Handle_s& handle)
     return (E_NON_EXISTENT);
 }
 
-am_Error_e CAmRoutingSender::asyncConnect(am_Handle_s& handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat)
+am_Error_e CAmRoutingSender::asyncConnect(am_Handle_s& handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_CustomConnectionFormat_t connectionFormat)
 {
     am_handleData_c handleData;
     SinkInterfaceMap::iterator iter = mMapSinkInterface.begin();
@@ -236,7 +236,7 @@ am_Error_e CAmRoutingSender::asyncDisconnect(am_Handle_s& handle, const am_conne
     return (E_NON_EXISTENT);
 }
 
-am_Error_e CAmRoutingSender::asyncSetSinkVolume(am_Handle_s& handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time)
+am_Error_e CAmRoutingSender::asyncSetSinkVolume(am_Handle_s& handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time)
 {
     am_handleData_c handleData;
     SinkInterfaceMap::iterator iter = mMapSinkInterface.begin();
@@ -252,7 +252,7 @@ am_Error_e CAmRoutingSender::asyncSetSinkVolume(am_Handle_s& handle, const am_si
     return (E_NON_EXISTENT);
 }
 
-am_Error_e CAmRoutingSender::asyncSetSourceVolume(am_Handle_s& handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time)
+am_Error_e CAmRoutingSender::asyncSetSourceVolume(am_Handle_s& handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time)
 {
     am_handleData_c handleData;
     SourceInterfaceMap::iterator iter = mMapSourceInterface.begin();
@@ -349,7 +349,7 @@ am_Error_e CAmRoutingSender::asyncSetSinkSoundProperties(am_Handle_s& handle, co
 
 }
 
-am_Error_e CAmRoutingSender::asyncCrossFade(am_Handle_s& handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_RampType_e rampType, const am_time_t time)
+am_Error_e CAmRoutingSender::asyncCrossFade(am_Handle_s& handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_CustomRampType_t rampType, const am_time_t time)
 {
     am_handleData_c handleData;
     CrossfaderInterfaceMap::iterator iter = mMapCrossfaderInterface.begin();
diff --git a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp
index 9067339..1fb3ddf 100644
--- a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp
+++ b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp
@@ -883,10 +883,7 @@ void CAmTelnetMenuHelper::setSourceSoundPropertyExec(std::queue<std::string>& Cm
             error = true;
 
         am_MainSoundProperty_s soundProperty;
-        if (tmpType < MSP_MAX)
-            soundProperty.type = static_cast<am_MainSoundPropertyType_e>(tmpType);
-        else
-            error = true;
+        soundProperty.type = static_cast<am_CustomMainSoundPropertyType_t>(tmpType);
 
         if (!(istream_value >> soundProperty.value))
             error = true;
@@ -1147,10 +1144,7 @@ void CAmTelnetMenuHelper::setSourceSoundPropertiesExec(std::queue<std::string>&
             error = true;
 
         am_MainSoundProperty_s soundProperty;
-        if (tmpType < MSP_MAX)
-            soundProperty.type = static_cast<am_MainSoundPropertyType_e>(tmpType);
-        else
-            error = true;
+        soundProperty.type = static_cast<am_CustomMainSoundPropertyType_t>(tmpType);
 
         if (!(istream_value >> soundProperty.value))
             error = true;
@@ -1207,10 +1201,7 @@ void CAmTelnetMenuHelper::setSinkSoundPropertyExec(std::queue<std::string>& CmdQ
             error = true;
 
         am_MainSoundProperty_s soundProperty;
-        if (tmpType < MSP_MAX)
-            soundProperty.type = static_cast<am_MainSoundPropertyType_e>(tmpType);
-        else
-            error = true;
+        soundProperty.type = static_cast<am_CustomMainSoundPropertyType_t>(tmpType);
 
         if (!(istream_value >> soundProperty.value))
             error = true;
diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp
index 3c4af7d..5448c7d 100644
--- a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp
+++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp
@@ -492,7 +492,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSinkSoundProperty)
     domain.busname = "mock";
     sink.sinkID = 2;
     sink.domainID = 1;
-    soundProperty.type = SP_EXAMPLE_BASS;
+    soundProperty.type = SP_GENIVI_BASS;
     soundProperty.value = 244;
 
     //setup environment, we need a domain and a sink
@@ -509,7 +509,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSinkSoundProperty)
     ASSERT_EQ(handlesList[0].handleType, H_SETSINKSOUNDPROPERTY);
 
     //read out this property. There is no change, because the ack did not arrive yet.
-    ASSERT_EQ(E_OK, pDatabaseHandler.getSinkSoundPropertyValue(2,SP_EXAMPLE_BASS,oldvalue));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getSinkSoundPropertyValue(2,SP_GENIVI_BASS,oldvalue));
     ASSERT_EQ(sink.listSoundProperties[0].value, oldvalue);
 
     //lets send the answer and expect a call on the controlInterface
@@ -517,7 +517,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSinkSoundProperty)
     pRoutingReceiver.ackSetSinkSoundProperty(handle, E_OK);
 
     //finally, the new value must be in the database
-    ASSERT_EQ(E_OK, pDatabaseHandler.getSinkSoundPropertyValue(sinkID,SP_EXAMPLE_BASS,oldvalue));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getSinkSoundPropertyValue(sinkID,SP_GENIVI_BASS,oldvalue));
     ASSERT_EQ(soundProperty.value, oldvalue);
 
     //and the handle must be destroyed
@@ -545,7 +545,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSourceSoundProperty)
     domain.busname = "mock";
     source.sourceID = 2;
     source.domainID = 1;
-    soundProperty.type = SP_EXAMPLE_BASS;
+    soundProperty.type = SP_GENIVI_BASS;
     soundProperty.value = 244;
 
     //prepare the scene
@@ -562,7 +562,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSourceSoundProperty)
     ASSERT_EQ(handlesList[0].handleType, H_SETSOURCESOUNDPROPERTY);
 
     //read out this property. There is no change, because the ack did not arrive yet.
-    ASSERT_EQ(E_OK, pDatabaseHandler.getSourceSoundPropertyValue(2,SP_EXAMPLE_BASS,oldvalue));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getSourceSoundPropertyValue(2,SP_GENIVI_BASS,oldvalue));
     ASSERT_EQ(source.listSoundProperties[0].value, oldvalue);
 
     //lets send the answer and expect a call on the controlInterface
@@ -570,7 +570,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSourceSoundProperty)
     pRoutingReceiver.ackSetSourceSoundProperty(handle, E_OK);
 
     //finally, the new value must be in the database
-    ASSERT_EQ(E_OK, pDatabaseHandler.getSourceSoundPropertyValue(sourceID,SP_EXAMPLE_BASS,oldvalue));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getSourceSoundPropertyValue(sourceID,SP_GENIVI_BASS,oldvalue));
     ASSERT_EQ(soundProperty.value, oldvalue);
 
     //and the handle must be destroyed
diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp
index 6b61816..1881955 100644
--- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp
+++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp
@@ -2077,7 +2077,7 @@ TEST_F(CAmDatabaseHandlerTest,getMainNotificationsSink)
     testSinkData.listMainNotificationConfigurations.push_back(notify);
 
     am_NotificationConfiguration_s notify1;
-    notify1.type=NT_MAX;
+    notify1.type=NT_UNKNOWN;
     notify1.status=NS_PERIODIC;
     notify1.parameter=5;
 
@@ -2112,7 +2112,7 @@ TEST_F(CAmDatabaseHandlerTest,getMainNotificationsSources)
     testSourceData.listMainNotificationConfigurations.push_back(notify);
 
     am_NotificationConfiguration_s notify1;
-    notify1.type=NT_MAX;
+    notify1.type=NT_UNKNOWN;
     notify1.status=NS_PERIODIC;
     notify1.parameter=5;
 
@@ -2147,12 +2147,12 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSources)
     testSourceData.listMainNotificationConfigurations.push_back(notify);
 
     am_NotificationConfiguration_s notify1;
-    notify1.type=NT_MAX;
+    notify1.type=NT_UNKNOWN;
     notify1.status=NS_PERIODIC;
     notify1.parameter=5;
 
     am_NotificationConfiguration_s notify2;
-    notify2.type=NT_MAX;
+    notify2.type=NT_UNKNOWN;
     notify2.status=NS_CHANGE;
     notify2.parameter=10;
 
@@ -2197,12 +2197,12 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSink)
     testSinkData.listMainNotificationConfigurations.push_back(notify);
 
     am_NotificationConfiguration_s notify1;
-    notify1.type=NT_MAX;
+    notify1.type=NT_UNKNOWN;
     notify1.status=NS_PERIODIC;
     notify1.parameter=5;
 
     am_NotificationConfiguration_s notify2;
-    notify2.type=NT_MAX;
+    notify2.type=NT_UNKNOWN;
     notify2.status=NS_CHANGE;
     notify2.parameter=27;
 
diff --git a/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp b/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp
index ae05960..25c61cc 100644
--- a/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp
+++ b/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp
@@ -2092,7 +2092,7 @@ TEST_F(CAmMapHandlerTest,getMainNotificationsSink)
     testSinkData.listMainNotificationConfigurations.push_back(notify);
 
     am_NotificationConfiguration_s notify1;
-    notify1.type=NT_MAX;
+    notify1.type=NT_UNKNOWN;
     notify1.status=NS_PERIODIC;
     notify1.parameter=5;
 
@@ -2127,7 +2127,7 @@ TEST_F(CAmMapHandlerTest,getMainNotificationsSources)
     testSourceData.listMainNotificationConfigurations.push_back(notify);
 
     am_NotificationConfiguration_s notify1;
-    notify1.type=NT_MAX;
+    notify1.type=NT_UNKNOWN;
     notify1.status=NS_PERIODIC;
     notify1.parameter=5;
 
@@ -2162,12 +2162,12 @@ TEST_F(CAmMapHandlerTest,changeMainNotificationsSources)
     testSourceData.listMainNotificationConfigurations.push_back(notify);
 
     am_NotificationConfiguration_s notify1;
-    notify1.type=NT_MAX;
+    notify1.type=NT_UNKNOWN;
     notify1.status=NS_PERIODIC;
     notify1.parameter=5;
 
     am_NotificationConfiguration_s notify2;
-    notify2.type=NT_MAX;
+    notify2.type=NT_UNKNOWN;
     notify2.status=NS_CHANGE;
     notify2.parameter=10;
 
@@ -2215,12 +2215,12 @@ TEST_F(CAmMapHandlerTest,changeMainNotificationsSink)
     testSinkData.listMainNotificationConfigurations.push_back(notify);
 
     am_NotificationConfiguration_s notify1;
-    notify1.type=NT_MAX;
+    notify1.type=NT_UNKNOWN;
     notify1.status=NS_PERIODIC;
     notify1.parameter=5;
 
     am_NotificationConfiguration_s notify2;
-    notify2.type=NT_MAX;
+    notify2.type=NT_UNKNOWN;
     notify2.status=NS_CHANGE;
     notify2.parameter=27;
 
@@ -2524,7 +2524,7 @@ TEST_F(CAmMapHandlerObserverCallbacksTest, peek_enter_update_removeSource)
     	})!=listSources.end();
     ASSERT_TRUE(containsSourceID);
     std::vector<am_SoundProperty_s> listSoundProperties;
-    std::vector<am_ConnectionFormat_e> listConnectionFormats;
+    std::vector<am_CustomAvailabilityReason_t> listConnectionFormats;
     std::vector<am_MainSoundProperty_s> listMainSoundProperties;
     EXPECT_CALL(*MockDatabaseObserver::getMockObserverObject(), sourceUpdated(sourceID, _, _, _)).Times(1);
     ASSERT_EQ(E_OK,pDatabaseHandler.changeSourceDB(sourceID, 1, listSoundProperties, listConnectionFormats, listMainSoundProperties))<< "ERROR: database error";
@@ -2570,7 +2570,7 @@ TEST_F(CAmMapHandlerObserverCallbacksTest, peek_enter_update_removeSink)
 	})!=listSinks.end();
 	ASSERT_TRUE(containsSourceID);
     std::vector<am_SoundProperty_s> listSoundProperties;
-    std::vector<am_ConnectionFormat_e> listConnectionFormats;
+    std::vector<am_CustomAvailabilityReason_t> listConnectionFormats;
     std::vector<am_MainSoundProperty_s> listMainSoundProperties;
     EXPECT_CALL(*MockDatabaseObserver::getMockObserverObject(), sinkUpdated(sinkID, _, _, _)).Times(1);
     ASSERT_EQ(E_OK,pDatabaseHandler.changeSinkDB(sinkID, 1, listSoundProperties, listConnectionFormats, listMainSoundProperties))<< "ERROR: database error";
@@ -2858,12 +2858,12 @@ TEST_F(CAmMapHandlerObserverCallbacksTest, changeMainNotificationsSink)
     testSinkData.listMainNotificationConfigurations.push_back(notify);
 
     am_NotificationConfiguration_s notify1;
-    notify1.type=NT_MAX;
+    notify1.type=NT_UNKNOWN;
     notify1.status=NS_PERIODIC;
     notify1.parameter=5;
 
     am_NotificationConfiguration_s notify2;
-    notify2.type=NT_MAX;
+    notify2.type=NT_UNKNOWN;
     notify2.status=NS_CHANGE;
     notify2.parameter=27;
 
@@ -2896,12 +2896,12 @@ TEST_F(CAmMapHandlerObserverCallbacksTest, changeMainNotificationsSources)
     testSourceData.listMainNotificationConfigurations.push_back(notify);
 
     am_NotificationConfiguration_s notify1;
-    notify1.type=NT_MAX;
+    notify1.type=NT_UNKNOWN;
     notify1.status=NS_PERIODIC;
     notify1.parameter=5;
 
     am_NotificationConfiguration_s notify2;
-    notify2.type=NT_MAX;
+    notify2.type=NT_UNKNOWN;
     notify2.status=NS_CHANGE;
     notify2.parameter=10;
 
diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp
index d3415c4..42ef261 100644
--- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp
+++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp
@@ -142,7 +142,7 @@ TEST_F(CAmRoutingInterfaceTest,setSinkSoundPropertyNoChange)
     am_domainID_t domainID;
     am_Handle_s handle;
     am_SoundProperty_s soundProperty;
-    soundProperty.type = SP_EXAMPLE_TREBLE;
+    soundProperty.type = SP_GENIVI_TREBLE;
     soundProperty.value = 23;
     std::vector<am_Handle_s> listHandles;
     pCF.createSink(sink);
@@ -215,7 +215,7 @@ TEST_F(CAmRoutingInterfaceTest,setSinkSoundProperty)
     am_Handle_s handle;
     am_SoundProperty_s soundProperty;
     soundProperty.value=5;
-    soundProperty.type=SP_EXAMPLE_MID;
+    soundProperty.type=SP_GENIVI_MID;
     std::vector<am_Handle_s> listHandles;
     pCF.createSink(sink);
     pCF.createDomain(domain);
@@ -244,7 +244,7 @@ TEST_F(CAmRoutingInterfaceTest,setSourceVolumeNoChange)
     am_domainID_t domainID;
     am_Handle_s handle;
     am_volume_t volume = 34;
-    am_RampType_e rampType = RAMP_GENIVI_DIRECT;
+    am_CustomRampType_t rampType = RAMP_GENIVI_DIRECT;
     am_time_t rampTime = 300;
     std::vector<am_Handle_s> listHandles;
     pCF.createSource(source);
@@ -270,7 +270,7 @@ TEST_F(CAmRoutingInterfaceTest,setSourceVolume)
     am_domainID_t domainID;
     am_Handle_s handle;
     am_volume_t volume = 34;
-    am_RampType_e rampType = RAMP_GENIVI_DIRECT;
+    am_CustomRampType_t rampType = RAMP_GENIVI_DIRECT;
     am_time_t rampTime = 300;
     std::vector<am_Handle_s> listHandles;
     pCF.createSource(source);
@@ -298,7 +298,7 @@ TEST_F(CAmRoutingInterfaceTest,setSinkVolumeNoChange)
     am_domainID_t domainID;
     am_Handle_s handle;
     am_volume_t volume = 34;
-    am_RampType_e rampType = RAMP_GENIVI_DIRECT;
+    am_CustomRampType_t rampType = RAMP_GENIVI_DIRECT;
     am_time_t rampTime = 300;
     std::vector<am_Handle_s> listHandles;
     pCF.createSink(sink);
@@ -324,7 +324,7 @@ TEST_F(CAmRoutingInterfaceTest,setSinkVolume)
     am_domainID_t domainID;
     am_Handle_s handle;
     am_volume_t volume = 34;
-    am_RampType_e rampType = RAMP_GENIVI_DIRECT;
+    am_CustomRampType_t rampType = RAMP_GENIVI_DIRECT;
     am_time_t rampTime = 300;
     std::vector<am_Handle_s> listHandles;
     pCF.createSink(sink);
diff --git a/AudioManagerDaemon/test/CAmCommonFunctions.cpp b/AudioManagerDaemon/test/CAmCommonFunctions.cpp
index d8c2e03..47b09e6 100644
--- a/AudioManagerDaemon/test/CAmCommonFunctions.cpp
+++ b/AudioManagerDaemon/test/CAmCommonFunctions.cpp
@@ -205,9 +205,9 @@ bool CAmCommonFunctions::compareRoute(am_Route_s a, am_Route_s b)
     return retVal;
 }
 
-std::vector<am_ConnectionFormat_e> CAmCommonFunctions::getStandardConnectionFormatList()
+std::vector<am_CustomAvailabilityReason_t> CAmCommonFunctions::getStandardConnectionFormatList()
 {
-    std::vector<am_ConnectionFormat_e> list;
+    std::vector<am_CustomAvailabilityReason_t> list;
     list.push_back(CF_GENIVI_ANALOG);
     list.push_back(CF_GENIVI_STEREO);
     return list;
@@ -217,10 +217,10 @@ std::vector<am_SoundProperty_s> CAmCommonFunctions::getStandardSoundPropertyList
 {
     std::vector<am_SoundProperty_s> soundPropertyList;
     am_SoundProperty_s soundProperty;
-    soundProperty.type = SP_EXAMPLE_BASS;
+    soundProperty.type = SP_GENIVI_BASS;
     soundProperty.value = 23;
     soundPropertyList.push_back(soundProperty);
-    soundProperty.type = SP_EXAMPLE_MID;
+    soundProperty.type = SP_GENIVI_MID;
     soundProperty.value = 2;
     soundPropertyList.push_back(soundProperty);
     return soundPropertyList;
@@ -331,7 +331,7 @@ std::vector<am_NotificationConfiguration_s> am::CAmCommonFunctions::getStandardN
     am_NotificationConfiguration_s tempNotificationConfiguration;
     tempNotificationConfiguration.parameter=12;
     tempNotificationConfiguration.status=NS_PERIODIC;
-    tempNotificationConfiguration.type=NT_MAX;
+    tempNotificationConfiguration.type=NT_UNKNOWN;
     listNotificationConfigurations.push_back(tempNotificationConfiguration);
 
     tempNotificationConfiguration.parameter=16;
diff --git a/AudioManagerDaemon/test/CAmCommonFunctions.h b/AudioManagerDaemon/test/CAmCommonFunctions.h
index 0c9e362..345d178 100644
--- a/AudioManagerDaemon/test/CAmCommonFunctions.h
+++ b/AudioManagerDaemon/test/CAmCommonFunctions.h
@@ -30,7 +30,7 @@ class CAmCommonFunctions
 {
 public:
 
-    static std::vector<am_ConnectionFormat_e> getStandardConnectionFormatList();
+    static std::vector<am_CustomAvailabilityReason_t> getStandardConnectionFormatList();
     static std::vector<am_SoundProperty_s> getStandardSoundPropertyList();
     static std::vector<am_MainSoundProperty_s> getStandardMainSoundPropertyList();
     static std::vector<bool> getStandardConvertionMatrix();
@@ -59,7 +59,7 @@ public:
 
     struct sortByConnectionFormat
     {
-        bool operator()(const am_ConnectionFormat_e & a, const am_ConnectionFormat_e & b) const
+        bool operator()(const am_CustomAvailabilityReason_t & a, const am_CustomAvailabilityReason_t & b) const
         {
             return (a < b);
         }
diff --git a/AudioManagerDaemon/test/MockIAmControlSend.h b/AudioManagerDaemon/test/MockIAmControlSend.h
index fca6073..5d9b528 100644
--- a/AudioManagerDaemon/test/MockIAmControlSend.h
+++ b/AudioManagerDaemon/test/MockIAmControlSend.h
@@ -114,7 +114,7 @@ class MockIAmControlSend : public IAmControlSend {
     MOCK_METHOD2(cbAckSetSinkSoundProperty,
         void(const am_Handle_s handle, const am_Error_e error));
     MOCK_METHOD5(getConnectionFormatChoice,
-        am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats));
+        am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_CustomAvailabilityReason_t> listPossibleConnectionFormats, std::vector<am_CustomAvailabilityReason_t>& listPrioConnectionFormats));
     MOCK_METHOD1(confirmCommandReady,
         void(const am_Error_e error));
     MOCK_METHOD1(confirmRoutingReady,
@@ -124,11 +124,11 @@ class MockIAmControlSend : public IAmControlSend {
     MOCK_METHOD1(confirmRoutingRundown,
         void(const am_Error_e error));
     MOCK_METHOD5(hookSystemUpdateSink,
-        am_Error_e(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties));
+        am_Error_e(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomAvailabilityReason_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties));
     MOCK_METHOD5(hookSystemUpdateSource,
-        am_Error_e(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties));
+        am_Error_e(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomAvailabilityReason_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties));
     MOCK_METHOD4(hookSystemUpdateGateway,
-        am_Error_e(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix));
+        am_Error_e(const am_gatewayID_t gatewayID, const std::vector<am_CustomAvailabilityReason_t>& listSourceConnectionFormats, const std::vector<am_CustomAvailabilityReason_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix));
     MOCK_METHOD3(cbAckSetVolumes,
         void(const am_Handle_s handle, const std::vector<am_Volumes_s>& listVolumes, const am_Error_e error));
     MOCK_METHOD2(cbAckSetSinkNotificationConfiguration,
diff --git a/AudioManagerDaemon/test/MockIAmRoutingSend.h b/AudioManagerDaemon/test/MockIAmRoutingSend.h
index 029790e..6ebb94d 100644
--- a/AudioManagerDaemon/test/MockIAmRoutingSend.h
+++ b/AudioManagerDaemon/test/MockIAmRoutingSend.h
@@ -40,13 +40,13 @@ class MockIAmRoutingSend : public IAmRoutingSend {
     MOCK_METHOD1(asyncAbort,
         am_Error_e(const am_Handle_s handle));
     MOCK_METHOD5(asyncConnect,
-        am_Error_e(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat));
+        am_Error_e(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_CustomAvailabilityReason_t connectionFormat));
     MOCK_METHOD2(asyncDisconnect,
         am_Error_e(const am_Handle_s handle, const am_connectionID_t connectionID));
     MOCK_METHOD5(asyncSetSinkVolume,
-        am_Error_e(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time));
+        am_Error_e(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time));
     MOCK_METHOD5(asyncSetSourceVolume,
-        am_Error_e(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time));
+        am_Error_e(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time));
     MOCK_METHOD3(asyncSetSourceState,
         am_Error_e(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SourceState_e state));
     MOCK_METHOD3(asyncSetSinkSoundProperties,
@@ -58,7 +58,7 @@ class MockIAmRoutingSend : public IAmRoutingSend {
     MOCK_METHOD3(asyncSetSourceSoundProperty,
         am_Error_e(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SoundProperty_s& soundProperty));
     MOCK_METHOD5(asyncCrossFade,
-        am_Error_e(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_RampType_e rampType, const am_time_t time));
+        am_Error_e(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_CustomRampType_t rampType, const am_time_t time));
     MOCK_METHOD2(setDomainState,
         am_Error_e(const am_domainID_t domainID, const am_DomainState_e domainState));
     MOCK_CONST_METHOD1(returnBusName,