API change with API simplification and streamID optional for Stream Open and Close

14 files changed, 1179 insertions, 1303 deletions

diff --git a/htdocs/audiohl.html b/htdocs/audiohl.html
index 418cf7a..b59e404 100644
--- a/htdocs/audiohl.html
+++ b/htdocs/audiohl.html
@@ -59,23 +59,26 @@
 
     <br>
     <ol>
-        <li><button onclick="callbinder('audiohl','get_sources', {audio_role:ar})">get_sources(audio_role)</button></li>
-        <li><button onclick="callbinder('audiohl','get_sinks', {audio_role:ar})">get_sinks(audio_role)</button></li>
+        <li><button onclick="callbinder('audiohl','get_endpoints', {audio_role:ar,endpoint_type:ep_type})">get_endpoints(audio_role,endpoint_type)</button></li>
         <li><button onclick="callbinder('audiohl','stream_open', {audio_role:ar,endpoint_type:ep_type})">stream_open(audio_role,endpoint_type)</button></li>
         <li><button onclick="callbinder('audiohl','stream_open', {audio_role:ar,endpoint_type:ep_type,endpoint_id:ep_id})">stream_open(audio_role,enpoint_type,endpoint_id)</button></li>
         <li><button onclick="callbinder('audiohl','stream_close', {stream_id:s_id})">stream_close(stream_id)</button></li>
+        <li><button onclick="callbinder('audiohl','stream_close', {})">stream_close()</button></li>
         <li><button onclick="callbinder('audiohl','get_stream_info', {stream_id:s_id})">get_stream_info(stream_id)</button></li>
+        <li><button onclick="callbinder('audiohl','set_stream_state', {stream_id:s_id})">set_stream_state(stream_id)</button></li>
         <li><button onclick="callbinder('audiohl','set_stream_state', {stream_id:s_id,state:st_state})">set_stream_state(stream_id,stream_state)</button></li>
-        <li><button onclick="callbinder('audiohl','set_stream_mute', {stream_id:s_id,mute:st_mute})">set_stream_mute(stream_id,mute)</button></li>
-        <li><button onclick="callbinder('audiohl','set_volume', {endpoint_type:ep_type,endpoint_id:ep_id,volume:vol_val})">set_volume(endpoint_type,endpoint_id,value)</button></li>
-        <li><button onclick="callbinder('audiohl','get_volume', {endpoint_type:ep_type,endpoint_id:ep_id})">get_volume(endpoint_type,endpoint_id)</button></li>
-        <li><button onclick="callbinder('audiohl','set_property', {endpoint_type:ep_type,endpoint_id:ep_id,property_name:p_name,value:prop_val})">set_property(endpoint_type,endpoint_id,property,value)</button></li>
-        <li><button onclick="callbinder('audiohl','get_property', {endpoint_type:ep_type,endpoint_id:ep_id,property_name:p_name})">get_property(endpoint_type,endpoint_id,property)</button></li>
+        <li><button onclick="callbinder('audiohl','set_stream_state', {stream_id:s_id,mute:st_mute})">set_stream_state(stream_id,mute)</button></li>
+        <li><button onclick="callbinder('audiohl','set_stream_state', {stream_id:s_id,state:st_state,mute:st_mute})">set_stream_state(stream_id,stream_state,mute)</button></li>
+        <li><button onclick="callbinder('audiohl','set_stream_state', {state:st_state,mute:st_mute})">set_stream_state(stream_state,mute)</button></li>
+        <li><button onclick="callbinder('audiohl','volume', {endpoint_type:ep_type,endpoint_id:ep_id,volume:vol_val})">volume(endpoint_type,endpoint_id,value)</button></li>
+        <li><button onclick="callbinder('audiohl','volume', {endpoint_type:ep_type,endpoint_id:ep_id})">volume(endpoint_type,endpoint_id)</button></li>
+        <li><button onclick="callbinder('audiohl','property', {endpoint_type:ep_type,endpoint_id:ep_id,property_name:p_name,value:prop_val})">property(endpoint_type,endpoint_id,property,value)</button></li>
+        <li><button onclick="callbinder('audiohl','property', {endpoint_type:ep_type,endpoint_id:ep_id,property_name:p_name})">property(endpoint_type,endpoint_id,property)</button></li>
         <li><button onclick="callbinder('audiohl','get_endpoint_info', {endpoint_type:ep_type,endpoint_id:ep_id})">get_endpoint_info(endpoint_type,endpoint_id)</button></li>
         <li><button onclick="callbinder('audiohl','get_list_actions', {audio_role:ar})">get_list_actions(audio_role)</button></li>
         <li><button onclick="callbinder('audiohl','post_action', {action_name:'emergency_brake',audio_role:ar,media_name:'Warning.wav'})">post_action(emergency_brake,audio_role,'Warning.wav')</button></li>
-        <li><button onclick="callbinder('audiohl','subscribe', {events:['ahl_endpoint_property_event','ahl_endpoint_volume_event','ahl_post_action']})">subscribe(['ahl_endpoint_property_event','ahl_endpoint_volume_event','ahl_post_action'])</button>
-        <li><button onclick="callbinder('audiohl','unsubscribe', {events:['ahl_endpoint_property_event','ahl_endpoint_volume_event','ahl_post_action']})">unsubscribe(['ahl_endpoint_property_event','ahl_endpoint_volume_event','ahl_post_action'])</button></li>
+        <li><button onclick="callbinder('audiohl','event_subscription', {events:['ahl_endpoint_property_event','ahl_endpoint_volume_event','ahl_post_action'],subscribe:1})">subscribe(['ahl_endpoint_property_event','ahl_endpoint_volume_event','ahl_post_action'])</button>
+        <li><button onclick="callbinder('audiohl','event_subscription', {events:['ahl_endpoint_property_event','ahl_endpoint_volume_event','ahl_post_action'],subscribe:0})">unsubscribe(['ahl_endpoint_property_event','ahl_endpoint_volume_event','ahl_post_action'])</button></li>
     </ol>
 
     <div id="main" style="visibility:hidden">
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4429b0b..75a16cc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -39,7 +39,7 @@ PKG_CHECK_MODULES(GLIB_PKG REQUIRED glib-2.0)
 PROJECT_TARGET_ADD(audiohighlevel)
 
     # Define project Targets
-    ADD_LIBRARY(${TARGET_NAME} MODULE ahl-binding.c ahl-deviceenum.c ahl-config.c ahl-policy-utils.c ahl-policy.c)
+    ADD_LIBRARY(${TARGET_NAME} MODULE ahl-binding.c ahl-deviceenum.c ahl-config.c ahl-policy-utils.c ahl-policy.c ahl-policyJSON.c)
 
     # Generate API-v2 hat from OpenAPI json definition
     SET_TARGET_GENSKEL(${TARGET_NAME} ahl-apidef)
diff --git a/src/ahl-apidef.h b/src/ahl-apidef.h
index fd957ce..97f8de7 100644
--- a/src/ahl-apidef.h
+++ b/src/ahl-apidef.h
@@ -36,114 +36,86 @@ static const char _afb_description_v2_audiohl[] =
     ":{\"200\":{\"description\":\"A complex object array response\",\"content"
     "\":{\"application/json\":{\"schema\":{\"$ref\":\"#/components/schemas/af"
     "b-reply\"}}}},\"400\":{\"description\":\"Invalid arguments\"}}},\"paths\""
-    ":{\"/get_sources\":{\"description\":\"Retrieve array of available audio "
-    "sources\",\"get\":{\"parameters\":[{\"in\":\"query\",\"name\":\"audio_ro"
-    "le\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"responses\":"
-    "{\"200\":{\"$ref\":\"#/components/responses/200\",\"response\":{\"descri"
-    "ption\":\"Array of endpoint info structures\",\"type\":\"array\",\"items"
-    "\":{\"$ref\":\"#/components/schemas/endpoint_info\"}}},\"400\":{\"$ref\""
-    ":\"#/components/responses/400\"}}}},\"/get_sinks\":{\"description\":\"Re"
-    "trieve array of available audio sinks\",\"get\":{\"parameters\":[{\"in\""
-    ":\"query\",\"name\":\"audio_role\",\"required\":true,\"schema\":{\"type\""
-    ":\"string\"}}],\"responses\":{\"200\":{\"$ref\":\"#/components/responses"
-    "/200\",\"response\":{\"description\":\"Array of endpoint info structures"
-    "\",\"type\":\"array\",\"items\":{\"$ref\":\"#/components/schemas/endpoin"
-    "t_info\"}}},\"400\":{\"$ref\":\"#/components/responses/400\"}}}},\"/stre"
-    "am_open\":{\"description\":\"Request opening a stream\",\"get\":{\"x-per"
-    "missions\":{\"$ref\":\"#/components/x-permissions/audiostream\"},\"param"
-    "eters\":[{\"in\":\"query\",\"name\":\"audio_role\",\"required\":true,\"s"
-    "chema\":{\"type\":\"string\"}},{\"in\":\"query\",\"name\":\"endpoint_typ"
-    "e\",\"required\":true,\"schema\":{\"type\":\"enum\"}},{\"in\":\"query\","
-    "\"name\":\"endpoint_id\",\"required\":false,\"schema\":{\"type\":\"int\""
-    "}}],\"responses\":{\"200\":{\"$ref\":\"#/components/responses/200\",\"re"
-    "sponse\":{\"description\":\"Stream information structure\",\"$ref\":\"#/"
-    "components/schemas/stream_info\"}},\"400\":{\"$ref\":\"#/components/resp"
-    "onses/400\"}}}},\"/stream_close\":{\"description\":\"Request closing a s"
-    "tream\",\"get\":{\"x-permissions\":{\"$ref\":\"#/components/x-permission"
-    "s/audiostream\"},\"parameters\":[{\"in\":\"query\",\"name\":\"stream_id\""
+    ":{\"/get_endpoints\":{\"description\":\"Retrieve array of available audi"
+    "o endpoints\",\"get\":{\"parameters\":[{\"in\":\"query\",\"name\":\"audi"
+    "o_role\",\"required\":true,\"schema\":{\"type\":\"string\"}},{\"in\":\"q"
+    "uery\",\"name\":\"endpoint_type\",\"required\":true,\"schema\":{\"type\""
+    ":\"enum\"}}],\"responses\":{\"200\":{\"$ref\":\"#/components/responses/2"
+    "00\",\"response\":{\"description\":\"Array of endpoint info structures\""
+    ",\"type\":\"array\",\"items\":{\"$ref\":\"#/components/schemas/endpoint_"
+    "info\"}}},\"400\":{\"$ref\":\"#/components/responses/400\"}}}},\"/stream"
+    "_open\":{\"description\":\"Request opening a stream\",\"get\":{\"x-permi"
+    "ssions\":{\"$ref\":\"#/components/x-permissions/audiostream\"},\"paramet"
+    "ers\":[{\"in\":\"query\",\"name\":\"audio_role\",\"required\":true,\"sch"
+    "ema\":{\"type\":\"string\"}},{\"in\":\"query\",\"name\":\"endpoint_type\""
+    ",\"required\":true,\"schema\":{\"type\":\"enum\"}},{\"in\":\"query\",\"n"
+    "ame\":\"endpoint_id\",\"required\":false,\"schema\":{\"type\":\"int\"}}]"
+    ",\"responses\":{\"200\":{\"$ref\":\"#/components/responses/200\",\"respo"
+    "nse\":{\"description\":\"Stream information structure\",\"$ref\":\"#/com"
+    "ponents/schemas/stream_info\"}},\"400\":{\"$ref\":\"#/components/respons"
+    "es/400\"}}}},\"/stream_close\":{\"description\":\"Request closing a stre"
+    "am\",\"get\":{\"x-permissions\":{\"$ref\":\"#/components/x-permissions/a"
+    "udiostream\"},\"parameters\":[{\"in\":\"query\",\"name\":\"stream_id\",\""
+    "required\":false,\"schema\":{\"type\":\"int\"}}],\"responses\":{\"200\":"
+    "{\"$ref\":\"#/components/responses/200\"},\"400\":{\"$ref\":\"#/componen"
+    "ts/responses/400\"}}}},\"/set_stream_state\":{\"description\":\"Change s"
+    "tream active and/or mute state\",\"get\":{\"x-permissions\":{\"$ref\":\""
+    "#/components/x-permissions/streamcontrol\"},\"parameters\":[{\"in\":\"qu"
+    "ery\",\"name\":\"stream_id\",\"required\":false,\"schema\":{\"type\":\"i"
+    "nt\"}},{\"in\":\"query\",\"name\":\"state\",\"required\":false,\"schema\""
+    ":{\"type\":\"int\"}},{\"in\":\"query\",\"name\":\"mute\",\"required\":fa"
+    "lse,\"schema\":{\"type\":\"int\"}}],\"responses\":{\"200\":{\"$ref\":\"#"
+    "/components/responses/200\"},\"400\":{\"$ref\":\"#/components/responses/"
+    "400\"}}}},\"/get_stream_info\":{\"description\":\"Retrieve stream inform"
+    "ation\",\"get\":{\"parameters\":[{\"in\":\"query\",\"name\":\"stream_id\""
     ",\"required\":true,\"schema\":{\"type\":\"int\"}}],\"responses\":{\"200\""
-    ":{\"$ref\":\"#/components/responses/200\"},\"400\":{\"$ref\":\"#/compone"
-    "nts/responses/400\"}}}},\"/set_stream_state\":{\"description\":\"Change "
-    "stream active state\",\"get\":{\"x-permissions\":{\"$ref\":\"#/component"
-    "s/x-permissions/streamcontrol\"},\"parameters\":[{\"in\":\"query\",\"nam"
-    "e\":\"stream_id\",\"required\":true,\"schema\":{\"type\":\"int\"}},{\"in"
-    "\":\"query\",\"name\":\"state\",\"required\":true,\"schema\":{\"type\":\""
-    "int\"}}],\"responses\":{\"200\":{\"$ref\":\"#/components/responses/200\""
-    "},\"400\":{\"$ref\":\"#/components/responses/400\"}}}},\"/set_stream_mut"
-    "e\":{\"description\":\"Change stream mute state\",\"get\":{\"x-permissio"
-    "ns\":{\"$ref\":\"#/components/x-permissions/streamcontrol\"},\"parameter"
-    "s\":[{\"in\":\"query\",\"name\":\"stream_id\",\"required\":true,\"schema"
-    "\":{\"type\":\"int\"}},{\"in\":\"query\",\"name\":\"mute\",\"required\":"
-    "true,\"schema\":{\"type\":\"int\"}}],\"responses\":{\"200\":{\"$ref\":\""
-    "#/components/responses/200\"},\"400\":{\"$ref\":\"#/components/responses"
-    "/400\"}}}},\"/get_stream_info\":{\"description\":\"Retrieve stream infor"
-    "mation\",\"get\":{\"parameters\":[{\"in\":\"query\",\"name\":\"stream_id"
-    "\",\"required\":true,\"schema\":{\"type\":\"int\"}}],\"responses\":{\"20"
-    "0\":{\"$ref\":\"#/components/responses/200\",\"response\":{\"description"
-    "\":\"Stream information structure\",\"$ref\":\"#/components/schemas/stre"
-    "am_info\"}},\"400\":{\"$ref\":\"#/components/responses/400\"}}}},\"/set_"
-    "volume\":{\"description\":\"Set volume on endpoint\",\"get\":{\"x-permis"
-    "sions\":{\"$ref\":\"#/components/x-permissions/endpointcontrol\"},\"para"
-    "meters\":[{\"in\":\"query\",\"name\":\"endpoint_type\",\"required\":true"
-    ",\"schema\":{\"type\":\"enum\"}},{\"in\":\"query\",\"name\":\"endpoint_i"
-    "d\",\"required\":true,\"schema\":{\"type\":\"int\"}},{\"in\":\"query\",\""
-    "name\":\"volume\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\""
-    "responses\":{\"200\":{\"$ref\":\"#/components/responses/200\"},\"400\":{"
-    "\"$ref\":\"#/components/responses/400\"}}}},\"/get_volume\":{\"descripti"
-    "on\":\"Get endpoint volume\",\"get\":{\"parameters\":[{\"in\":\"query\","
-    "\"name\":\"endpoint_type\",\"required\":true,\"schema\":{\"type\":\"enum"
-    "\"}},{\"in\":\"query\",\"name\":\"endpoint_id\",\"required\":true,\"sche"
-    "ma\":{\"type\":\"int\"}}],\"responses\":{\"200\":{\"$ref\":\"#/component"
-    "s/responses/200\",\"response\":{\"description\":\"Endpoint volume value\""
-    ",\"type\":\"double\"}},\"400\":{\"$ref\":\"#/components/responses/400\"}"
-    "}}},\"/get_endpoint_info\":{\"description\":\"Retrieve endpoint informat"
-    "ion including its properties\",\"get\":{\"parameters\":[{\"in\":\"query\""
-    ",\"name\":\"endpoint_type\",\"required\":true,\"schema\":{\"type\":\"enu"
-    "m\"}},{\"in\":\"query\",\"name\":\"endpoint_id\",\"required\":false,\"sc"
-    "hema\":{\"type\":\"int\"}}],\"responses\":{\"200\":{\"$ref\":\"#/compone"
-    "nts/responses/200\"},\"400\":{\"$ref\":\"#/components/responses/400\"}}}"
-    "},\"/set_property\":{\"description\":\"Set endpoint property value\",\"g"
-    "et\":{\"x-permissions\":{\"$ref\":\"#/components/x-permissions/endpointc"
-    "ontrol\"},\"parameters\":[{\"in\":\"query\",\"name\":\"endpoint_type\",\""
+    ":{\"$ref\":\"#/components/responses/200\",\"response\":{\"description\":"
+    "\"Stream information structure\",\"$ref\":\"#/components/schemas/stream_"
+    "info\"}},\"400\":{\"$ref\":\"#/components/responses/400\"}}}},\"/volume\""
+    ":{\"description\":\"Set or get volume on endpoint\",\"get\":{\"x-permiss"
+    "ions\":{\"$ref\":\"#/components/x-permissions/endpointcontrol\"},\"param"
+    "eters\":[{\"in\":\"query\",\"name\":\"endpoint_type\",\"required\":true,"
+    "\"schema\":{\"type\":\"enum\"}},{\"in\":\"query\",\"name\":\"endpoint_id"
+    "\",\"required\":true,\"schema\":{\"type\":\"int\"}},{\"in\":\"query\",\""
+    "name\":\"volume\",\"required\":false,\"schema\":{\"type\":\"string\"}}],"
+    "\"responses\":{\"200\":{\"$ref\":\"#/components/responses/200\"},\"400\""
+    ":{\"$ref\":\"#/components/responses/400\"}}}},\"/get_endpoint_info\":{\""
+    "description\":\"Retrieve endpoint information including its properties\""
+    ",\"get\":{\"parameters\":[{\"in\":\"query\",\"name\":\"endpoint_type\",\""
     "required\":true,\"schema\":{\"type\":\"enum\"}},{\"in\":\"query\",\"name"
-    "\":\"endpoint_id\",\"required\":false,\"schema\":{\"type\":\"int\"}},{\""
-    "in\":\"query\",\"name\":\"property_name\",\"required\":true,\"schema\":{"
-    "\"type\":\"string\"}},{\"in\":\"query\",\"name\":\"value\",\"required\":"
-    "true,\"schema\":{\"type\":\"string\"}}],\"responses\":{\"200\":{\"$ref\""
-    ":\"#/components/responses/200\"},\"400\":{\"$ref\":\"#/components/respon"
-    "ses/400\"}}}},\"/get_property\":{\"description\":\"Get endpoint property"
-    " value\",\"get\":{\"parameters\":[{\"in\":\"query\",\"name\":\"endpoint_"
-    "type\",\"required\":true,\"schema\":{\"type\":\"enum\"}},{\"in\":\"query"
-    "\",\"name\":\"endpoint_id\",\"required\":false,\"schema\":{\"type\":\"in"
-    "t\"}},{\"in\":\"query\",\"name\":\"property_name\",\"required\":true,\"s"
-    "chema\":{\"type\":\"string\"}}],\"responses\":{\"200\":{\"$ref\":\"#/com"
-    "ponents/responses/200\",\"response\":{\"description\":\"Property value\""
-    ",\"type\":\"double\"}},\"400\":{\"$ref\":\"#/components/responses/400\"}"
-    "}}},\"/get_list_actions\":{\"description\":\"Retrieve a list of supporte"
-    "d actions for a particular audio role\",\"get\":{\"parameters\":[{\"in\""
-    ":\"query\",\"name\":\"audio_role\",\"required\":true,\"schema\":{\"type\""
-    ":\"string\"}}],\"responses\":{\"200\":{\"$ref\":\"#/components/responses"
-    "/200\"},\"400\":{\"$ref\":\"#/components/responses/400\"}}}},\"/post_act"
-    "ion\":{\"description\":\"Post sound or audio device related action event"
-    " (extendable mechanism)\",\"get\":{\"x-permissions\":{\"$ref\":\"#/compo"
-    "nents/x-permissions/soundevent\"},\"parameters\":[{\"in\":\"query\",\"na"
-    "me\":\"action_name\",\"required\":true,\"schema\":{\"type\":\"string\"}}"
-    ",{\"in\":\"query\",\"name\":\"audio_role\",\"required\":true,\"schema\":"
-    "{\"type\":\"string\"}},{\"in\":\"query\",\"name\":\"media_name\",\"requi"
-    "red\":false,\"schema\":{\"type\":\"string\"}},{\"in\":\"query\",\"name\""
-    ":\"action_context\",\"required\":false,\"schema\":{\"type\":\"object\"}}"
-    "],\"responses\":{\"200\":{\"$ref\":\"#/components/responses/200\"},\"400"
-    "\":{\"$ref\":\"#/components/responses/400\"}}}},\"/subscribe\":{\"descri"
-    "ption\":\"Subscribe to audio high level events\",\"get\":{\"parameters\""
-    ":[{\"in\":\"query\",\"name\":\"events\",\"required\":true,\"schema\":{\""
-    "type\":\"array\",\"items\":{\"type\":\"string\"}}}],\"responses\":{\"200"
-    "\":{\"$ref\":\"#/components/responses/200\"},\"400\":{\"$ref\":\"#/compo"
-    "nents/responses/400\"}}}},\"/unsubscribe\":{\"description\":\"Unubscribe"
-    " to audio high level events\",\"get\":{\"parameters\":[{\"in\":\"query\""
-    ",\"name\":\"events\",\"required\":true,\"schema\":{\"type\":\"array\",\""
-    "items\":{\"type\":\"string\"}}}],\"responses\":{\"200\":{\"$ref\":\"#/co"
-    "mponents/responses/200\"},\"400\":{\"$ref\":\"#/components/responses/400"
-    "\"}}}}}}"
+    "\":\"endpoint_id\",\"required\":true,\"schema\":{\"type\":\"int\"}}],\"r"
+    "esponses\":{\"200\":{\"$ref\":\"#/components/responses/200\"},\"400\":{\""
+    "$ref\":\"#/components/responses/400\"}}}},\"/property\":{\"description\""
+    ":\"Set/get endpoint property value\",\"get\":{\"x-permissions\":{\"$ref\""
+    ":\"#/components/x-permissions/endpointcontrol\"},\"parameters\":[{\"in\""
+    ":\"query\",\"name\":\"endpoint_type\",\"required\":true,\"schema\":{\"ty"
+    "pe\":\"enum\"}},{\"in\":\"query\",\"name\":\"endpoint_id\",\"required\":"
+    "true,\"schema\":{\"type\":\"int\"}},{\"in\":\"query\",\"name\":\"propert"
+    "y_name\",\"required\":true,\"schema\":{\"type\":\"string\"}},{\"in\":\"q"
+    "uery\",\"name\":\"value\",\"required\":false,\"schema\":{\"type\":\"stri"
+    "ng\"}}],\"responses\":{\"200\":{\"$ref\":\"#/components/responses/200\"}"
+    ",\"400\":{\"$ref\":\"#/components/responses/400\"}}}},\"/get_list_action"
+    "s\":{\"description\":\"Retrieve a list of supported actions for a partic"
+    "ular audio role\",\"get\":{\"parameters\":[{\"in\":\"query\",\"name\":\""
+    "audio_role\",\"required\":true,\"schema\":{\"type\":\"string\"}}],\"resp"
+    "onses\":{\"200\":{\"$ref\":\"#/components/responses/200\"},\"400\":{\"$r"
+    "ef\":\"#/components/responses/400\"}}}},\"/post_action\":{\"description\""
+    ":\"Post sound or audio device related action event (extendable mechanism"
+    ")\",\"get\":{\"x-permissions\":{\"$ref\":\"#/components/x-permissions/so"
+    "undevent\"},\"parameters\":[{\"in\":\"query\",\"name\":\"action_name\",\""
+    "required\":true,\"schema\":{\"type\":\"string\"}},{\"in\":\"query\",\"na"
+    "me\":\"audio_role\",\"required\":true,\"schema\":{\"type\":\"string\"}},"
+    "{\"in\":\"query\",\"name\":\"media_name\",\"required\":false,\"schema\":"
+    "{\"type\":\"string\"}},{\"in\":\"query\",\"name\":\"action_context\",\"r"
+    "equired\":false,\"schema\":{\"type\":\"object\"}}],\"responses\":{\"200\""
+    ":{\"$ref\":\"#/components/responses/200\"},\"400\":{\"$ref\":\"#/compone"
+    "nts/responses/400\"}}}},\"/event_subscription\":{\"description\":\"Subsc"
+    "ribe to audio high level events\",\"get\":{\"parameters\":[{\"in\":\"que"
+    "ry\",\"name\":\"events\",\"required\":true,\"schema\":{\"type\":\"array\""
+    ",\"items\":{\"type\":\"string\"}}},{\"in\":\"query\",\"name\":\"subscrib"
+    "e\",\"required\":true,\"schema\":{\"type\":\"int\"}}],\"responses\":{\"2"
+    "00\":{\"$ref\":\"#/components/responses/200\"},\"400\":{\"$ref\":\"#/com"
+    "ponents/responses/400\"}}}}}}"
 ;
 
 static const struct afb_auth _afb_auths_v2_audiohl[] = {
@@ -153,36 +125,24 @@ static const struct afb_auth _afb_auths_v2_audiohl[] = {
 	{ .type = afb_auth_Permission, .text = "urn:AGL:permission:audio:public:soundevent" }
 };
 
- void audiohlapi_get_sources(struct afb_req req);
- void audiohlapi_get_sinks(struct afb_req req);
+ void audiohlapi_get_endpoints(struct afb_req req);
  void audiohlapi_stream_open(struct afb_req req);
  void audiohlapi_stream_close(struct afb_req req);
  void audiohlapi_set_stream_state(struct afb_req req);
- void audiohlapi_set_stream_mute(struct afb_req req);
  void audiohlapi_get_stream_info(struct afb_req req);
- void audiohlapi_set_volume(struct afb_req req);
- void audiohlapi_get_volume(struct afb_req req);
+ void audiohlapi_volume(struct afb_req req);
  void audiohlapi_get_endpoint_info(struct afb_req req);
- void audiohlapi_set_property(struct afb_req req);
- void audiohlapi_get_property(struct afb_req req);
+ void audiohlapi_property(struct afb_req req);
  void audiohlapi_get_list_actions(struct afb_req req);
  void audiohlapi_post_action(struct afb_req req);
- void audiohlapi_subscribe(struct afb_req req);
- void audiohlapi_unsubscribe(struct afb_req req);
+ void audiohlapi_event_subscription(struct afb_req req);
 
 static const struct afb_verb_v2 _afb_verbs_v2_audiohl[] = {
     {
-        .verb = "get_sources",
-        .callback = audiohlapi_get_sources,
-        .auth = NULL,
-        .info = "Retrieve array of available audio sources",
-        .session = AFB_SESSION_NONE_V2
-    },
-    {
-        .verb = "get_sinks",
-        .callback = audiohlapi_get_sinks,
+        .verb = "get_endpoints",
+        .callback = audiohlapi_get_endpoints,
         .auth = NULL,
-        .info = "Retrieve array of available audio sinks",
+        .info = "Retrieve array of available audio endpoints",
         .session = AFB_SESSION_NONE_V2
     },
     {
@@ -203,14 +163,7 @@ static const struct afb_verb_v2 _afb_verbs_v2_audiohl[] = {
         .verb = "set_stream_state",
         .callback = audiohlapi_set_stream_state,
         .auth = &_afb_auths_v2_audiohl[1],
-        .info = "Change stream active state",
-        .session = AFB_SESSION_NONE_V2
-    },
-    {
-        .verb = "set_stream_mute",
-        .callback = audiohlapi_set_stream_mute,
-        .auth = &_afb_auths_v2_audiohl[1],
-        .info = "Change stream mute state",
+        .info = "Change stream active and/or mute state",
         .session = AFB_SESSION_NONE_V2
     },
     {
@@ -221,17 +174,10 @@ static const struct afb_verb_v2 _afb_verbs_v2_audiohl[] = {
         .session = AFB_SESSION_NONE_V2
     },
     {
-        .verb = "set_volume",
-        .callback = audiohlapi_set_volume,
+        .verb = "volume",
+        .callback = audiohlapi_volume,
         .auth = &_afb_auths_v2_audiohl[2],
-        .info = "Set volume on endpoint",
-        .session = AFB_SESSION_NONE_V2
-    },
-    {
-        .verb = "get_volume",
-        .callback = audiohlapi_get_volume,
-        .auth = NULL,
-        .info = "Get endpoint volume",
+        .info = "Set or get volume on endpoint",
         .session = AFB_SESSION_NONE_V2
     },
     {
@@ -242,17 +188,10 @@ static const struct afb_verb_v2 _afb_verbs_v2_audiohl[] = {
         .session = AFB_SESSION_NONE_V2
     },
     {
-        .verb = "set_property",
-        .callback = audiohlapi_set_property,
+        .verb = "property",
+        .callback = audiohlapi_property,
         .auth = &_afb_auths_v2_audiohl[2],
-        .info = "Set endpoint property value",
-        .session = AFB_SESSION_NONE_V2
-    },
-    {
-        .verb = "get_property",
-        .callback = audiohlapi_get_property,
-        .auth = NULL,
-        .info = "Get endpoint property value",
+        .info = "Set/get endpoint property value",
         .session = AFB_SESSION_NONE_V2
     },
     {
@@ -270,20 +209,13 @@ static const struct afb_verb_v2 _afb_verbs_v2_audiohl[] = {
         .session = AFB_SESSION_NONE_V2
     },
     {
-        .verb = "subscribe",
-        .callback = audiohlapi_subscribe,
+        .verb = "event_subscription",
+        .callback = audiohlapi_event_subscription,
         .auth = NULL,
         .info = "Subscribe to audio high level events",
         .session = AFB_SESSION_NONE_V2
     },
     {
-        .verb = "unsubscribe",
-        .callback = audiohlapi_unsubscribe,
-        .auth = NULL,
-        .info = "Unubscribe to audio high level events",
-        .session = AFB_SESSION_NONE_V2
-    },
-    {
         .verb = NULL,
         .callback = NULL,
         .auth = NULL,
diff --git a/src/ahl-apidef.json b/src/ahl-apidef.json
index 3ab6f4a..15ee186 100644
--- a/src/ahl-apidef.json
+++ b/src/ahl-apidef.json
@@ -137,8 +137,8 @@
         }
     },    
     "paths": {
-        "/get_sources": {
-            "description": "Retrieve array of available audio sources",
+        "/get_endpoints": {
+            "description": "Retrieve array of available audio endpoints",
             "get": {
                 "parameters": [
                     {
@@ -146,30 +146,12 @@
                         "name": "audio_role",
                         "required": true,
                         "schema": { "type": "string" }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "$ref": "#/components/responses/200",
-                        "response": {
-                            "description": "Array of endpoint info structures",
-                            "type": "array",
-                            "items": { "$ref": "#/components/schemas/endpoint_info"}
-                        }
                     },
-                    "400": { "$ref": "#/components/responses/400" }
-                }
-            }
-        },
-        "/get_sinks": {
-            "description": "Retrieve array of available audio sinks",
-            "get": {
-                "parameters": [
                     {
                         "in": "query",
-                        "name": "audio_role",
+                        "name": "endpoint_type",
                         "required": true,
-                        "schema": { "type": "string" }
+                        "schema": { "type": "enum" }
                     }
                 ],
                 "responses": {
@@ -229,7 +211,7 @@
                     {
                         "in": "query",
                         "name": "stream_id",
-                        "required": true,
+                        "required": false,
                         "schema": { "type": "int" }
                     }
                 ],
@@ -240,7 +222,7 @@
             }
         },
         "/set_stream_state": {
-            "description": "Change stream active state",
+            "description": "Change stream active and/or mute state",
             "get": {
                 "x-permissions": {
                     "$ref": "#/components/x-permissions/streamcontrol"
@@ -249,39 +231,19 @@
                     {
                         "in": "query",
                         "name": "stream_id",
-                        "required": true,
+                        "required": false,
                         "schema": {"type": "int"}
                     },
                     {
                         "in": "query",
                         "name": "state",
-                        "required": true,
-                        "schema": {"type": "int"}
-                    }
-                ],
-                "responses": {
-                    "200": { "$ref": "#/components/responses/200" },
-                    "400": { "$ref": "#/components/responses/400" }
-                }
-            }
-        },
-        "/set_stream_mute": {
-            "description": "Change stream mute state",
-            "get": {
-                "x-permissions": {
-                    "$ref": "#/components/x-permissions/streamcontrol"
-                },
-                "parameters": [
-                    {
-                        "in": "query",
-                        "name": "stream_id",
-                        "required": true,
+                        "required": false,
                         "schema": {"type": "int"}
                     },
                     {
                         "in": "query",
                         "name": "mute",
-                        "required": true,
+                        "required": false,
                         "schema": {"type": "int"}
                     }
                 ],
@@ -314,8 +276,8 @@
                 }
             }
         },
-        "/set_volume": {
-            "description": "Set volume on endpoint",
+        "/volume": {
+            "description": "Set or get volume on endpoint",
             "get": {
                 "x-permissions": { "$ref": "#/components/x-permissions/endpointcontrol" },
                 "parameters": [
@@ -334,7 +296,7 @@
                     {
                         "in": "query",
                         "name": "volume",
-                        "required": true,
+                        "required": false,
                         "schema": { "type": "string" }
                     }
                 ],
@@ -344,35 +306,6 @@
                 }
             }
         },
-        "/get_volume": {
-            "description": "Get endpoint volume",
-            "get": {
-                "parameters": [
-                    {
-                        "in": "query",
-                        "name": "endpoint_type",
-                        "required": true,
-                        "schema": { "type": "enum" }
-                    },
-                    {
-                        "in": "query",
-                        "name": "endpoint_id",
-                        "required": true,
-                        "schema": { "type": "int" }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "$ref": "#/components/responses/200",
-                        "response": {
-                            "description": "Endpoint volume value",
-                            "type": "double"
-                        }
-                    },
-                    "400": { "$ref": "#/components/responses/400" }
-                }
-            }
-        },
         "/get_endpoint_info": {
             "description": "Retrieve endpoint information including its properties",
             "get": {
@@ -386,7 +319,7 @@
                     {
                         "in": "query",
                         "name": "endpoint_id",
-                        "required": false,
+                        "required": true,
                         "schema": { "type": "int" }
                     }
                 ],
@@ -396,8 +329,8 @@
                 }
             }
         },
-        "/set_property": {
-            "description": "Set endpoint property value",
+        "/property": {
+            "description": "Set/get endpoint property value",
             "get": {
                 "x-permissions": { "$ref": "#/components/x-permissions/endpointcontrol" },
                 "parameters": [
@@ -410,7 +343,7 @@
                     {
                         "in": "query",
                         "name": "endpoint_id",
-                        "required": false,
+                        "required": true,
                         "schema": { "type": "int" }
                     },
                     {
@@ -422,47 +355,12 @@
                     {
                         "in": "query",
                         "name": "value",
-                        "required": true,
-                        "schema": { "type": "string" }
-                    }
-                ],
-                "responses": {
-                    "200": { "$ref": "#/components/responses/200" },
-                    "400": { "$ref": "#/components/responses/400" }
-                }
-            }
-        },
-        "/get_property": {
-            "description": "Get endpoint property value",
-            "get": {
-                "parameters": [
-                    {
-                        "in": "query",
-                        "name": "endpoint_type",
-                        "required": true,
-                        "schema": { "type": "enum" }
-                    },
-                    {
-                        "in": "query",
-                        "name": "endpoint_id",
                         "required": false,
-                        "schema": { "type": "int" }
-                    },
-                    {
-                        "in": "query",
-                        "name": "property_name",
-                        "required": true,
                         "schema": { "type": "string" }
                     }
                 ],
                 "responses": {
-                    "200": {
-                        "$ref": "#/components/responses/200",
-                        "response": {
-                            "description": "Property value",
-                            "type": "double"
-                        }
-                    },
+                    "200": { "$ref": "#/components/responses/200" },
                     "400": { "$ref": "#/components/responses/400" }
                 }
             }
@@ -520,7 +418,7 @@
                 }
             }
         },
-        "/subscribe": {
+        "/event_subscription": {
             "description": "Subscribe to audio high level events",
             "get": {
                 "parameters": [
@@ -531,28 +429,12 @@
                         "schema": { "type": "array",
                         "items": { "type": "string" }
                         }
-                    }
-                ],
-                "responses": {
-                    "200": { "$ref": "#/components/responses/200" },
-                    "400": { "$ref": "#/components/responses/400" }
-                }
-            }
-        },
-        "/unsubscribe": {
-            "description": "Unubscribe to audio high level events",
-            "get": {
-                "parameters": [
+                    },
                     {
                         "in": "query",
-                        "name": "events",
+                        "name": "subscribe",
                         "required": true,
-                        "schema": {
-                            "type": "array",
-                            "items": {
-                                "type": "string"
-                            }
-                        }
+                        "schema": { "type": "int" }
                     }
                 ],
                 "responses": {
diff --git a/src/ahl-binding.c b/src/ahl-binding.c
index 264930f..01138c3 100644
--- a/src/ahl-binding.c
+++ b/src/ahl-binding.c
@@ -22,12 +22,12 @@
 #include "ahl-apidef.h" // Generated from JSON OpenAPI
 #include "wrap-json.h"
 #include "ahl-policy.h"
+#include "ahl-policyJSON.h"
 #include "ahl-policy-utils.h"
 
 // Global high-level binding context
 AHLCtxT g_AHLCtx; 
 
-// TODO: Helpers that could be common
 static EndpointTypeT EndpointTypeToEnum(char * in_pEndpointTypeStr)
 {
     if (in_pEndpointTypeStr == NULL) {
@@ -76,108 +76,6 @@ static StreamMuteT StreamMuteToEnum(char * in_pStreamMuteStr)
         return STREAM_MUTE_MAXVALUE;
 }
 
-static char * DeviceURITypeEnumToStr(DeviceURITypeT in_eDeviceURIType) {
-    switch(in_eDeviceURIType) {
-        case DEVICEURITYPE_ALSA_HW:  // Alsa hardware device URI
-            return AHL_DEVICEURITYPE_ALSA_HW;
-        case DEVICEURITYPE_ALSA_DMIX:    // Alsa Dmix device URI (only for playback devices)
-            return AHL_DEVICEURITYPE_ALSA_DMIX;
-        case DEVICEURITYPE_ALSA_DSNOOP:  // Alsa DSnoop device URI (only for capture devices)
-            return AHL_DEVICEURITYPE_ALSA_DSNOOP;
-        case DEVICEURITYPE_ALSA_SOFTVOL: // Alsa softvol device URI
-            return AHL_DEVICEURITYPE_ALSA_SOFTVOL;
-        case DEVICEURITYPE_ALSA_PLUG:    // Alsa plug device URI
-            return AHL_DEVICEURITYPE_ALSA_PLUG;
-        case DEVICEURITYPE_ALSA_OTHER:   // Alsa domain URI device of unspecified type
-            return AHL_DEVICEURITYPE_ALSA_OTHER;
-        case DEVICEURITYPE_NOT_ALSA:     // Unknown (not ALSA domain)
-            return AHL_DEVICEURITYPE_NOT_ALSA;
-        default:
-            return "Unknown";
-    }
-}
-
-static char * StreamStateEnumToStr(StreamStateT in_eStreamState) {
-    switch(in_eStreamState) {
-        case STREAM_STATE_IDLE:
-            return AHL_STREAM_STATE_IDLE;
-        case STREAM_STATE_RUNNING: 
-            return AHL_STREAM_STATE_RUNNING;
-        case STREAM_STATE_PAUSED: 
-            return AHL_STREAM_STATE_PAUSED;
-        default:
-            return "Unknown";
-    }
-}
-
-static char * StreamMuteEnumToStr(StreamMuteT in_eStreamMute) {
-    switch(in_eStreamMute) {
-        case STREAM_UNMUTED: 
-            return AHL_STREAM_UNMUTED;
-        case STREAM_MUTED: 
-            return AHL_STREAM_MUTED;
-        default:
-            return "Unknown";
-    }
-}
-
-static void AudioFormatStructToJSON(json_object **audioFormatJ, AudioFormatT * pAudioFormat)
-{
-    wrap_json_pack(audioFormatJ, "{s:i,s:i,s:i}",
-                    "sample_rate", pAudioFormat->sampleRate, 
-                    "num_channels", pAudioFormat->numChannels, 
-                    "sample_type", pAudioFormat->sampleType);
-}
-
-// Package only information that can useful to application clients when selecting endpoint
-static void EndpointInfoStructToJSON(json_object **endpointInfoJ, EndpointInfoT * pEndpointInfo)
-{
-    json_object *formatInfoJ = NULL;
-    wrap_json_pack(endpointInfoJ, "{s:i,s:s,s:s,s:s,s:s,s:s,s:s}",
-                    "endpoint_id", pEndpointInfo->endpointID, 
-                    "endpoint_type", (pEndpointInfo->type == ENDPOINTTYPE_SOURCE) ? AHL_ENDPOINTTYPE_SOURCE : AHL_ENDPOINTTYPE_SINK,
-                    "device_name", pEndpointInfo->gsDeviceName, 
-                    "display_name", pEndpointInfo->gsDisplayName,
-                    "audio_role", pEndpointInfo->pRoleName,
-                    "device_domain",pEndpointInfo->gsDeviceDomain,
-                    "device_uri_type", DeviceURITypeEnumToStr(pEndpointInfo->deviceURIType));
-    AudioFormatStructToJSON(&formatInfoJ,&pEndpointInfo->format);
-    json_object_object_add(*endpointInfoJ,"format",formatInfoJ);
-
-    // Properties
-    if (pEndpointInfo->pPropTable) {
-        json_object *pPropTableJ = json_object_new_array();
-        
-        GHashTableIter iter;
-        gpointer key, value;
-        g_hash_table_iter_init (&iter, pEndpointInfo->pPropTable);
-        while (g_hash_table_iter_next (&iter, &key, &value))
-        {
-            if((key!=NULL) && (value!=NULL))
-            {
-                json_object *pPropertyJ = NULL;
-                json_object_get((json_object*)value); // Don't let the framework free our object when the request is done
-                wrap_json_pack(&pPropertyJ, "{s:s,s:o}","property_name", (char*)key, "property_value", (json_object*)value);
-                json_object_array_add(pPropTableJ, pPropertyJ);
-            }
-        }
-        json_object_object_add(*endpointInfoJ,"properties",pPropTableJ);
-    }
-}
- 
-// Package only information that can useful to application clients when opening a stream
-static void StreamInfoStructToJSON(json_object **streamInfoJ, StreamInfoT * pStreamInfo)
-{
-    json_object *endpointInfoJ = NULL;
-    EndpointInfoStructToJSON(&endpointInfoJ,pStreamInfo->pEndpointInfo);
-    wrap_json_pack(streamInfoJ, "{s:i,s:s,s:s,s:s}", 
-        "stream_id", pStreamInfo->streamID,
-        "state", StreamStateEnumToStr(pStreamInfo->streamState),
-        "mute", StreamMuteEnumToStr(pStreamInfo->streamMute),   
-        "device_uri",pStreamInfo->pEndpointInfo->gsDeviceURI); // Need to open a stream to have access to the device URI
-    json_object_object_add(*streamInfoJ,"endpoint_info",endpointInfoJ);
-}
-
 static streamID_t CreateNewStreamID()
 {
     streamID_t newID = g_AHLCtx.nextStreamID;
@@ -209,32 +107,6 @@ static EndpointInfoT * GetEndpointInfoWithRole(endpointID_t in_endpointID, Endpo
     return pEndpointInfo;
 }
 
-static int ReplaceEndpointInfoWithRole(endpointID_t in_endpointID, EndpointTypeT in_endpointType, RoleInfoT * in_pRole, EndpointInfoT * in_pNewEndpoint)
-{
-    GPtrArray * pDeviceArray = NULL;
-    if (in_endpointType == ENDPOINTTYPE_SOURCE){
-        pDeviceArray = in_pRole->pSourceEndpoints;
-    }
-    else { 
-        pDeviceArray = in_pRole->pSinkEndpoints;
-    }
-    g_assert_nonnull(pDeviceArray);
-
-    for (int j = 0; j < pDeviceArray->len; j++) {
-        EndpointInfoT * pCurEndpointInfo = g_ptr_array_index(pDeviceArray,j);
-        g_assert_nonnull(pCurEndpointInfo);
-        if (pCurEndpointInfo->endpointID == in_endpointID) {            
-            g_ptr_array_insert(pDeviceArray,j,in_pNewEndpoint);
-            g_ptr_array_remove_index(pDeviceArray,j+1);
-            TermEndpointInfo(pCurEndpointInfo);
-            // GLib automatically frees item upon array removal
-            return AHL_SUCCESS;
-        }
-    }
-
-    return AHL_FAIL;
-}
-
 static EndpointInfoT * GetEndpointInfo(endpointID_t in_endpointID, EndpointTypeT in_endpointType)
 {
     EndpointInfoT * pEndpointInfo = NULL;
@@ -267,6 +139,80 @@ static RoleInfoT * GetRole(char * in_pAudioRoleName)
     return g_hash_table_lookup(g_AHLCtx.policyCtx.pRoleInfo,in_pAudioRoleName);
 }
 
+static int CloseStream(AHLClientCtxT * in_pClientCtx, streamID_t streamID,struct afb_req * pReq) {
+    // Call policy to verify whether creating a new audio stream is allowed in current context and possibly take other actions
+    StreamInfoT * pStreamInfo = GetStream(streamID);
+    if (pStreamInfo == NULL) {
+        AFB_ERROR("Specified stream not currently active stream_id -> %d",streamID);
+        return AHL_FAIL;
+    }
+
+#ifndef AHL_DISCONNECT_POLICY             
+    json_object *pPolicyStreamJ = NULL;
+    int err = StreamInfoToJSON(pStreamInfo, &pPolicyStreamJ);
+    if (err == AHL_POLICY_UTIL_FAIL)
+    {
+        AFB_ERROR("Audio policy violation, Unable to get JSON object for Policy_CloseStream");
+        return AHL_FAIL;
+    } 
+    int policyAllowed = Policy_CloseStream(pPolicyStreamJ);
+    if (policyAllowed == AHL_POLICY_REJECT)
+    {
+        AFB_ERROR("Close stream not allowed in current context");
+        return AHL_FAIL;
+    }
+#endif
+    // Unsubscribe client from stream events
+    if (pReq != NULL) {
+        char streamEventName[128];
+        snprintf(streamEventName,128,"ahl_streamstate_%d",streamID);
+        int iValid = afb_event_is_valid(pStreamInfo->streamStateEvent);
+        if (iValid) {
+            err = afb_req_unsubscribe(*pReq,pStreamInfo->streamStateEvent);
+            if (err) {
+                AFB_ERROR("Could not unsubscribe to stream specific state change event");
+                return AHL_FAIL;
+            }
+        }
+    }
+    
+    // Remove from stream list (if present)
+    if (g_AHLCtx.policyCtx.pStreams)
+        g_hash_table_remove(g_AHLCtx.policyCtx.pStreams,GINT_TO_POINTER(&pStreamInfo->streamID));
+    free(pStreamInfo);
+    pStreamInfo = NULL;
+
+    // Find index for cases where there are multiple streams per client
+    // Remove from client context stream ID and endpoint ID access rights
+    if (in_pClientCtx->pStreamAccessList) {
+        for (int i = 0; i < in_pClientCtx->pStreamAccessList->len ; i++) {
+            streamID_t iID = g_array_index(in_pClientCtx->pStreamAccessList,streamID_t,i);
+            if (iID == streamID) {
+                g_array_remove_index(in_pClientCtx->pStreamAccessList, i);
+            }    
+        }
+    }
+
+    return AHL_SUCCESS;
+}
+
+static int CloseAllClientStreams(AHLClientCtxT * in_pClientCtx, struct afb_req * pReq)
+{
+    g_assert_nonnull(in_pClientCtx);
+    if (in_pClientCtx->pStreamAccessList != NULL) {
+        while( in_pClientCtx->pStreamAccessList->len )
+        {
+            streamID_t streamID = g_array_index(in_pClientCtx->pStreamAccessList,streamID_t,0);
+            int err = CloseStream(in_pClientCtx,streamID,pReq);
+            if (err) {
+                return err;
+            }
+        }      
+    }
+
+    return AHL_SUCCESS;
+}
+
 static AHLClientCtxT * AllocateClientContext()
 {
     AHLClientCtxT * pClientCtx = malloc(sizeof(AHLClientCtxT));
@@ -278,35 +224,13 @@ static void TerminateClientContext(void * ptr)
 {
     AHLClientCtxT * pClientCtx = (AHLClientCtxT *) ptr;
     if (pClientCtx != NULL) {
-
-        // Avoid having policy in bad state if client loses WS connection (e.g. app termination without close stream)
-        // Force close streams in those cases.
- 
-        if (pClientCtx->pStreamAccessList != NULL) {
-#ifndef AHL_DISCONNECT_POLICY 
-            for (int i = 0; i < pClientCtx->pStreamAccessList->len; i++)
-            {
-                streamID_t streamID = g_array_index(pClientCtx->pStreamAccessList,streamID_t,i);
-                // Call policy to verify whether creating a new audio stream is allowed in current context and possibly take other actions
-                StreamInfoT * pStreamInfo = GetStream(streamID);
-                if (pStreamInfo == NULL) {
-                    AFB_ERROR("Specified stream not currently active stream_id -> %d",streamID);
-                    return;
-                }
-                
-                json_object *pPolicyStreamJ = NULL;
-                int err = PolicyStreamStructToJSON(pStreamInfo, &pPolicyStreamJ);
-                if (err == AHL_POLICY_UTIL_FAIL)
-                {
-                    AFB_ERROR("Audio policy violation, Unable to get JSON object for Policy_CloseStream");
-                    return;
-                } 
-                Policy_CloseStream(pPolicyStreamJ);
-            }  
-#endif
+        CloseAllClientStreams(pClientCtx,NULL);
+        
+        if (pClientCtx->pStreamAccessList) {
             g_array_free( pClientCtx->pStreamAccessList, TRUE);
             pClientCtx->pStreamAccessList = NULL;
         }
+
         free(pClientCtx);
     }
 }
@@ -441,8 +365,8 @@ PUBLIC int AhlBindingInit()
     // Register exit function
     atexit(AhlBindingTerm);
 
-    //Create AGL Events
-    err=CreateEvents();
+    // Create AGL Events
+    err = CreateEvents();
     if(err)
     {
         //Error messages already reported inside CreateEvents
@@ -479,50 +403,62 @@ PUBLIC int AhlBindingInit()
             for (int j = 0; j < pRoleInfo->pSourceEndpoints->len; j++) {
                 EndpointInfoT * pCurEndpointInfo = g_ptr_array_index(pRoleInfo->pSourceEndpoints,j);
                 g_assert_nonnull(pCurEndpointInfo);
-                json_object *pPolicyEndpointJ = NULL;
-                err = PolicyEndpointStructToJSON(pCurEndpointInfo, &pPolicyEndpointJ);
-                if (err == AHL_POLICY_UTIL_FAIL)
-                {
+                json_object *pInPolicyEndpointJ = NULL;                       
+                err = EndpointInfoToJSON(pCurEndpointInfo, &pInPolicyEndpointJ);
+                if (err) {
                     AFB_ERROR("Unable to Create Endpoint Json object error:%s ",wrap_json_get_error_string(err));
-                    return err;    
+                    return AHL_FAIL;    
                 }
                 else
                 {
-                    err = Policy_Endpoint_Init(pPolicyEndpointJ);
+                    json_object * pOutPolicyEndpointJ = NULL; 
+                    err = Policy_Endpoint_Init(pInPolicyEndpointJ,&pOutPolicyEndpointJ);
                     if (err == AHL_POLICY_REJECT) {
-                        AFB_ERROR("Policy endpoint properties initalization failed for endpoint_id :%d type:%d",pCurEndpointInfo->endpointID, pCurEndpointInfo->type);
-                    }                    
-                    //free pPolicyEndpointJ
-                    json_object_put(pPolicyEndpointJ);
-                }                                 
+                        AFB_WARNING("Policy endpoint properties initalization failed for endpoint_id :%d type:%d",pCurEndpointInfo->endpointID, pCurEndpointInfo->type);                        
+                    }   
+                    json_object_put(pInPolicyEndpointJ);                 
+                    
+                    err = UpdateEndpointInfo(pCurEndpointInfo,pOutPolicyEndpointJ);
+                    if (err) {
+                        AFB_ERROR("Policy endpoint properties update failed for endpoint_id :%d type:%d",pCurEndpointInfo->endpointID, pCurEndpointInfo->type);                        
+                        return AHL_FAIL;
+                    }
+                    //json_object_put(pOutPolicyEndpointJ);  
+                }
             }
         }
+
         if (pRoleInfo->pSinkEndpoints){
             // for all sink endpoints
             for (int j = 0; j < pRoleInfo->pSinkEndpoints->len; j++) {
                 EndpointInfoT * pCurEndpointInfo = g_ptr_array_index(pRoleInfo->pSinkEndpoints,j);
                 g_assert_nonnull(pCurEndpointInfo);
-                json_object *pPolicyEndpointJ = NULL;
-                err = PolicyEndpointStructToJSON(pCurEndpointInfo, &pPolicyEndpointJ);
-                if (err == AHL_POLICY_UTIL_FAIL)
-                {
+                json_object *pInPolicyEndpointJ = NULL;      
+                err = EndpointInfoToJSON(pCurEndpointInfo, &pInPolicyEndpointJ);
+                if (err) {
                     AFB_ERROR("Unable to Create Endpoint Json object error:%s ",wrap_json_get_error_string(err));
-                    return err;
+                    return AHL_FAIL;
                 }
                 else
                 {
-                    err = Policy_Endpoint_Init(pPolicyEndpointJ);
-                    if (err== AHL_POLICY_REJECT) {
-                        AFB_ERROR("Policy endpoint properties initalization failed for endpoint_id :%d type:%d",pCurEndpointInfo->endpointID, pCurEndpointInfo->type);                        
+                    json_object *pOutPolicyEndpointJ = NULL;  
+                    err = Policy_Endpoint_Init(pInPolicyEndpointJ,&pOutPolicyEndpointJ);
+                    if (err == AHL_POLICY_REJECT) {
+                        AFB_WARNING("Policy endpoint properties initalization failed for endpoint_id :%d type:%d",pCurEndpointInfo->endpointID, pCurEndpointInfo->type);                        
+                        //return AHL_FAIL;
                     }
-                    //free pPolicyEndpointJ
-                    json_object_put(pPolicyEndpointJ);
-                } 
-
+                    json_object_put(pInPolicyEndpointJ);
+                    err = UpdateEndpointInfo(pCurEndpointInfo,pOutPolicyEndpointJ);
+                    if (err) {
+                        AFB_ERROR("Policy endpoint properties update failed for endpoint_id :%d type:%d",pCurEndpointInfo->endpointID, pCurEndpointInfo->type);                        
+                        return AHL_FAIL;
+                    }
+                    //json_object_put(pOutPolicyEndpointJ);  
+                }
             }
         }
     }    
-#endif   
+#endif // AHL_DISCONNECT_POLICY
 
     // Initialize list of active streams
     g_AHLCtx.policyCtx.pStreams = g_hash_table_new(g_int_hash, g_int_equal);
@@ -532,8 +468,6 @@ PUBLIC int AhlBindingInit()
         return err;
     }
 
-    // TODO: Use AGL persistence framework to retrieve and set initial volumes/properties
-
     AFB_DEBUG("Audio high-level Binding success");
     return err;
 }
@@ -550,21 +484,22 @@ PUBLIC void AhlOnEvent(const char *evtname, json_object *eventJ)
 #endif
 }
 
-PUBLIC void audiohlapi_get_sources(struct afb_req req)
+PUBLIC void audiohlapi_get_endpoints(struct afb_req req)
 {
     json_object *devicesJ = NULL;
     json_object *deviceJ = NULL;
     json_object *queryJ = NULL;
     char * audioRole = NULL;
+    char * pEndpointTypeStr = NULL;
+    EndpointTypeT endpointType = ENDPOINTTYPE_MAXVALUE;
 
     queryJ = afb_req_json(req);
-    int err = wrap_json_unpack(queryJ, "{s:s}", "audio_role", &audioRole);
+    int err = wrap_json_unpack(queryJ, "{s:s,s:s}", "audio_role", &audioRole,"endpoint_type",&pEndpointTypeStr);
     if (err) {
         afb_req_fail_f(req, "Invalid arguments", "Args not a valid json object query=%s", json_object_get_string(queryJ));
         return;
     }
-
-    AFB_DEBUG("Filtering devices according to specified audio role=%s", audioRole);
+    endpointType = EndpointTypeToEnum(pEndpointTypeStr);
 
     RoleInfoT * pRole = GetRole(audioRole);
     if ( pRole == NULL )
@@ -575,61 +510,25 @@ PUBLIC void audiohlapi_get_sources(struct afb_req req)
     else
     {
         devicesJ = json_object_new_array();
-        GPtrArray * pDeviceArray = pRole->pSourceEndpoints;
+        GPtrArray * pDeviceArray = NULL;
+        if (endpointType == ENDPOINTTYPE_SOURCE)
+            pDeviceArray = pRole->pSourceEndpoints;
+        else
+            pDeviceArray = pRole->pSinkEndpoints;
         if (pDeviceArray) {
             int iNumberDevices = pDeviceArray->len;
             for ( int j = 0 ; j < iNumberDevices; j++)
             {
                 EndpointInfoT * pEndpointInfo = g_ptr_array_index(pDeviceArray,j);
                 if (pEndpointInfo) {
-                    EndpointInfoStructToJSON(&deviceJ, pEndpointInfo);
+                    JSONPublicPackageEndpoint(pEndpointInfo,&deviceJ);
                     json_object_array_add(devicesJ, deviceJ);
                 }
             }
         }
     } 
 
-    afb_req_success(req, devicesJ, "List of sources");
-}
-
-PUBLIC void audiohlapi_get_sinks(struct afb_req req)
-{
-    json_object *devicesJ = NULL;
-    json_object *deviceJ = NULL;
-    json_object *queryJ = NULL;
-    char * audioRole = NULL;
-
-    queryJ = afb_req_json(req);
-    int err = wrap_json_unpack(queryJ, "{s:s}", "audio_role", &audioRole);
-    if (err) {
-        afb_req_fail_f(req, "Invalid arguments", "Args not a valid json object query=%s", json_object_get_string(queryJ));
-        return;
-    }
-
-    AFB_DEBUG("Filtering devices according to specified audio role=%s", audioRole);
-
-    RoleInfoT * pRole = GetRole(audioRole);
-    if ( pRole == NULL )
-    {
-        afb_req_fail_f(req, "Invalid arguments", "Requested audio role does not exist in current configuration -> %s", json_object_get_string(queryJ));
-        return;
-    }
-    else
-    {
-        devicesJ = json_object_new_array();
-        GPtrArray * pDeviceArray = pRole->pSinkEndpoints;
-        if (pDeviceArray) {
-            int iNumberDevices = pDeviceArray->len;
-            for ( int j = 0 ; j < iNumberDevices; j++)
-            {
-                EndpointInfoT * pEndpointInfo = g_ptr_array_index(pDeviceArray,j);
-                EndpointInfoStructToJSON(&deviceJ, pEndpointInfo);
-                json_object_array_add(devicesJ, deviceJ);
-            }
-        }
-    } 
-
-    afb_req_success(req, devicesJ, "List of sinks");
+    afb_req_success(req, devicesJ, "List of endpoints");
 }
 
 PUBLIC void audiohlapi_stream_open(struct afb_req req)
@@ -650,7 +549,6 @@ PUBLIC void audiohlapi_stream_open(struct afb_req req)
         afb_req_fail_f(req, "Invalid arguments", "Args not a valid json object query=%s", json_object_get_string(queryJ));
         return;
     }
-    AFB_DEBUG("Parsed input arguments = audio_role:%s endpoint_type:%s endpoint_id:%d", audioRole,endpointTypeStr,endpointID);
     endpointType = EndpointTypeToEnum(endpointTypeStr);
 
     // Check if there is already an existing context for this client
@@ -699,7 +597,6 @@ PUBLIC void audiohlapi_stream_open(struct afb_req req)
             }
             pEndpointInfo = NULL;
         }
-
     }
 
     if (pEndpointInfo == NULL) {
@@ -724,8 +621,8 @@ PUBLIC void audiohlapi_stream_open(struct afb_req req)
 #ifndef AHL_DISCONNECT_POLICY  
     // Call policy to verify whether creating a new audio stream is allowed in current context and possibly take other actions
     json_object *pPolicyStreamJ = NULL;
-    err = PolicyStreamStructToJSON(pStreamInfo, &pPolicyStreamJ);
-    if (err == AHL_POLICY_UTIL_FAIL)
+    err = StreamInfoToJSON(pStreamInfo,&pPolicyStreamJ);
+    if (err)
     {
         afb_req_fail(req, "Audio policy violation", "Unable to get JSON object for Policy_OpenStream");
         return;
@@ -762,7 +659,7 @@ PUBLIC void audiohlapi_stream_open(struct afb_req req)
     if (g_AHLCtx.policyCtx.pStreams)
         g_hash_table_insert( g_AHLCtx.policyCtx.pStreams, GINT_TO_POINTER(&pStreamInfo->streamID), pStreamInfo );
 
-    StreamInfoStructToJSON(&streamInfoJ,pStreamInfo);
+    JSONPublicPackageStream(pStreamInfo,&streamInfoJ);
 
     afb_req_success(req, streamInfoJ, "Stream info structure");
 }
@@ -773,19 +670,11 @@ PUBLIC void audiohlapi_stream_close(struct afb_req req)
     streamID_t streamID = AHL_UNDEFINED;
     
     queryJ = afb_req_json(req);
-    int err = wrap_json_unpack(queryJ, "{s:i}", "stream_id", &streamID);
+    int err = wrap_json_unpack(queryJ, "{s?i}", "stream_id", &streamID);
     if (err) {
         afb_req_fail_f(req, "Invalid arguments", "Args not a valid json object query=%s", json_object_get_string(queryJ));
         return;
     }
-    AFB_DEBUG("Parsed input arguments = stream_id:%d", streamID);
-
-    
-    StreamInfoT * pStreamInfo = GetStream(streamID);
-    if (pStreamInfo == NULL) {
-        afb_req_fail_f(req, "Stream not found", "Specified stream not currently active stream_id -> %d",streamID);
-        return;
-    }
 
     // Check if there is already an existing context for this client
     AHLClientCtxT * pClientCtx = afb_req_context_get(req); // Retrieve client-specific data structure
@@ -795,150 +684,108 @@ PUBLIC void audiohlapi_stream_close(struct afb_req req)
         return;
     }
 
-    // Verify that this client can control the stream
-    int iStreamAccessControl = CheckStreamAccessControl( pClientCtx, streamID );
-    if (iStreamAccessControl == AHL_ACCESS_CONTROL_DENIED)
-    {
-        afb_req_fail(req, "Access control denied", "Close stream not allowed in current client context");
-        return;
-    }
-
-#ifndef AHL_DISCONNECT_POLICY  
-    json_object *pPolicyStreamJ = NULL;
-    err = PolicyStreamStructToJSON(pStreamInfo, &pPolicyStreamJ);
-    if (err == AHL_POLICY_UTIL_FAIL)
-    {
-        afb_req_fail(req, "Audio policy violation", "Unable to get JSON object for Policy_CloseStream");
-        return;
-    } 
-    // Call policy to verify whether creating a new audio stream is allowed in current context and possibly take other actions
-    int policyAllowed = Policy_CloseStream(pPolicyStreamJ);
-    if (policyAllowed == AHL_POLICY_REJECT)
-    {
-        afb_req_fail(req, "Audio policy violation", "Close stream not allowed in current context");
-        return;
-    }
-#endif
-
-    // Unsubscribe client from stream events
-    char streamEventName[128];
-    snprintf(streamEventName,128,"ahl_streamstate_%d",streamID);
-    int iValid = afb_event_is_valid(pStreamInfo->streamStateEvent);
-    if (iValid) {
-        err = afb_req_unsubscribe(req,pStreamInfo->streamStateEvent);
+    if (streamID == AHL_UNDEFINED) {
+        err = CloseAllClientStreams(pClientCtx,&req);
         if (err) {
-            afb_req_fail(req, "Stream event subscription failure", "Could not unsubscribe to stream specific state change event");
+            afb_req_fail(req, "Error closing streams", "Streams cannot close");
             return;
         }
     }
-
-    // Remove from stream list (if present)
-    if (g_AHLCtx.policyCtx.pStreams)
-        g_hash_table_remove(g_AHLCtx.policyCtx.pStreams,GINT_TO_POINTER(&pStreamInfo->streamID));
-    free(pStreamInfo);
-    pStreamInfo = NULL;
-
-    // Find index for cases where there are multiple streams per client
-    // Remove from client context stream ID and endpoint ID access rights
-    if (pClientCtx->pStreamAccessList) {
-        for (int i = 0; i < pClientCtx->pStreamAccessList->len ; i++) {
-            streamID_t iID = g_array_index(pClientCtx->pStreamAccessList,streamID_t,i);
-            if (iID == streamID) {
-                g_array_remove_index(pClientCtx->pStreamAccessList, i);
-            }    
-        }
-
-        if (pClientCtx->pStreamAccessList->len == 0) {
-            // If no more streams/endpoints owner, clear session
-            afb_req_context_clear(req);
+    else {
+        err = CloseStream(pClientCtx,streamID,&req);
+        if (err) {
+            afb_req_fail_f(req, "Error closing stream", "Specified stream cannot close stream_id -> %d",streamID);
+            return;
         }
     }
-
+    
     afb_req_success(req, NULL, "Stream close completed");
 }
 
- PUBLIC void audiohlapi_set_stream_state(struct afb_req req)
- {
-    json_object *queryJ = NULL;
-    streamID_t streamID = AHL_UNDEFINED;
-    char * streamStateStr = NULL;
-    
-    queryJ = afb_req_json(req);
-    int err = wrap_json_unpack(queryJ, "{s:i,s:s}", "stream_id", &streamID,"state",&streamStateStr);
-    if (err) {
-        afb_req_fail_f(req, "Invalid arguments", "Args not a valid json object query=%s", json_object_get_string(queryJ));
-        return;
-    }
-    AFB_DEBUG("Parsed input arguments = stream_id:%d, state:%s", streamID,streamStateStr);
-    
+static int SetStreamState(AHLClientCtxT * in_pClientCtx,struct afb_req * pReq, streamID_t streamID, char * pStreamStateStr, char * pMuteStr) {
+
     StreamInfoT * pStreamInfo = GetStream(streamID);
     if (pStreamInfo == NULL) {
-        afb_req_fail_f(req, "Stream not found", "Specified stream not found stream_id -> %d",streamID);
-        return;
-    }
-
-    // Check if there is already an existing context for this client
-    AHLClientCtxT * pClientCtx = afb_req_context_get(req); // Retrieve client-specific data structure
-    if (pClientCtx == NULL)
-    {
-        afb_req_fail(req, "Bad state", "No client context associated with the request (is there an opened stream by this client?)");
-        return;
+        afb_req_fail_f(*pReq, "Stream not found", "Specified stream not found stream_id -> %d",streamID);
+        return AHL_FAIL;
     }
 
     // Verify that this client can control the stream
-    int iStreamAccessControl = CheckStreamAccessControl( pClientCtx, streamID );
+    int iStreamAccessControl = CheckStreamAccessControl( in_pClientCtx, streamID );
     if (iStreamAccessControl == AHL_ACCESS_CONTROL_DENIED)
     {
-        afb_req_fail(req, "Access control denied", "Set stream state not allowed in current client context");
-        return;
+        afb_req_fail(*pReq, "Access control denied", "Set stream state not allowed in current client context");
+        return AHL_FAIL;
     }
 
-    StreamStateT streamState = StreamStateToEnum(streamStateStr);
+    if (pStreamStateStr != NULL) {
+        StreamStateT streamState = StreamStateToEnum(pStreamStateStr);
 #ifndef AHL_DISCONNECT_POLICY  
-    json_object *pPolicyStreamJ = NULL;
-    err = PolicyStreamStructToJSON(pStreamInfo, &pPolicyStreamJ);
-    if (err == AHL_POLICY_UTIL_FAIL)
-    {
-        afb_req_fail(req, "Audio policy violation", "Unable to get JSON object for Policy_SetStreamState");
-        return;
-    } 
+        json_object *pPolicyStreamJ = NULL;
+        int err = StreamInfoToJSON(pStreamInfo, &pPolicyStreamJ);
+        if (err == AHL_POLICY_UTIL_FAIL)
+        {
+            afb_req_fail(*pReq, "Audio policy violation", "Unable to get JSON object for Policy_SetStreamState");
+            return AHL_FAIL;
+        } 
+    
+        json_object *paramJ= json_object_new_int(streamState);
+        json_object_object_add(pPolicyStreamJ, "arg_stream_state", paramJ);
+    
+        int policyAllowed = Policy_SetStreamState(pPolicyStreamJ);    
+        if (policyAllowed == AHL_POLICY_REJECT)
+        {
+            afb_req_fail(*pReq, "Audio policy violation", "Change stream state not allowed in current context");
+            return AHL_FAIL; 
+        }
+#else
+        // Simulate that policy returns target state (accepted)
+        pStreamInfo->streamState = streamState;
+#endif
+    }
 
-    json_object *paramJ= json_object_new_int(streamState);
-    json_object_object_add(pPolicyStreamJ, "arg_stream_state", paramJ);
+    if (pMuteStr != NULL) {
+        StreamMuteT muteState = StreamMuteToEnum(pMuteStr);
+#ifndef AHL_DISCONNECT_POLICY 
+        json_object *pPolicyStreamJ = NULL;
+        int err = StreamInfoToJSON(pStreamInfo, &pPolicyStreamJ);
+        if (err == AHL_POLICY_UTIL_FAIL)
+        {
+            afb_req_fail((*pReq), "Audio policy violation", "Unable to get JSON object for Policy_SetStreamMute");
+            return AHL_FAIL;
+        } 
 
-    int policyAllowed = Policy_SetStreamState(pPolicyStreamJ);    
-    if (policyAllowed == AHL_POLICY_REJECT)
-    {
-        afb_req_fail(req, "Audio policy violation", "Change stream state not allowed in current context");
-        return; 
-    }
+        json_object *paramJ= json_object_new_int(muteState);
+        json_object_object_add(pPolicyStreamJ, "mute_state", paramJ);
+
+        int policyAllowed = Policy_SetStreamMute(pPolicyStreamJ);    
+        if (policyAllowed == AHL_POLICY_REJECT)
+        {
+            afb_req_fail(*pReq, "Audio policy violation", "Mute stream not allowed in current context");
+            return AHL_FAIL;
+        }
 #else
-    // Simulate that policy returns target state (accepted)
-    pStreamInfo->streamState = streamState;
+        // Simulate that policy returns target state (accepted)
+        pStreamInfo->streamMute = muteState;
 #endif
+    }
 
-    afb_req_success(req, NULL, "Set stream state");
- }
+    return AHL_SUCCESS;
+}
 
- PUBLIC void audiohlapi_set_stream_mute(struct afb_req req)
+ PUBLIC void audiohlapi_set_stream_state(struct afb_req req)
  {
     json_object *queryJ = NULL;
     streamID_t streamID = AHL_UNDEFINED;
+    char * streamStateStr = NULL;
     char * pMuteStr = NULL;
     
     queryJ = afb_req_json(req);
-    int err = wrap_json_unpack(queryJ, "{s:i,s:s}", "stream_id", &streamID,"mute",&pMuteStr);
+    int err = wrap_json_unpack(queryJ, "{s?i,s?s,s?s}", "stream_id", &streamID,"state",&streamStateStr,"mute",&pMuteStr);
     if (err) {
         afb_req_fail_f(req, "Invalid arguments", "Args not a valid json object query=%s", json_object_get_string(queryJ));
         return;
     }
-    AFB_DEBUG("Parsed input arguments = stream_id:%d, mute:%s", streamID,pMuteStr);
-
-    StreamInfoT * pStreamInfo = GetStream(streamID);
-    if (pStreamInfo == NULL) {
-        afb_req_fail_f(req, "Stream not found", "Specified stream not currently active stream_id -> %d",streamID);
-        return;
-    }
 
     // Check if there is already an existing context for this client
     AHLClientCtxT * pClientCtx = afb_req_context_get(req); // Retrieve client-specific data structure
@@ -948,40 +795,27 @@ PUBLIC void audiohlapi_stream_close(struct afb_req req)
         return;
     }
 
-    // Verify that this client can control the stream
-    int iStreamAccessControl = CheckStreamAccessControl( pClientCtx, streamID );
-    if (iStreamAccessControl == AHL_ACCESS_CONTROL_DENIED)
-    {
-        afb_req_fail(req, "Access control denied", "Set stream mute state not allowed in current client context");
-        return;
+    if (streamID == AHL_UNDEFINED) {
+        // All stream for this client
+        if (pClientCtx->pStreamAccessList != NULL) {
+            for (int i = 0; i < pClientCtx->pStreamAccessList->len; i++)
+            {
+                streamID_t curStreamID = g_array_index(pClientCtx->pStreamAccessList,streamID_t,i);
+                err = SetStreamState(pClientCtx,&req,curStreamID,streamStateStr,pMuteStr);
+                if (err) {
+                    return;
+                }
+            }      
+        }
     }
-
-
-    StreamMuteT muteState = StreamMuteToEnum(pMuteStr);
-#ifndef AHL_DISCONNECT_POLICY 
-    json_object *pPolicyStreamJ = NULL;
-    err = PolicyStreamStructToJSON(pStreamInfo, &pPolicyStreamJ);
-    if (err == AHL_POLICY_UTIL_FAIL)
-    {
-        afb_req_fail(req, "Audio policy violation", "Unable to get JSON object for Policy_SetStreamMute");
-        return;
-    } 
-
-    json_object *paramJ= json_object_new_int(muteState);
-    json_object_object_add(pPolicyStreamJ, "mute_state", paramJ);
-
-    int policyAllowed = Policy_SetStreamMute(pPolicyStreamJ);    
-    if (policyAllowed == AHL_POLICY_REJECT)
-    {
-        afb_req_fail(req, "Audio policy violation", "Mute stream not allowed in current context");
-        return;
+    else {
+        err = SetStreamState(pClientCtx,&req,streamID,streamStateStr,pMuteStr);
+        if (err) {
+            return;
+        }
     }
-#else
-    // Simulate that policy returns target state (accepted)
-    pStreamInfo->streamMute = muteState;
-#endif
 
-    afb_req_success(req, NULL, "Set stream mute completed");
+    afb_req_success(req, NULL, "Set stream state");
  }
 
  PUBLIC void audiohlapi_get_stream_info(struct afb_req req)
@@ -996,7 +830,6 @@ PUBLIC void audiohlapi_stream_close(struct afb_req req)
         afb_req_fail_f(req, "Invalid arguments", "Args not a valid json object query=%s", json_object_get_string(queryJ));
         return;
     }
-    AFB_DEBUG("Parsed input arguments = stream_id:%d", streamID);
 
     StreamInfoT * pStreamInfo = GetStream(streamID);
     if (pStreamInfo == NULL) {
@@ -1004,12 +837,12 @@ PUBLIC void audiohlapi_stream_close(struct afb_req req)
         return;
     }
 
-    StreamInfoStructToJSON(&streamInfoJ,pStreamInfo);
+    JSONPublicPackageStream(pStreamInfo,&streamInfoJ);
 
     afb_req_success(req, streamInfoJ, "Get stream info completed");
  }
 
-PUBLIC void audiohlapi_set_volume(struct afb_req req)
+PUBLIC void audiohlapi_volume(struct afb_req req)
 {
     json_object *queryJ = NULL;
     endpointID_t endpointID = AHL_UNDEFINED;
@@ -1018,12 +851,11 @@ PUBLIC void audiohlapi_set_volume(struct afb_req req)
     char * volumeStr = NULL;
     
     queryJ = afb_req_json(req);
-    int err = wrap_json_unpack(queryJ, "{s:s,s:i,s:s}", "endpoint_type", &pEndpointTypeStr,"endpoint_id",&endpointID,"volume",&volumeStr);
+    int err = wrap_json_unpack(queryJ, "{s:s,s:i,s?s}", "endpoint_type", &pEndpointTypeStr,"endpoint_id",&endpointID,"volume",&volumeStr);
     if (err) {
         afb_req_fail_f(req, "Invalid arguments", "Args not a valid json object query=%s", json_object_get_string(queryJ));
         return;
     }
-    AFB_DEBUG("Parsed input arguments = endpoint_type:%s endpoint_id:%d volume:%s", pEndpointTypeStr,endpointID,volumeStr);
     endpointType = EndpointTypeToEnum(pEndpointTypeStr);
 
     EndpointInfoT * pEndpointInfo = GetEndpointInfo(endpointID,endpointType);
@@ -1033,62 +865,36 @@ PUBLIC void audiohlapi_set_volume(struct afb_req req)
         return;
     }
 
+    if (volumeStr != NULL) {
 #ifndef AHL_DISCONNECT_POLICY
-    json_object *pPolicyEndpointJ = NULL;
-    err = PolicyEndpointStructToJSON(pEndpointInfo, &pPolicyEndpointJ);
-    if (err == AHL_POLICY_UTIL_FAIL)
-    {
-        afb_req_fail(req, "Audio policy violation", "Unable to get JSON object for Policy_SetVolume");
-        return;
-    } 
+        json_object *pPolicyEndpointJ = NULL;
+        err = EndpointInfoToJSON(pEndpointInfo, &pPolicyEndpointJ);
+        if (err == AHL_POLICY_UTIL_FAIL)
+        {
+            afb_req_fail(req, "Audio policy violation", "Unable to get JSON object for Policy_SetVolume");
+            return;
+        } 
 
-    json_object *paramJ= json_object_new_string(volumeStr);
-    json_object_object_add(pPolicyEndpointJ, "arg_volume", paramJ);
+        json_object *paramJ= json_object_new_string(volumeStr);
+        json_object_object_add(pPolicyEndpointJ, "arg_volume", paramJ);
 
-    int policyAllowed = Policy_SetVolume(pPolicyEndpointJ);
-    if (!policyAllowed)
-    {
-        afb_req_fail(req, "Audio policy violation", "Set volume not allowed in current context");
-        return;
-    }
+        int policyAllowed = Policy_SetVolume(pPolicyEndpointJ);
+        if (!policyAllowed)
+        {
+            afb_req_fail(req, "Audio policy violation", "Set volume not allowed in current context");
+            return;
+        }
 #else
-    // Simulate that policy returns target state (accepted)
-    pEndpointInfo->iVolume = atoi(volumeStr);
+        // Simulate that policy returns target state (accepted)
+        pEndpointInfo->iVolume = atoi(volumeStr);
 #endif
- 
-    afb_req_success(req, NULL, "Set volume completed");
-}
-
-PUBLIC void audiohlapi_get_volume(struct afb_req req)
-{
-    json_object *queryJ = NULL;
-    endpointID_t endpointID = AHL_UNDEFINED;
-    char * pEndpointTypeStr = NULL;
-    EndpointTypeT endpointType = ENDPOINTTYPE_MAXVALUE;
-    json_object * volumeJ = NULL;
-    
-    queryJ = afb_req_json(req);
-    int err = wrap_json_unpack(queryJ, "{s:s,s:i}", "endpoint_type", &pEndpointTypeStr,"endpoint_id",&endpointID);
-    if (err) {
-        afb_req_fail_f(req, "Invalid arguments", "Args not a valid json object query=%s", json_object_get_string(queryJ));
-        return;
-    }
-    AFB_DEBUG("Parsed input arguments = endpoint_type:%s endpoint_id:%d", pEndpointTypeStr,endpointID);
-    endpointType = EndpointTypeToEnum(pEndpointTypeStr);
-
-    EndpointInfoT * pEndpointInfo = GetEndpointInfo(endpointID,endpointType);
-    if (pEndpointInfo == NULL)
-    {
-        afb_req_fail_f(req, "Endpoint not found", "Endpoint information not found for id:%d type%d",endpointID,endpointType);
-        return;
     }
 
-    volumeJ = json_object_new_int(pEndpointInfo->iVolume);
-
-    afb_req_success(req, volumeJ, "Retrieved volume value");
+    json_object * volumeJ = json_object_new_int(pEndpointInfo->iVolume);
+ 
+    afb_req_success(req, volumeJ, "Set/get volume completed");
 }
 
-// Properties 
 PUBLIC void audiohlapi_get_endpoint_info(struct afb_req req)
 {
     json_object *queryJ = NULL;
@@ -1102,7 +908,6 @@ PUBLIC void audiohlapi_get_endpoint_info(struct afb_req req)
         afb_req_fail_f(req, "Invalid arguments", "Args not a valid json object query=%s", json_object_get_string(queryJ));
         return;
     }
-    AFB_DEBUG("Parsed input arguments = endpoint_type:%s endpoint_id:%d", pEndpointTypeStr,endpointID);
     endpointType = EndpointTypeToEnum(pEndpointTypeStr);
 
     EndpointInfoT * pEndpointInfo = GetEndpointInfo(endpointID,endpointType);
@@ -1113,12 +918,12 @@ PUBLIC void audiohlapi_get_endpoint_info(struct afb_req req)
     }
 
     json_object *endpointInfoJ = NULL;
-    EndpointInfoStructToJSON(&endpointInfoJ,pEndpointInfo);
+    EndpointInfoToJSON(pEndpointInfo,&endpointInfoJ);
 
     afb_req_success(req, endpointInfoJ, "Retrieved endpoint information and properties");
 }
 
-PUBLIC void audiohlapi_set_property(struct afb_req req)
+PUBLIC void audiohlapi_property(struct afb_req req)
 {
     json_object *queryJ = NULL;
     endpointID_t endpointID = AHL_UNDEFINED;
@@ -1128,12 +933,11 @@ PUBLIC void audiohlapi_set_property(struct afb_req req)
     json_object * propValueJ = NULL;
     
     queryJ = afb_req_json(req);
-    int err = wrap_json_unpack(queryJ, "{s:s,s:i,s:s,s:o}", "endpoint_type", &pEndpointTypeStr,"endpoint_id",&endpointID,"property_name",&propertyName,"value",&propValueJ);
+    int err = wrap_json_unpack(queryJ, "{s:s,s:i,s:s,s?o}", "endpoint_type", &pEndpointTypeStr,"endpoint_id",&endpointID,"property_name",&propertyName,"value",&propValueJ);
     if (err) {
         afb_req_fail_f(req, "Invalid arguments", "Args not a valid json object query=%s", json_object_get_string(queryJ));
         return;
     }
-    AFB_DEBUG("Parsed input arguments = endpoint_type:%s endpoint_id:%d property_name:%s", pEndpointTypeStr,endpointID,propertyName);
     endpointType = EndpointTypeToEnum(pEndpointTypeStr);
 
     EndpointInfoT * pEndpointInfo = GetEndpointInfo(endpointID,endpointType);
@@ -1143,59 +947,32 @@ PUBLIC void audiohlapi_set_property(struct afb_req req)
         return;
     }
 
-#ifndef AHL_DISCONNECT_POLICY  
-    json_object *pPolicyEndpointJ = NULL;
-    err = PolicyEndpointStructToJSON(pEndpointInfo, &pPolicyEndpointJ);
-    if (err == AHL_POLICY_UTIL_FAIL)
-    {
-        afb_req_fail(req, "Audio policy violation", "Unable to get JSON object for Policy_SetVolume");
-        return;
-    } 
-
-    json_object *paramJ= json_object_new_string(propertyName);
-    json_object_object_add(pPolicyEndpointJ, "arg_property_name", paramJ);
-    json_object_object_add(pPolicyEndpointJ, "arg_property_value", propValueJ);
-
-    // Call policy to allow custom policy actions in current context
-    int policyAllowed = Policy_SetProperty(pPolicyEndpointJ);     
-    if (!policyAllowed)
-    {
-        afb_req_fail(req, "Audio policy violation", "Set endpoint property not allowed in current context");
-        return;
-    }
-#else
-    // Simulate that policy returns target state (accepted)
-    if (pEndpointInfo->pPropTable)
-        g_hash_table_insert(pEndpointInfo->pPropTable, propertyName, propValueJ);
-#endif
-
-    //afb_event_push(g_AHLCtx.policyCtx.propertyEvent,queryJ);
-
-    afb_req_success(req, NULL, "Set property completed");
-}
+    if (propValueJ != NULL) {
+    #ifndef AHL_DISCONNECT_POLICY  
+        json_object *pPolicyEndpointJ = NULL;
+        err = EndpointInfoToJSON(pEndpointInfo, &pPolicyEndpointJ);
+        if (err == AHL_POLICY_UTIL_FAIL)
+        {
+            afb_req_fail(req, "Audio policy violation", "Unable to get JSON object for Policy_SetVolume");
+            return;
+        } 
 
-PUBLIC void audiohlapi_get_property(struct afb_req req)
-{
-    json_object *queryJ = NULL;
-    endpointID_t endpointID = AHL_UNDEFINED;
-    char * pEndpointTypeStr = NULL;
-    EndpointTypeT endpointType = ENDPOINTTYPE_MAXVALUE;
-    char * propertyName = NULL;
-    
-    queryJ = afb_req_json(req);
-    int err = wrap_json_unpack(queryJ, "{s:s,s:i,s:s}", "endpoint_type", &pEndpointTypeStr,"endpoint_id",&endpointID,"property_name",&propertyName);
-    if (err) {
-        afb_req_fail_f(req, "Invalid arguments", "Args not a valid json object query=%s", json_object_get_string(queryJ));
-        return;
-    }
-    AFB_DEBUG("Parsed input arguments = endpoint_type:%s endpoint_id:%d property_name:%s", pEndpointTypeStr,endpointID,propertyName);
-    endpointType = EndpointTypeToEnum(pEndpointTypeStr);
+        json_object *paramJ= json_object_new_string(propertyName);
+        json_object_object_add(pPolicyEndpointJ, "arg_property_name", paramJ);
+        json_object_object_add(pPolicyEndpointJ, "arg_property_value", propValueJ);
 
-    EndpointInfoT * pEndpointInfo = GetEndpointInfo(endpointID,endpointType);
-    if (pEndpointInfo == NULL)
-    {
-        afb_req_fail_f(req, "Endpoint not found", "Endpoint information not found for id:%d type%d",endpointID,endpointType);
-        return;
+        // Call policy to allow custom policy actions in current context
+        int policyAllowed = Policy_SetProperty(pPolicyEndpointJ);     
+        if (!policyAllowed)
+        {
+            afb_req_fail(req, "Audio policy violation", "Set endpoint property not allowed in current context");
+            return;
+        }
+    #else
+        // Simulate that policy returns target state (accepted)
+        if (pEndpointInfo->pPropTable)
+            g_hash_table_insert(pEndpointInfo->pPropTable, propertyName, propValueJ);
+    #endif
     }
 
     // Retrieve cached property value
@@ -1206,14 +983,10 @@ PUBLIC void audiohlapi_get_property(struct afb_req req)
     }
 
     json_object_get(propertyValJ); // Increase ref count so that framework does not free our JSON object
-    //AFB_WARNING("properties %s", json_object_get_string(propertyValJ));
-    //json_object_get(propertyValJ); // Increase ref count so that framework does not free our JSON object
 
-    afb_req_success(req, propertyValJ, "Retrieved property value");
+    afb_req_success(req, propertyValJ, "Set/get property completed");
 }
 
-// Audio related events
-
 PUBLIC void audiohlapi_get_list_actions(struct afb_req req)
 {
     json_object *queryJ = NULL;
@@ -1226,7 +999,6 @@ PUBLIC void audiohlapi_get_list_actions(struct afb_req req)
         afb_req_fail_f(req, "Invalid arguments", "Args not a valid json object query=%s", json_object_get_string(queryJ));
         return;
     }
-    AFB_DEBUG("Parsed input arguments = audio_role:%s",audioRole);
 
     // Build and return list of actions for specific audio role
     RoleInfoT * pRole = GetRole(audioRole);
@@ -1264,7 +1036,6 @@ PUBLIC void audiohlapi_post_action(struct afb_req req)
         afb_req_fail_f(req, "Invalid arguments", "Args not a valid json object query=%s", json_object_get_string(queryJ));
         return;
     }
-    AFB_DEBUG("Parsed input arguments = action_name:%s audio_role:%s", actionName,audioRole);
 
     // Verify if known action for audio role
     RoleInfoT * pRole = GetRole(audioRole);
@@ -1296,7 +1067,15 @@ PUBLIC void audiohlapi_post_action(struct afb_req req)
 
 #ifndef AHL_DISCONNECT_POLICY  
     // Call policy to allow custom policy actions in current context (e.g. cancel playback)
-    int policyAllowed = Policy_PostAction(queryJ); 
+    json_object * pActionInfo = NULL;
+    err = wrap_json_pack(&pActionInfo, "{s:s,s:s,s?s,s?o}", "action_name", &actionName,"audio_role",&audioRole,"media_name",&mediaName,"action_context",&actionContext);
+    if (err) {
+        afb_req_fail_f(req, "Invalid arguments", "Could not create action JSON object arguments");
+        return;
+    }
+    json_object_get(pActionInfo);
+    int policyAllowed = Policy_PostAction(pActionInfo); 
+    //int policyAllowed = Policy_PostAction(queryJ); 
     if (!policyAllowed)
     {
         afb_req_fail(req, "Audio policy violation", "Post sound action not allowed in current context");
@@ -1304,20 +1083,17 @@ PUBLIC void audiohlapi_post_action(struct afb_req req)
     }
 #endif
 
-    //afb_event_push(g_AHLCtx.policyCtx.postEvent,queryJ);
-
     afb_req_success(req, NULL, "Posted sound action");
  }
 
-
-// Monitoring
-PUBLIC void audiohlapi_subscribe(struct afb_req req)
+PUBLIC void audiohlapi_event_subscription(struct afb_req req)
 {
     json_object *queryJ = NULL;
     json_object * eventArrayJ = NULL;
+    int iSubscribe = 1;
 
     queryJ = afb_req_json(req);
-    int err = wrap_json_unpack(queryJ, "{s:o}", "events", &eventArrayJ);
+    int err = wrap_json_unpack(queryJ, "{s:o,s:i}", "events", &eventArrayJ,"subscribe",&iSubscribe);
     if (err) {
         afb_req_fail_f(req, "Invalid arguments", "Args not a valid json object query=%s", json_object_get_string(queryJ));
         return;
@@ -1334,16 +1110,22 @@ PUBLIC void audiohlapi_subscribe(struct afb_req req)
 			return;
         }
         else if(!strcasecmp(pEventName, AHL_ENDPOINT_PROPERTY_EVENT)) {
-			afb_req_subscribe(req, g_AHLCtx.policyCtx.propertyEvent);
-            AFB_DEBUG("Client subscribed to endpoint property events");
+            if (iSubscribe)
+			    afb_req_subscribe(req, g_AHLCtx.policyCtx.propertyEvent);
+            else
+                afb_req_unsubscribe(req, g_AHLCtx.policyCtx.propertyEvent);
 		}
         else if(!strcasecmp(pEventName, AHL_ENDPOINT_VOLUME_EVENT)) {
-			afb_req_subscribe(req, g_AHLCtx.policyCtx.volumeEvent);
-            AFB_DEBUG("Client subscribed to endpoint volume events");
+            if (iSubscribe)
+			    afb_req_subscribe(req, g_AHLCtx.policyCtx.volumeEvent);
+            else
+                afb_req_unsubscribe(req, g_AHLCtx.policyCtx.volumeEvent);
 		}
         else if(!strcasecmp(pEventName, AHL_POST_ACTION_EVENT)) {
-			afb_req_subscribe(req, g_AHLCtx.policyCtx.postActionEvent);
-            AFB_DEBUG("Client subscribed to post event calls events");
+            if (iSubscribe)
+			    afb_req_subscribe(req, g_AHLCtx.policyCtx.postActionEvent);
+            else
+                afb_req_unsubscribe(req, g_AHLCtx.policyCtx.postActionEvent);
 		}
         else {
 			afb_req_fail(req, "failed", "Invalid event");
@@ -1351,50 +1133,7 @@ PUBLIC void audiohlapi_subscribe(struct afb_req req)
 		}
     }
 
-    afb_req_success(req, NULL, "Subscribe to events finished");
-}
-
-PUBLIC void audiohlapi_unsubscribe(struct afb_req req)
-{
-    json_object *queryJ = NULL;
-    json_object * eventArrayJ = NULL;
-
-    queryJ = afb_req_json(req);
-    int err = wrap_json_unpack(queryJ, "{s:o}", "events", &eventArrayJ);
-    if (err) {
-        afb_req_fail_f(req, "Invalid arguments", "Args not a valid json object query=%s", json_object_get_string(queryJ));
-        return;
-    }
-    
-    int iNumEvents = json_object_array_length(eventArrayJ);
-    for (int i = 0; i < iNumEvents; i++)
-    {
-        char * pEventName = NULL;
-        json_object * jEvent = json_object_array_get_idx(eventArrayJ,i);
-        pEventName = (char *)json_object_get_string(jEvent);
-        if(pEventName == NULL) {
-            afb_req_fail(req, "failed", "Invalid event");
-			return;
-        }
-        else if(!strcasecmp(pEventName, AHL_ENDPOINT_PROPERTY_EVENT)) {
-			afb_req_unsubscribe(req, g_AHLCtx.policyCtx.propertyEvent);
-            AFB_DEBUG("Client unsubscribed to endpoint property events");
-		}
-        else if(!strcasecmp(pEventName, AHL_ENDPOINT_VOLUME_EVENT)) {
-			afb_req_unsubscribe(req, g_AHLCtx.policyCtx.volumeEvent);
-            AFB_DEBUG("Client unsubscribed to endpoint volume events");
-		}
-        else if(!strcasecmp(pEventName, AHL_POST_ACTION_EVENT)) {
-			afb_req_unsubscribe(req, g_AHLCtx.policyCtx.postActionEvent);
-            AFB_DEBUG("Client unsubscribed to post event calls events");
-		}
-        else {
-			afb_req_fail(req, "failed", "Invalid event");
-			return;
-		}
-    }
-
-    afb_req_success(req, NULL, "Unsubscribe to events finished");
+    afb_req_success(req, NULL, "Event subscription update finished");
 }
 
 // Since the policy is currently in the same binding, it cannot raise events on its own
@@ -1411,42 +1150,7 @@ PUBLIC void audiohlapi_raise_event(json_object * pEventDataJ)
        return;
     }
 
-    if(strcasecmp(pEventName, AHL_ENDPOINT_INIT_EVENT)==0) {
-        char * pAudioRole = NULL;
-        endpointID_t endpointID = AHL_UNDEFINED;
-        EndpointTypeT endpointType = ENDPOINTTYPE_MAXVALUE;
-        int err = wrap_json_unpack(pEventDataJ,"{s:i,s:i,s:s}",
-                            "endpoint_id", &endpointID, 
-                            "endpoint_type", &endpointType,
-                            "audio_role", &pAudioRole);
-        if(err)
-        {
-            AFB_ERROR("Unable to unpack property init event");
-            return;
-        }
-
-        RoleInfoT * pRole = GetRole(pAudioRole);
-        if ( pRole == NULL ){
-            AFB_ERROR("Requested audio role does not exist in current configuration -> %s", pAudioRole);
-            return;
-        }
-    
-        EndpointInfoT * pEndpointInfo = InitEndpointInfo();
-        g_assert_nonnull(pEndpointInfo);
-        PolicyCtxJSONToEndpoint(pEventDataJ,pEndpointInfo);
-
-        err = ReplaceEndpointInfoWithRole(endpointID,endpointType,pRole,pEndpointInfo);        
-        if(err == AHL_FAIL)
-        {
-            AFB_ERROR("Can't update EndpointInfo aborting");
-            return;
-        }
-
-        // Remove event name from object
-        // json_object_object_del(pEventDataJ,"event_name");
-        //afb_event_push(g_AHLCtx.policyCtx.propertyEvent,pEventDataJ); // Not broadcasted to application at this time
-    }
-    else if(strcasecmp(pEventName, AHL_ENDPOINT_PROPERTY_EVENT)==0) {
+    if(strcasecmp(pEventName, AHL_ENDPOINT_PROPERTY_EVENT)==0) {
         char * pAudioRole = NULL;
         char * pPropertyName = NULL;
         endpointID_t endpointID = AHL_UNDEFINED;
@@ -1475,13 +1179,13 @@ PUBLIC void audiohlapi_raise_event(json_object * pEventDataJ)
             json_type jType = json_object_get_type(propValueJ);
             switch (jType) {
                 case json_type_double:
-                    Add_Endpoint_Property_Double(pEndpointInfo,pPropertyName,json_object_get_double(propValueJ));
+                    g_hash_table_insert(pEndpointInfo->pPropTable, pPropertyName, json_object_new_double(json_object_get_double(propValueJ)));
                     break;
                 case json_type_int:
-                    Add_Endpoint_Property_Int(pEndpointInfo,pPropertyName,json_object_get_int(propValueJ));
+                    g_hash_table_insert(pEndpointInfo->pPropTable, pPropertyName, json_object_new_int(json_object_get_int(propValueJ)));
                     break;
                 case json_type_string:
-                    Add_Endpoint_Property_String(pEndpointInfo,pPropertyName,json_object_get_string(propValueJ));
+                    g_hash_table_insert(pEndpointInfo->pPropTable, pPropertyName, json_object_new_string(json_object_get_string(propValueJ)));
                     break;
                 default:
                     AFB_ERROR("Invalid property argument Property value not a valid json object query=%s", json_object_get_string(propValueJ));
@@ -1522,6 +1226,7 @@ PUBLIC void audiohlapi_raise_event(json_object * pEventDataJ)
     else if(strcasecmp(pEventName, AHL_POST_ACTION_EVENT)==0) {
         // Remove event name from object
         json_object_object_del(pEventDataJ,"event_name");
+        // BUG: This crashes... 
         afb_event_push(g_AHLCtx.policyCtx.postActionEvent,pEventDataJ);
     }
     else if(strcasecmp(pEventName, AHL_STREAM_STATE_EVENT)==0) {
@@ -1568,7 +1273,6 @@ PUBLIC void audiohlapi_raise_event(json_object * pEventDataJ)
         
         // Remove event name from object
         json_object_object_del(pEventDataJ,"event_name");
-        AFB_ERROR("pEventDataJ=%s", json_object_get_string(pEventDataJ));
         afb_event_push(pStreamInfo->streamStateEvent,pEventDataJ);   
     }
     else {        
diff --git a/src/ahl-binding.h b/src/ahl-binding.h
index 9b4c37e..c6f0846 100644
--- a/src/ahl-binding.h
+++ b/src/ahl-binding.h
@@ -28,7 +28,6 @@
 #include "ahl-interface.h"
 #include "ahl-policy-utils.h"
 
-
 #ifndef PUBLIC
   #define PUBLIC
 #endif
@@ -39,9 +38,36 @@
 #define AHL_ACCESS_CONTROL_GRANTED 1
 #define AHL_ACCESS_CONTROL_DENIED 0
 
-#define AHL_UNDEFINED -1
 #define AHL_STR_MAX_LENGTH 256
-
+ 
+typedef struct EndpointInfo
+{
+    endpointID_t    endpointID;         // Unique endpoint ID (per type)
+    EndpointTypeT   type;               // Source or sink device
+    char *          gsDeviceName;       // Unique device card name 
+    char *          gsDisplayName;      // Application display name
+    char *          gsDeviceURI;        // Associated URI 
+    char *          gsDeviceDomain;     // Device URI domain (e.g. alsa or pulse)
+    char *          pRoleName;          // Role assigned to this endpoint 
+    DeviceURITypeT  deviceURIType;      // Device URI type (includes audio domain information)
+    char *          gsHALAPIName;       // HAL associated with the device (for volume control)
+    AlsaDeviceInfoT alsaInfo;           // ALSA specific device information
+    AudioFormatT    format;             // Preferred audio format supported (later could be array of supported formats)
+    int             iVolume;            // Storage for current endpoint volume (policy effected). 
+    GHashTable *    pPropTable;         // Storage for array of properties (policy effected)         
+} EndpointInfoT;
+
+typedef struct StreamInfo {
+    streamID_t              streamID;           // Stream unique ID
+    EndpointInfoT *         pEndpointInfo;      // Associated endpoint information (reference)
+    StreamStateT            streamState;        // Stream activity state
+    StreamMuteT             streamMute;         // Stream mute state
+    struct afb_event        streamStateEvent;   // Stream specific event for stream state changes
+    EndpointSelectionModeT  endpointSelMode;    // Automatic (priority based) or manual endpoint selection
+    char *                  pRoleName;          // Role string identifier (from role config but could be programatically overriden later)
+    int                     iPriority;          // Role normalized priority (0-100) (from role config but could be programatically overriden later)
+    InterruptBehaviorT      eInterruptBehavior; // Role behavior when interrupting lower priority streams (from role config but could be programatically overriden later)
+} StreamInfoT;
 
 typedef struct RoleInfo {
     char *              pRoleName;          // Role string identifier
diff --git a/src/ahl-deviceenum.c b/src/ahl-deviceenum.c
index 7e67d7a..ebadb1f 100644
--- a/src/ahl-deviceenum.c
+++ b/src/ahl-deviceenum.c
@@ -173,7 +173,7 @@ static int FillALSAPCMInfo( snd_pcm_t * in_pPcmHandle, EndpointInfoT * out_pEndp
         snd_ctl_close(ctlHandle);
         return 1;
     }
-    out_pEndpointInfo->gsDeviceName = g_strdup(pCardName); 
+    g_strlcpy(out_pEndpointInfo->gsDeviceName,pCardName,AHL_STR_MAX_LENGTH); 
 
     snd_ctl_close(ctlHandle);
 
@@ -193,6 +193,20 @@ EndpointInfoT * InitEndpointInfo()
     pEndpointInfo->format.sampleRate = AHL_UNDEFINED;
     pEndpointInfo->format.numChannels = AHL_UNDEFINED;
     pEndpointInfo->format.sampleType = AHL_FORMAT_UNKNOWN;
+    // Assigned by device enumeration
+    pEndpointInfo->gsDeviceName = malloc(AHL_STR_MAX_LENGTH*sizeof(char));
+    memset(pEndpointInfo->gsDeviceName,0,AHL_STR_MAX_LENGTH*sizeof(char));
+    pEndpointInfo->gsDeviceDomain = malloc(AHL_STR_MAX_LENGTH*sizeof(char));
+    memset(pEndpointInfo->gsDeviceDomain,0,AHL_STR_MAX_LENGTH*sizeof(char));
+    pEndpointInfo->pRoleName = malloc(AHL_STR_MAX_LENGTH*sizeof(char));
+    memset(pEndpointInfo->pRoleName,0,AHL_STR_MAX_LENGTH*sizeof(char));
+    pEndpointInfo->gsDeviceURI = malloc(AHL_STR_MAX_LENGTH*sizeof(char));
+    memset(pEndpointInfo->gsDeviceURI,0,AHL_STR_MAX_LENGTH*sizeof(char));
+    // Assigned by policy initialization
+    pEndpointInfo->gsDisplayName = malloc(AHL_STR_MAX_LENGTH*sizeof(char));
+    memset(pEndpointInfo->gsDisplayName,0,AHL_STR_MAX_LENGTH*sizeof(char));
+    pEndpointInfo->gsHALAPIName = malloc(AHL_STR_MAX_LENGTH*sizeof(char));
+    memset(pEndpointInfo->gsHALAPIName,0,AHL_STR_MAX_LENGTH*sizeof(char));
     pEndpointInfo->pPropTable = g_hash_table_new(g_str_hash, g_str_equal);
     return pEndpointInfo;
 }
@@ -200,12 +214,12 @@ EndpointInfoT * InitEndpointInfo()
 void TermEndpointInfo( EndpointInfoT * out_pEndpointInfo )
 {
     #define SAFE_FREE(__ptr__) if(__ptr__) g_free(__ptr__); __ptr__ = NULL;
-    SAFE_FREE(out_pEndpointInfo->gsDeviceName);
-    SAFE_FREE(out_pEndpointInfo->gsDisplayName);
+    SAFE_FREE(out_pEndpointInfo->gsDeviceName);  
     SAFE_FREE(out_pEndpointInfo->gsDeviceDomain);
     SAFE_FREE(out_pEndpointInfo->pRoleName);
     SAFE_FREE(out_pEndpointInfo->gsDeviceURI);
     SAFE_FREE(out_pEndpointInfo->gsHALAPIName);
+    SAFE_FREE(out_pEndpointInfo->gsDisplayName);
 
     if (out_pEndpointInfo->pPropTable) {
         // Free json_object for all property values
@@ -258,10 +272,10 @@ int EnumerateDevices(json_object * in_jDeviceArray, char * in_pAudioRole, Endpoi
         
         // non ALSA URI are simply passed to application (no validation) at this time 
         // In Non ALSA case devices in config are assumed to be available, if not application can fallback on explicit device selection 
-        pEndpointInfo->gsDeviceName = g_strdup(pDeviceURIPCM); 
-        pEndpointInfo->gsDeviceDomain = g_strdup(pDeviceURIDomain);
-        pEndpointInfo->gsDeviceURI = g_strdup(pDeviceURIPCM);
-        pEndpointInfo->pRoleName = g_strdup(in_pAudioRole);
+        g_strlcpy(pEndpointInfo->gsDeviceName,pDeviceURIPCM,AHL_STR_MAX_LENGTH); 
+        g_strlcpy(pEndpointInfo->gsDeviceDomain,pDeviceURIDomain,AHL_STR_MAX_LENGTH);
+        g_strlcpy(pEndpointInfo->gsDeviceURI,pDeviceURIPCM,AHL_STR_MAX_LENGTH);
+        g_strlcpy(pEndpointInfo->pRoleName ,in_pAudioRole,AHL_STR_MAX_LENGTH);
         
         g_free(pFullDeviceURICopy);
         pFullDeviceURICopy = NULL;
@@ -315,11 +329,6 @@ int EnumerateDevices(json_object * in_jDeviceArray, char * in_pAudioRole, Endpoi
 
         pEndpointInfo->endpointID = in_deviceType == ENDPOINTTYPE_SOURCE ? CreateNewSourceID() : CreateNewSinkID();
         pEndpointInfo->type = in_deviceType;
-        // Assigned by policy initialization
-        pEndpointInfo->gsDisplayName = malloc(AHL_STR_MAX_LENGTH*sizeof(char));
-        memset(pEndpointInfo->gsDisplayName,0,AHL_STR_MAX_LENGTH*sizeof(char));
-        pEndpointInfo->gsHALAPIName = malloc(AHL_STR_MAX_LENGTH*sizeof(char));
-        memset(pEndpointInfo->gsDisplayName,0,AHL_STR_MAX_LENGTH*sizeof(char));
 
         // add to structure to list of available devices
         g_ptr_array_add(out_pEndpointArray, pEndpointInfo);
diff --git a/src/ahl-interface.h b/src/ahl-interface.h
index 0488e96..fc0ac68 100644
--- a/src/ahl-interface.h
+++ b/src/ahl-interface.h
@@ -35,11 +35,8 @@
 // Property/Volume/Action events
 #define AHL_ENDPOINT_PROPERTY_EVENT "ahl_endpoint_property_event"
 #define AHL_ENDPOINT_VOLUME_EVENT "ahl_endpoint_volume_event"
-#define AHL_ENDPOINT_INIT_EVENT "ahl_endpoint_init_event"
 #define AHL_POST_ACTION_EVENT "ahl_post_action"
 #define AHL_STREAM_STATE_EVENT "ahl_stream_state_event"
-#define AHL_ENDPOINT_INIT_EVENT "ahl_endpoint_init_event"
-
 
 // Stream state event types
 #define AHL_STREAM_EVENT_START "start"    // Stream is inactive
diff --git a/src/ahl-policy-utils.c b/src/ahl-policy-utils.c
index 60ddd36..87fe03f 100644..100755
--- a/src/ahl-policy-utils.c
+++ b/src/ahl-policy-utils.c
@@ -19,218 +19,164 @@
 #include <json-c/json.h>
 #include <glib.h>
 
-void Add_Endpoint_Property_Double( EndpointInfoT * io_pEndpointInfo, char * in_pPropertyName, double in_dPropertyValue)
+void Add_Endpoint_Property_Double( json_object * io_pPropertyArray, char * in_pPropertyName, double in_dPropertyValue)
 {
-    json_object * propValueJ = json_object_new_double(in_dPropertyValue);
-    g_hash_table_insert(io_pEndpointInfo->pPropTable, in_pPropertyName, propValueJ);
+    json_object * pPropertyJ = NULL;
+    wrap_json_pack(&pPropertyJ, "{s:s,s:o}",
+                        "property_name", in_pPropertyName, 
+                        "property_value", json_object_new_double(in_dPropertyValue)                  
+                        );
+    json_object_array_add(io_pPropertyArray, pPropertyJ);
 }
 
-
-void Add_Endpoint_Property_Int( EndpointInfoT * io_pEndpointInfo, char * in_pPropertyName, int in_iPropertyValue)
+void Add_Endpoint_Property_Int( json_object * io_pPropertyArray, char * in_pPropertyName, int in_iPropertyValue)
 {
-    json_object * propValueJ = json_object_new_int(in_iPropertyValue);
-    g_hash_table_insert(io_pEndpointInfo->pPropTable, in_pPropertyName, propValueJ);
+    json_object * pPropertyJ = NULL;
+    wrap_json_pack(&pPropertyJ, "{s:s,s:o}",
+                        "property_name", in_pPropertyName, 
+                        "property_value", json_object_new_int(in_iPropertyValue)                  
+                        );
+    json_object_array_add(io_pPropertyArray, pPropertyJ);
 }
 
-void Add_Endpoint_Property_String( EndpointInfoT * io_pEndpointInfo, char * in_pPropertyName, const char * in_pPropertyValue)
+void Add_Endpoint_Property_String( json_object * io_pPropertyArray, char * in_pPropertyName, const char * in_pPropertyValue)
 {
-    json_object * propValueJ = json_object_new_string(in_pPropertyValue);
-    g_hash_table_insert(io_pEndpointInfo->pPropTable, in_pPropertyName, propValueJ);
+    json_object * pPropertyJ = NULL;
+    wrap_json_pack(&pPropertyJ, "{s:s,s:o}",
+                        "property_name", in_pPropertyName, 
+                        "property_value", json_object_new_string(in_pPropertyValue)                 
+                        );
+    json_object_array_add(io_pPropertyArray, pPropertyJ);
 }
 
-int PolicyEndpointStructToJSON(EndpointInfoT * pEndpointInfo, json_object **ppPolicyEndpointJ)
+int EndpointToJSON(EndPointInterfaceInfoT * pEndpoint, json_object **ppEndpointJ)
 {
-    if(pEndpointInfo == NULL || pEndpointInfo->pPropTable == NULL)
+    if(ppEndpointJ == NULL || pEndpoint == NULL)
     {
-        AFB_ERROR("Invalid PolicyEndpointStructToJSON arguments");
+        AFB_ERROR("Invalid EndpointToJSON arguments");
         return AHL_POLICY_UTIL_FAIL;
     } 
 
-    //Create json object for PropTable
-    json_object *pPropTableJ = json_object_new_array();
-    if(pEndpointInfo->pPropTable) {      
-        GHashTableIter iter;
-        gpointer key, value;
-        g_hash_table_iter_init (&iter, pEndpointInfo->pPropTable);
-        while (g_hash_table_iter_next (&iter, &key, &value))
-        {
-            json_object *pPropertyJ = NULL;
-            int error=wrap_json_pack(&pPropertyJ, "{s:s,s:o}",
-                        "property_name", (char*)key, 
-                        "property_value", value                  
-                        );
-            if(error)                    
-            {
-                AFB_ERROR("Unable to pack JSON endpoint, =%s", wrap_json_get_error_string(error));   
-                return AHL_POLICY_UTIL_FAIL;             
-            }        
-            json_object_array_add(pPropTableJ, pPropertyJ);
-        }
-        AFB_DEBUG("json object query=%s", json_object_get_string(pPropTableJ));
-    }
-
+    
     //Create json object for Endpoint
-    int err= wrap_json_pack(ppPolicyEndpointJ, "{s:i,s:i,s:s,s:s,s:s,s:s,s:s,s:i,s:s,s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:o}",
-                    "endpoint_id", pEndpointInfo->endpointID, 
-                    "endpoint_type", pEndpointInfo->type,
-                    "device_name", pEndpointInfo->gsDeviceName, 
-                    "display_name", pEndpointInfo->gsDisplayName, 
-                    "device_uri",  pEndpointInfo->gsDeviceURI,
-                    "device_domain", pEndpointInfo->gsDeviceDomain,
-                    "audio_role",pEndpointInfo->pRoleName,
-                    "device_uri_type", pEndpointInfo->deviceURIType,
-                    "hal_api_name", pEndpointInfo->gsHALAPIName,
-                    "alsa_cardNum", pEndpointInfo->alsaInfo.cardNum, 
-                    "alsa_deviceNum", pEndpointInfo->alsaInfo.deviceNum, 
-                    "alsa_subDeviceNum", pEndpointInfo->alsaInfo.subDeviceNum,
-                    "format_samplerate", pEndpointInfo->format.sampleRate,
-                    "format_numchannels", pEndpointInfo->format.numChannels,
-                    "format_sampletype",pEndpointInfo->format.sampleType,
-                    "volume", pEndpointInfo->iVolume,
-                    "property_table", pPropTableJ
+    int err= wrap_json_pack(ppEndpointJ, "{s:i,s:i,s:s,s:s,s:s,s:s,s:s,s:i,s:s,s:i,s:i,s:i,s:i,s:i,s:i,s:i,s?o}",
+                    "endpoint_id", pEndpoint->endpointID, 
+                    "endpoint_type", pEndpoint->type,
+                    "device_name", pEndpoint->gsDeviceName, 
+                    "display_name", pEndpoint->gsDisplayName, 
+                    "device_uri",  pEndpoint->gsDeviceURI,
+                    "device_domain", pEndpoint->gsDeviceDomain,
+                    "audio_role",pEndpoint->pRoleName,
+                    "device_uri_type", pEndpoint->deviceURIType,
+                    "hal_api_name", pEndpoint->gsHALAPIName,
+                    "alsa_cardNum", pEndpoint->alsaInfo.cardNum, 
+                    "alsa_deviceNum", pEndpoint->alsaInfo.deviceNum, 
+                    "alsa_subDeviceNum", pEndpoint->alsaInfo.subDeviceNum,
+                    "format_samplerate", pEndpoint->format.sampleRate,
+                    "format_numchannels", pEndpoint->format.numChannels,
+                    "format_sampletype",pEndpoint->format.sampleType,
+                    "volume", pEndpoint->iVolume,
+                    "property_table", pEndpoint->pPropTableJ
                     );
     if (err) {
         AFB_ERROR("Unable to pack JSON endpoint, =%s", wrap_json_get_error_string(err));
         return AHL_POLICY_UTIL_FAIL;
     }    
-    AFB_DEBUG("JSON endpoint information=%s", json_object_get_string(*ppPolicyEndpointJ));
+    AFB_DEBUG("JSON endpoint information=%s", json_object_get_string(*ppEndpointJ));
     return AHL_POLICY_UTIL_SUCCESS;
 }
 
-int PolicyStreamStructToJSON(StreamInfoT * pPolicyStream, json_object **ppPolicyStreamJ)
+int StreamToJSON(StreamInterfaceInfoT * pStream, json_object **ppStreamJ)
 {
-    if(pPolicyStream == NULL)
+    if(pStream == NULL)
     {
-        AFB_ERROR("Invalid arguments to PolicyStreamStructToJSON");
+        AFB_ERROR("Invalid arguments to StreamToJSON, stream structure is NULL");
         return AHL_POLICY_UTIL_FAIL;
     }
 
-    json_object * pEndpointJ = NULL;
-    int iRet = PolicyEndpointStructToJSON(pPolicyStream->pEndpointInfo, &pEndpointJ);
-    if (iRet) {
-        return iRet;
+
+    json_object *EndpointJ = NULL;
+    int err = EndpointToJSON(&pStream->endpoint, &EndpointJ);
+    if (err) {
+        AFB_ERROR("Unable to pack JSON endpoint, =%s", wrap_json_get_error_string(err));
+        return AHL_POLICY_UTIL_FAIL;
     }
 
     //Create json object for stream
-    int err = wrap_json_pack(ppPolicyStreamJ, "{s:i,s:i,s:i,s:I,s:i,s:s,s:i,s:i,s:o}",
-                    "stream_id", pPolicyStream->streamID, 
-                    "stream_state", pPolicyStream->streamState,
-                    "stream_mute", pPolicyStream->streamMute, 
-                    "stream_state_event", &pPolicyStream->streamStateEvent, 
-                    "endpoint_sel_mod",  pPolicyStream->endpointSelMode,
-                    "role_name", pPolicyStream->pRoleName,
-                    "priority", pPolicyStream->iPriority,
-                    "interrupt_behavior", pPolicyStream->eInterruptBehavior,
-                    "endpoint_info", pEndpointJ
+    err = wrap_json_pack(ppStreamJ, "{s:i,s:i,s:i,s:s,s:i,s:i,s:o}",
+                    "stream_id", pStream->streamID, 
+                    "stream_state", pStream->streamState,
+                    "stream_mute", pStream->streamMute, 
+                    "role_name", pStream->pRoleName,
+                    "priority", pStream->iPriority,
+                    "interrupt_behavior", pStream->eInterruptBehavior,
+                    "endpoint_info", EndpointJ
                     );
     if (err) {
-        AFB_ERROR("Unable to pack JSON endpoint, =%s", wrap_json_get_error_string(err));
+        AFB_ERROR("Unable to pack JSON Stream, =%s", wrap_json_get_error_string(err));
         return AHL_POLICY_UTIL_FAIL;
     }
 
-    AFB_DEBUG("JSON stream information=%s", json_object_get_string(*ppPolicyStreamJ));
+    AFB_DEBUG("JSON stream information=%s", json_object_get_string(*ppStreamJ));
 
     return AHL_POLICY_UTIL_SUCCESS;
 }
 
-int PolicyCtxJSONToEndpoint(json_object *pEndpointJ, EndpointInfoT * pEndpointInfo)
+//pEndpointInterfaceInfo must be pre-allocated by the caller
+int JSONToEndpoint(json_object *pEndpointJ, EndPointInterfaceInfoT *pEndpoint)
 {
-    if(pEndpointJ == NULL || pEndpointInfo == NULL /*|| pEndpointInfo->pPropTable == NULL */ )
+
+    if(pEndpointJ == NULL || pEndpoint == NULL)
     {
-        AFB_ERROR("Invalid arguments for PolicyCtxJSONToEndpoint");
+        AFB_ERROR("Invalid arguments for InterfaceJSONToEndpoint");
         return AHL_POLICY_UTIL_FAIL;
     }
 
     //Unpack Endpoint
-    json_object *pPropTableJ = NULL;
-    int err = wrap_json_unpack(pEndpointJ, "{s:i,s:i,s:s,s:s,s:s,s:s,s:s,s:i,s:s,s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:o}",
-                    "endpoint_id", &pEndpointInfo->endpointID, 
-                    "endpoint_type", &pEndpointInfo->type,
-                    "device_name", &pEndpointInfo->gsDeviceName, 
-                    "display_name", &pEndpointInfo->gsDisplayName, 
-                    "device_uri",  &pEndpointInfo->gsDeviceURI,
-                    "device_domain", &pEndpointInfo->gsDeviceDomain,
-                    "audio_role", &pEndpointInfo->pRoleName,
-                    "device_uri_type", &pEndpointInfo->deviceURIType,
-                    "hal_api_name", &pEndpointInfo->gsHALAPIName,
-                    "alsa_cardNum", &pEndpointInfo->alsaInfo.cardNum, 
-                    "alsa_deviceNum", &pEndpointInfo->alsaInfo.deviceNum, 
-                    "alsa_subDeviceNum", &pEndpointInfo->alsaInfo.subDeviceNum,
-                    "format_samplerate", &pEndpointInfo->format.sampleRate,
-                    "format_numchannels", &pEndpointInfo->format.numChannels,
-                    "format_sampletype",&pEndpointInfo->format.sampleType,
-                    "volume", &pEndpointInfo->iVolume,                    
-                    "property_table", &pPropTableJ                    
+    int err = wrap_json_unpack(pEndpointJ, "{s:i,s:i,s:s,s:s,s:s,s:s,s:s,s:i,s:s,s:i,s:i,s:i,s:i,s:i,s:i,s:i,s?o}",
+                    "endpoint_id", &pEndpoint->endpointID, 
+                    "endpoint_type", &pEndpoint->type,
+                    "device_name", &pEndpoint->gsDeviceName, 
+                    "display_name", &pEndpoint->gsDisplayName, 
+                    "device_uri",  &pEndpoint->gsDeviceURI,
+                    "device_domain", &pEndpoint->gsDeviceDomain,
+                    "audio_role", &pEndpoint->pRoleName,
+                    "device_uri_type", &pEndpoint->deviceURIType,
+                    "hal_api_name", &pEndpoint->gsHALAPIName,
+                    "alsa_cardNum", &pEndpoint->alsaInfo.cardNum, 
+                    "alsa_deviceNum", &pEndpoint->alsaInfo.deviceNum, 
+                    "alsa_subDeviceNum", &pEndpoint->alsaInfo.subDeviceNum,
+                    "format_samplerate", &pEndpoint->format.sampleRate,
+                    "format_numchannels", &pEndpoint->format.numChannels,
+                    "format_sampletype",&pEndpoint->format.sampleType,
+                    "volume", &pEndpoint->iVolume,                    
+                    "property_table", &pEndpoint->pPropTableJ                    
                     );
     if (err) {
         AFB_ERROR("Unable to unpack JSON endpoint, =%s", wrap_json_get_error_string(err));
         return AHL_POLICY_UTIL_FAIL;
     }
-
-    // Unpack prop table
-    if(pPropTableJ)
-    {
-        pEndpointInfo->pPropTable = g_hash_table_new(g_str_hash, g_str_equal);
-
-        int nbProperties = json_object_array_length(pPropTableJ);
-        for(int i=0; i<nbProperties; i++)
-        {
-            json_object * propJ = json_object_array_get_idx(pPropTableJ,i);
-            if (propJ) {
-                char * pPropertyName = NULL;
-                json_object * pPropertyValueJ = NULL;
-
-                int err=wrap_json_unpack(propJ, "{s:s,s:o}",
-                                        "property_name", &pPropertyName, 
-                                        "property_value", &pPropertyValueJ);
-                if (err) {
-                    AFB_ERROR("Unable to unpack JSON endpoint, = %s", wrap_json_get_error_string(err));
-                    return AHL_POLICY_UTIL_FAIL;
-                }        
-
-                // Object type detection for property value (string = state, numeric = property)
-                json_type jType = json_object_get_type(pPropertyValueJ);
-                switch (jType) {
-                    case json_type_double:
-                        Add_Endpoint_Property_Double(pEndpointInfo,pPropertyName,json_object_get_double(pPropertyValueJ));
-                        break;
-                    case json_type_int:
-                        Add_Endpoint_Property_Int(pEndpointInfo,pPropertyName,json_object_get_int(pPropertyValueJ));
-                        break;
-                    case json_type_string:
-                        Add_Endpoint_Property_String(pEndpointInfo,pPropertyName,json_object_get_string(pPropertyValueJ));
-                        break;
-                    default:
-                        AFB_ERROR("Invalid property argument Property value not a valid json object query=%s", json_object_get_string(pPropertyValueJ));
-                        return AHL_POLICY_UTIL_FAIL;
-                }
-            }
-        }
-    }
-
     return AHL_POLICY_UTIL_SUCCESS;
 }
 
-int PolicyCtxJSONToStream(json_object *pStreamJ, StreamInfoT * pPolicyStream)
+int JSONToStream(json_object *pStreamJ, StreamInterfaceInfoT * pStream)
 {
-    if(pStreamJ == NULL || pPolicyStream == NULL)
+    if(pStreamJ == NULL || pStream == NULL)
     {
-        AFB_ERROR("Invalid arguments for PolicyCtxJSONToStream");
+        AFB_ERROR("Invalid arguments for InterfaceCtxJSONToStream");
         return AHL_POLICY_UTIL_FAIL;
     }
 
     //Unpack StreamInfo
     json_object *pEndpointJ = NULL;
     AFB_WARNING("json object query=%s", json_object_get_string(pStreamJ));
-    int err=wrap_json_unpack(pStreamJ, "{s:i,s:i,s:i,s:I,s:i,s:s,s:i,s:i,s:o}",
-                    "stream_id", &pPolicyStream->streamID, 
-                    "stream_state", &pPolicyStream->streamState,
-                    "stream_mute", &pPolicyStream->streamMute, 
-                    "stream_state_event", &pPolicyStream->streamStateEvent, 
-                    "endpoint_sel_mod",  &pPolicyStream->endpointSelMode,
-                    "role_name", &pPolicyStream->pRoleName,
-                    "priority", &pPolicyStream->iPriority,
-                    "interrupt_behavior", &pPolicyStream->eInterruptBehavior,
+    int err=wrap_json_unpack(pStreamJ, "{s:i,s:i,s:i,s:s,s:i,s:i,s:o}",
+                    "stream_id", &pStream->streamID, 
+                    "stream_state", &pStream->streamState,
+                    "stream_mute", &pStream->streamMute, 
+                    "role_name", &pStream->pRoleName,
+                    "priority", &pStream->iPriority,
+                    "interrupt_behavior", &pStream->eInterruptBehavior,
                     "endpoint_info", &pEndpointJ
                     );
 
@@ -239,7 +185,7 @@ int PolicyCtxJSONToStream(json_object *pStreamJ, StreamInfoT * pPolicyStream)
         return AHL_POLICY_UTIL_FAIL;
     }
 
-    int iRet = PolicyCtxJSONToEndpoint(pEndpointJ,pPolicyStream->pEndpointInfo);
+    int iRet = JSONToEndpoint(pEndpointJ,&pStream->endpoint);
     if (iRet) {
         return iRet;
     }
diff --git a/src/ahl-policy-utils.h b/src/ahl-policy-utils.h
index 6adfa4e..65b5432 100644..100755
--- a/src/ahl-policy-utils.h
+++ b/src/ahl-policy-utils.h
@@ -27,6 +27,8 @@
 #define AHL_POLICY_UTIL_SUCCESS 0
 #define AHL_POLICY_UTIL_FAIL 1
 
+#define AHL_UNDEFINED -1
+
 typedef int endpointID_t;
 typedef int streamID_t;
 
@@ -118,60 +120,40 @@ typedef enum EndpointSelectionMode {
     ENDPOINTSELMODEMAXVALUE,            // Enum count, keep at the end
 } EndpointSelectionModeT;
 
-typedef struct EndpointInfo
-{
+
+typedef struct EndPointInterfaceInfo {
     endpointID_t    endpointID;         // Unique endpoint ID (per type)
     EndpointTypeT   type;               // Source or sink device
     char *          gsDeviceName;       // Unique device card name 
     char *          gsDisplayName;      // Application display name
     char *          gsDeviceURI;        // Associated URI 
     char *          gsDeviceDomain;     // Device URI domain (e.g. alsa or pulse)
-    char *          pRoleName;          // Role assigned to this endpoint 
     DeviceURITypeT  deviceURIType;      // Device URI type (includes audio domain information)
     char *          gsHALAPIName;       // HAL associated with the device (for volume control)
+    char *          pRoleName;          // Role string identifier (from role config but could be programatically overriden later)
     AlsaDeviceInfoT alsaInfo;           // ALSA specific device information
     AudioFormatT    format;             // Preferred audio format supported (later could be array of supported formats)
-    int             iVolume;            // Storage for current endpoint volume (policy effected). 
-    GHashTable *    pPropTable;         // Storage for array of properties (policy effected)         
-} EndpointInfoT;
+    int             iVolume;            // Storage for current endpoint volume (policy effected).  
+    json_object     *pPropTableJ;       //Property Table           
+} EndPointInterfaceInfoT;
 
-typedef struct StreamInfo {
+ 
+typedef struct StreamInterfaceInfo {
     streamID_t              streamID;           // Stream unique ID
-    EndpointInfoT *         pEndpointInfo;      // Associated endpoint information (reference)
     StreamStateT            streamState;        // Stream activity state
     StreamMuteT             streamMute;         // Stream mute state
-    struct afb_event        streamStateEvent;   // Stream specific event for stream state changes
-    EndpointSelectionModeT  endpointSelMode;    // Automatic (priority based) or manual endpoint selection
     char *                  pRoleName;          // Role string identifier (from role config but could be programatically overriden later)
     int                     iPriority;          // Role normalized priority (0-100) (from role config but could be programatically overriden later)
-    InterruptBehaviorT      eInterruptBehavior; // Role behavior when interrupting lower priority streams (from role config but could be programatically overriden later)
-} StreamInfoT;
-
-
-typedef struct StreamPolicyInfo {
-    streamID_t      streamID;
-    int             RolePriority;
-    char *          pAudioRole;    
-    InterruptBehaviorT interruptBehavior;   
-    int             iDuckVolume;     //duck Volume
-} StreamPolicyInfoT;
- 
-typedef struct EndPointPolicyInfo {
-    endpointID_t    endpointID;
-    EndpointTypeT   type;    
-    DeviceURITypeT  deviceType;
-    char *          pDeviceName;
-    char *          pHalApiName; 
-    int             iVolume;     //Current Volume            
-    GArray *        streamInfo; //List of playing or duck stream at a given endpoint
-} EndPointPolicyInfoT;
-
-void Add_Endpoint_Property_Double( EndpointInfoT * io_pEndpointInfo, char * in_pPropertyName, double in_dPropertyValue);
-void Add_Endpoint_Property_Int( EndpointInfoT * io_pEndpointInfo, char * in_pPropertyName, int in_iPropertyValue);
-void Add_Endpoint_Property_String( EndpointInfoT * io_pEndpointInfo, char * in_pPropertyName, const char * in_pPropertyValue);
-int PolicyEndpointStructToJSON(EndpointInfoT * pPolicyEndpoint, json_object **ppPolicyEndpointJ);
-int PolicyCtxJSONToEndpoint(json_object *pEndpointJ, EndpointInfoT * pPolicyStream);
-int PolicyStreamStructToJSON(StreamInfoT * pPolicyStream, json_object **ppPolicyStreamJ);
-int PolicyCtxJSONToStream(json_object *pStreamJ, StreamInfoT * pPolicyStream);
+    InterruptBehaviorT      eInterruptBehavior; // Role behavior when interrupting lower priority streams (from role config but could be programatically overriden later)    
+    EndPointInterfaceInfoT  endpoint;
+} StreamInterfaceInfoT;
+
+void Add_Endpoint_Property_Double( json_object * io_pPropertyArray, char * in_pPropertyName, double in_dPropertyValue);
+void Add_Endpoint_Property_Int( json_object * io_pPropertyArray, char * in_pPropertyName, int in_iPropertyValue);
+void Add_Endpoint_Property_String( json_object * io_pPropertyArray, char * in_pPropertyName, const char * in_pPropertyValue);
+int EndpointToJSON(EndPointInterfaceInfoT * pEndpoint, json_object **ppEndpointJ);
+int JSONToEndpoint(json_object *pEndpointJ, EndPointInterfaceInfoT * pStream);
+int StreamToJSON(StreamInterfaceInfoT * pPolicyStream, json_object **ppStreamJ);
+int JSONToStream(json_object *pStreamJ, StreamInterfaceInfoT * pPolicyStream);
 
 #endif // AHL_POLICY_UTILS_INCLUDE
diff --git a/src/ahl-policy.c b/src/ahl-policy.c
index f4650ad..1e4eb3b 100644
--- a/src/ahl-policy.c
+++ b/src/ahl-policy.c
@@ -25,12 +25,25 @@
 
 #ifndef AHL_DISCONNECT_POLICY
 
-#define MAX_ACTIVE_STREAM_POLICY 30
-#define POLICY_FAIL     1
-#define POLICY_SUCCESS  0
 
-#define AHL_POLICY_UNDEFINED_HALNAME "UNDEFINED"
-#define AHL_POLICY_UNDEFINED_DISPLAYNAME "DeviceNotFound"
+typedef struct StreamPolicyInfo {
+    streamID_t      streamID;
+    int             RolePriority;
+    char *          pAudioRole;    
+    InterruptBehaviorT interruptBehavior;   
+    int             iDuckVolume;     //duck Volume
+} StreamPolicyInfoT;
+ 
+typedef struct EndPointPolicyInfo {
+    endpointID_t    endpointID;
+    EndpointTypeT   type;    
+    DeviceURITypeT  deviceType;
+    char *          pDeviceName;
+    char *          pHalApiName; 
+    int             iVolume;     //Current Volume            
+    GArray *        streamInfo; //List of playing or duck stream at a given endpoint
+} EndPointPolicyInfoT;
+
 
 typedef enum SystemState {
     SYSTEM_STARTUP = 0,     // Startup
@@ -40,6 +53,7 @@ typedef enum SystemState {
     SYSTEM_MAXVALUE         // Enum count, keep at the end
 } SystemStateT;
 
+
 typedef struct HalInfo {
     char *pDevID;
     char *pAPIName;
@@ -60,6 +74,7 @@ typedef struct PolicyLocalCtx {
     SystemStateT systemState;
 } PolicyLocalCtxT;
 
+
 //  Global Context
 PolicyLocalCtxT g_PolicyCtx;
 
@@ -125,7 +140,7 @@ static int getStreamConfig(char *pAudioRole, StreamConfigT *pStreamConfig)
 
 static int PolicySetVolume(int iEndpointID, int iEndpointType, char *pHalApiName, char *AudioRole, DeviceURITypeT deviceType, int iVolume, bool bMute)
 {
-    if(pHalApiName == NULL)
+    if(pHalApiName == NULL || (strcasecmp(pHalApiName, AHL_POLICY_UNDEFINED_HALNAME) == 0))
     {
         AFB_WARNING("SetVolume cannot be accomplished without proper HAL association");    
         return POLICY_FAIL;
@@ -338,22 +353,22 @@ static EndPointPolicyInfoT *PolicySearchEndPoint(EndpointTypeT type, char *pDevi
 }
 
 
-static int PolicyAddEndPoint(StreamInfoT *pStreamInfo)
+static int PolicyAddEndPoint(StreamInterfaceInfoT *pStreamInfo)
 {
-    EndPointPolicyInfoT *pPolicyEndPoint = PolicySearchEndPoint(pStreamInfo->pEndpointInfo->type, pStreamInfo->pEndpointInfo->gsDeviceName);
+    EndPointPolicyInfoT *pPolicyEndPoint = PolicySearchEndPoint(pStreamInfo->endpoint.type, pStreamInfo->endpoint.gsDeviceName);
     if(pPolicyEndPoint == NULL)
     {
         //create EndPoint and add playing stream
         EndPointPolicyInfoT newEndPointPolicyInfo;        
-        newEndPointPolicyInfo.endpointID  = pStreamInfo->pEndpointInfo->endpointID;
-        newEndPointPolicyInfo.type        = pStreamInfo->pEndpointInfo->type;
-        newEndPointPolicyInfo.deviceType  = pStreamInfo->pEndpointInfo->deviceURIType;
-        newEndPointPolicyInfo.pDeviceName = strdup(pStreamInfo->pEndpointInfo->gsDeviceName);
-        newEndPointPolicyInfo.pHalApiName = strdup(pStreamInfo->pEndpointInfo->gsHALAPIName);
-        newEndPointPolicyInfo.iVolume = pStreamInfo->pEndpointInfo->iVolume;
+        newEndPointPolicyInfo.endpointID  = pStreamInfo->endpoint.endpointID;
+        newEndPointPolicyInfo.type        = pStreamInfo->endpoint.type;
+        newEndPointPolicyInfo.deviceType  = pStreamInfo->endpoint.deviceURIType;
+        newEndPointPolicyInfo.pDeviceName = strdup(pStreamInfo->endpoint.gsDeviceName);
+        newEndPointPolicyInfo.pHalApiName = strdup(pStreamInfo->endpoint.gsHALAPIName);
+        newEndPointPolicyInfo.iVolume = pStreamInfo->endpoint.iVolume;
         newEndPointPolicyInfo.streamInfo = g_array_new(FALSE, TRUE, sizeof(StreamPolicyInfoT));;
 
-        if(pStreamInfo->pEndpointInfo->type == ENDPOINTTYPE_SINK)
+        if(pStreamInfo->endpoint.type == ENDPOINTTYPE_SINK)
         {
             g_array_append_val(g_PolicyCtx.pSinkEndpoints, newEndPointPolicyInfo);
         }
@@ -367,7 +382,7 @@ static int PolicyAddEndPoint(StreamInfoT *pStreamInfo)
 }
 
 
-static int PolicyAddStream(EndPointPolicyInfoT *pCurrEndPointPolicy, StreamInfoT *pStreamInfo)
+static int PolicyAddStream(EndPointPolicyInfoT *pCurrEndPointPolicy, StreamInterfaceInfoT *pStreamInfo)
 {
     StreamPolicyInfoT newStreamPolicyInfo;
 
@@ -380,7 +395,7 @@ static int PolicyAddStream(EndPointPolicyInfoT *pCurrEndPointPolicy, StreamInfoT
     return POLICY_SUCCESS;    
 }
 
-static int PolicyRunningIdleTransition(EndPointPolicyInfoT *pCurrEndPointPolicy,StreamInfoT * pStreamInfo)
+static int PolicyRunningIdleTransition(EndPointPolicyInfoT *pCurrEndPointPolicy,StreamInterfaceInfoT * pStreamInfo)
 {
     int err=0;
     if(pCurrEndPointPolicy == NULL || pCurrEndPointPolicy->streamInfo->len == 0)
@@ -418,21 +433,17 @@ static int PolicyRunningIdleTransition(EndPointPolicyInfoT *pCurrEndPointPolicy,
                         }
                         
                         return POLICY_SUCCESS;                                            
-                        break;
                     case INTERRUPTBEHAVIOR_PAUSE:
                         //pInterruptStreamInfo->streamState = STREAM_STATE_RUNNING;
                         PolicyPostStateEvent(HighPriorityStreamInfo.streamID,STREAM_EVENT_RESUME);                        
                         return POLICY_SUCCESS;                                            
-                        break;
 
                     case INTERRUPTBEHAVIOR_CANCEL:
                         PolicyPostStateEvent(HighPriorityStreamInfo.streamID,STREAM_EVENT_START);                        
                         return POLICY_SUCCESS;                                            
-                        break;
                     default:
                         AFB_ERROR("Unsupported Intterupt Behavior");
                         return POLICY_FAIL; 
-                        break;
                 } 
             }            
         }
@@ -440,7 +451,7 @@ static int PolicyRunningIdleTransition(EndPointPolicyInfoT *pCurrEndPointPolicy,
     return POLICY_SUCCESS;
 }
 
-static int PolicyIdleRunningTransition(EndPointPolicyInfoT *pCurrEndPointPolicy, StreamInfoT * pStreamInfo)
+static int PolicyIdleRunningTransition(EndPointPolicyInfoT *pCurrEndPointPolicy, StreamInterfaceInfoT * pStreamInfo)
 {
     int err=0;    
     if(pCurrEndPointPolicy->streamInfo == NULL)
@@ -464,7 +475,7 @@ static int PolicyIdleRunningTransition(EndPointPolicyInfoT *pCurrEndPointPolicy,
             {
                 case INTERRUPTBEHAVIOR_CONTINUE:
                     //Save the current Volume and set the docking volume
-                    pCurrentActiveStreamInfo->iDuckVolume = pStreamInfo->pEndpointInfo->iVolume;
+                    pCurrentActiveStreamInfo->iDuckVolume = pStreamInfo->endpoint.iVolume;
                     StreamConfigT StreamConfig;
                     err = getStreamConfig(pStreamInfo->pRoleName, &StreamConfig);
                     if(err == POLICY_FAIL)
@@ -508,9 +519,7 @@ static int PolicyIdleRunningTransition(EndPointPolicyInfoT *pCurrEndPointPolicy,
             //Higher Priority Stream is playing
             AFB_ERROR("Higher Priority Stream is playing");
             return POLICY_FAIL; 
-        }
-
-                        
+        }                
     }
 
     return POLICY_SUCCESS;
@@ -550,8 +559,11 @@ static void PolicySpeedModify(int speed)
     }
 }
 
-static int RetrieveAssociatedHALAPIName(EndpointInfoT * io_pEndpointInfo)
+static int RetrieveAssociatedHALAPIName(int iAlsaCardNumber,char ** out_pDisplayName,char ** out_pHALName)
 {
+    *out_pDisplayName = NULL;
+    *out_pHALName = NULL;
+
     if(g_PolicyCtx.pHALList)
     {
         for(int i=0; i<g_PolicyCtx.pHALList->len; i++)
@@ -559,17 +571,14 @@ static int RetrieveAssociatedHALAPIName(EndpointInfoT * io_pEndpointInfo)
             HalInfoT *pHalInfo = g_ptr_array_index(g_PolicyCtx.pHALList, i);
             // Retrieve card number (e.g. hw:0)
             int iCardNum = atoi(pHalInfo->pDevID+3);
-            if (iCardNum == io_pEndpointInfo->alsaInfo.cardNum) {
-                io_pEndpointInfo->gsHALAPIName=strdup(pHalInfo->pAPIName);
-                io_pEndpointInfo->gsDisplayName=strdup(pHalInfo->pDisplayName);
+            if (iCardNum == iAlsaCardNumber) {
+                *out_pDisplayName = pHalInfo->pDisplayName;
+                *out_pHALName = pHalInfo->pAPIName;
                 return POLICY_SUCCESS;
             }            
         }
     }
     
-    io_pEndpointInfo->gsHALAPIName=strdup(AHL_POLICY_UNDEFINED_HALNAME);
-    io_pEndpointInfo->gsDisplayName=strdup(AHL_POLICY_UNDEFINED_DISPLAYNAME);
-    
     return POLICY_FAIL;
 }
 
@@ -621,13 +630,11 @@ static int GetHALList(void)
 //
 //  Policy API Functions
 //
-int Policy_OpenStream(json_object *pPolicyStreamJ)
+int Policy_OpenStream(json_object *pStreamJ)
 {
-    StreamInfoT PolicyStream;    
-    EndpointInfoT EndpointInfo;
-    PolicyStream.pEndpointInfo =&EndpointInfo;
+    StreamInterfaceInfoT Stream;    
 
-    int err = PolicyCtxJSONToStream(pPolicyStreamJ, &PolicyStream);
+    int err = JSONToStream(pStreamJ, &Stream);
     if(err == AHL_POLICY_UTIL_FAIL)
     {
         return AHL_POLICY_ACCEPT;     
@@ -641,26 +648,26 @@ int Policy_OpenStream(json_object *pPolicyStreamJ)
     } 
   
     StreamConfigT StreamConfig;
-    err = getStreamConfig(PolicyStream.pRoleName, &StreamConfig);
+    err = getStreamConfig(Stream.pRoleName, &StreamConfig);
     if(err == POLICY_FAIL)
     {
         return AHL_POLICY_ACCEPT;     
     }
 
-    if(PolicyStream.pEndpointInfo->deviceURIType != DEVICEURITYPE_NOT_ALSA) {
-        err=PolicyGetVolume(PolicyStream.pEndpointInfo->endpointID, 
-                            PolicyStream.pEndpointInfo->type,
-                            PolicyStream.pEndpointInfo->gsHALAPIName, 
-                            PolicyStream.pEndpointInfo->pRoleName, 
-                            PolicyStream.pEndpointInfo->deviceURIType, 
-                            &PolicyStream.pEndpointInfo->iVolume);
+    if(Stream.endpoint.deviceURIType != DEVICEURITYPE_NOT_ALSA) {
+        err=PolicyGetVolume(Stream.endpoint.endpointID, 
+                            Stream.endpoint.type,
+                            Stream.endpoint.gsHALAPIName, 
+                            Stream.endpoint.pRoleName, 
+                            Stream.endpoint.deviceURIType, 
+                            &Stream.endpoint.iVolume);
         if(err == POLICY_FAIL)
         {
             return AHL_POLICY_REJECT;
         }
     }
 
-    err = PolicyAddEndPoint(&PolicyStream);
+    err = PolicyAddEndPoint(&Stream);
     if(err == POLICY_FAIL)
     {
         return AHL_POLICY_REJECT;
@@ -668,13 +675,11 @@ int Policy_OpenStream(json_object *pPolicyStreamJ)
     return AHL_POLICY_ACCEPT; 
 }
 
-int Policy_CloseStream(json_object *pPolicyStreamJ)
+int Policy_CloseStream(json_object *pStreamJ)
 {
     //TODO remove Endpoint when there is no stream
-    StreamInfoT PolicyStream;    
-    EndpointInfoT EndpointInfo;
-    PolicyStream.pEndpointInfo =&EndpointInfo;
-    int err = PolicyCtxJSONToStream(pPolicyStreamJ, &PolicyStream);
+    StreamInterfaceInfoT Stream;    
+    int err = JSONToStream(pStreamJ, &Stream);
     if(err == AHL_POLICY_UTIL_FAIL)
     {
         return AHL_POLICY_ACCEPT;     
@@ -683,18 +688,14 @@ int Policy_CloseStream(json_object *pPolicyStreamJ)
     return AHL_POLICY_ACCEPT; 
 }
 
-int  Policy_SetStreamState(json_object *pPolicyStreamJ)
+int  Policy_SetStreamState(json_object *pStreamJ)
 {
     //TODO    
     // Optional: Mute endpoint before activation, unmute afterwards (after a delay?) to avoid noises
-    StreamInfoT PolicyStream;    
-    EndpointInfoT EndpointInfo;
-    PolicyStream.pEndpointInfo =&EndpointInfo;
-
-
     StreamStateT streamState = 0;
-    StreamInfoT * pPolicyStream = &PolicyStream;
-    int err = PolicyCtxJSONToStream(pPolicyStreamJ, pPolicyStream);
+    StreamInterfaceInfoT Stream;
+
+    int err = JSONToStream(pStreamJ, &Stream);
     if(err == AHL_POLICY_UTIL_FAIL)
     {
         return AHL_POLICY_ACCEPT;     
@@ -702,38 +703,38 @@ int  Policy_SetStreamState(json_object *pPolicyStreamJ)
 
     json_object *streamStateJ=NULL;
 
-    if(!json_object_object_get_ex(pPolicyStreamJ, "arg_stream_state", &streamStateJ))
+    if(!json_object_object_get_ex(pStreamJ, "arg_stream_state", &streamStateJ))
     {
         return AHL_POLICY_ACCEPT;     
     }
     streamState = (StreamStateT)json_object_get_int(streamStateJ);
 
     //Change of state
-    if(pPolicyStream->streamState != streamState)
+    if(Stream.streamState != streamState)
     {
         //seach corresponding endpoint and gather information on it        
-        EndPointPolicyInfoT *pCurrEndPointPolicy = PolicySearchEndPoint(pPolicyStream->pEndpointInfo->type , pPolicyStream->pEndpointInfo->gsDeviceName);
+        EndPointPolicyInfoT *pCurrEndPointPolicy = PolicySearchEndPoint(Stream.endpoint.type , Stream.endpoint.gsDeviceName);
     
-        switch(pPolicyStream->streamState)
+        switch(Stream.streamState)
         {
             case STREAM_STATE_IDLE:            
                 switch(streamState)
                 {
                     case STREAM_STATE_RUNNING:
-                        err = PolicyIdleRunningTransition(pCurrEndPointPolicy, pPolicyStream);
+                        err = PolicyIdleRunningTransition(pCurrEndPointPolicy, &Stream);
                         if(err)
                         {
                             return AHL_POLICY_REJECT;  
                         }                        
-                        PolicyPostStateEvent(pPolicyStream->streamID,STREAM_EVENT_START); 
+                        PolicyPostStateEvent(Stream.streamID,STREAM_EVENT_START); 
                         break;
                     case STREAM_STATE_PAUSED:
-                        err = PolicyIdleRunningTransition(pCurrEndPointPolicy, pPolicyStream);
+                        err = PolicyIdleRunningTransition(pCurrEndPointPolicy, &Stream);
                         if(err)
                         {
                             return AHL_POLICY_REJECT;  
                         }  
-                        PolicyPostStateEvent(pPolicyStream->streamID,STREAM_EVENT_PAUSE); 
+                        PolicyPostStateEvent(Stream.streamID,STREAM_EVENT_PAUSE); 
                         break;
                     default:
                         return AHL_POLICY_REJECT;  
@@ -744,15 +745,15 @@ int  Policy_SetStreamState(json_object *pPolicyStreamJ)
                 switch(streamState)
                 {
                     case STREAM_STATE_IDLE:
-                        err = PolicyRunningIdleTransition(pCurrEndPointPolicy, pPolicyStream);
+                        err = PolicyRunningIdleTransition(pCurrEndPointPolicy, &Stream);
                         if(err)
                         {
                             return AHL_POLICY_REJECT;  
                         }                                            
-                        PolicyPostStateEvent(pPolicyStream->streamID,STREAM_EVENT_STOP);                                       
+                        PolicyPostStateEvent(Stream.streamID,STREAM_EVENT_STOP);                                       
                         break;
                     case STREAM_STATE_PAUSED:
-                        PolicyPostStateEvent(pPolicyStream->streamID,STREAM_EVENT_PAUSE);                                       
+                        PolicyPostStateEvent(Stream.streamID,STREAM_EVENT_PAUSE);                                       
                         break;
                     default:
                         return AHL_POLICY_REJECT;  
@@ -763,15 +764,15 @@ int  Policy_SetStreamState(json_object *pPolicyStreamJ)
                 switch(streamState)
                 {
                     case STREAM_STATE_IDLE:
-                        err = PolicyRunningIdleTransition(pCurrEndPointPolicy, pPolicyStream);
+                        err = PolicyRunningIdleTransition(pCurrEndPointPolicy, &Stream);
                         if(err)
                         {
                             return AHL_POLICY_REJECT;  
                         }                        
-                        PolicyPostStateEvent(pPolicyStream->streamID,STREAM_EVENT_STOP);    
+                        PolicyPostStateEvent(Stream.streamID,STREAM_EVENT_STOP);    
                         break;
                     case STREAM_STATE_RUNNING:
-                        PolicyPostStateEvent(pPolicyStream->streamID,STREAM_EVENT_RESUME); 
+                        PolicyPostStateEvent(Stream.streamID,STREAM_EVENT_RESUME); 
                         break;                 
                     default:
                         return AHL_POLICY_REJECT;  
@@ -786,15 +787,13 @@ int  Policy_SetStreamState(json_object *pPolicyStreamJ)
     return AHL_POLICY_ACCEPT; 
 }
 
-int  Policy_SetStreamMute(json_object *pPolicyStreamJ)
+int  Policy_SetStreamMute(json_object *pStreamJ)
 {
     StreamMuteT streamMute = 0;
-    StreamInfoT PolicyStream;    
-    EndpointInfoT EndpointInfo;
-    PolicyStream.pEndpointInfo =&EndpointInfo;
-    StreamInfoT * pPolicyStream = &PolicyStream;
+    
+    StreamInterfaceInfoT Stream;    
 
-    int err = PolicyCtxJSONToStream(pPolicyStreamJ, pPolicyStream);
+    int err = JSONToStream(pStreamJ, &Stream);
     if(err == AHL_POLICY_UTIL_FAIL)
     {
         return AHL_POLICY_ACCEPT;     
@@ -802,61 +801,58 @@ int  Policy_SetStreamMute(json_object *pPolicyStreamJ)
 
     json_object *streamMuteJ=NULL;
 
-    if(!json_object_object_get_ex(pPolicyStreamJ, "mute_state", &streamMuteJ))
+    if(!json_object_object_get_ex(pStreamJ, "mute_state", &streamMuteJ))
     {
         return AHL_POLICY_ACCEPT;     
     }
     streamMute = (StreamMuteT)json_object_get_int(streamMuteJ);
 
-    if(streamMute != pPolicyStream->streamMute)
+    if(streamMute != Stream.streamMute)
     {
         if(streamMute == STREAM_MUTED)
         {
 
-            err= PolicySetVolume(pPolicyStream->pEndpointInfo->endpointID, 
-                                pPolicyStream->pEndpointInfo->type,
-                                pPolicyStream->pEndpointInfo->gsHALAPIName,
-                                pPolicyStream->pRoleName,
-                                pPolicyStream->pEndpointInfo->deviceURIType,
+            err= PolicySetVolume(Stream.endpoint.endpointID, 
+                                Stream.endpoint.type,
+                                Stream.endpoint.gsHALAPIName,
+                                Stream.pRoleName,
+                                Stream.endpoint.deviceURIType,
                                 0,                                    
                                 true);
             if(err)                
             {
-                AFB_ERROR("StreamID:%i Set Volume return with errorcode%i",pPolicyStream->streamID, err);                        
+                AFB_ERROR("StreamID:%i Set Volume return with errorcode%i",Stream.streamID, err);                        
                 return AHL_POLICY_REJECT;  
             }   
-            PolicyPostStateEvent(pPolicyStream->streamID,STREAM_EVENT_MUTED); 
+            PolicyPostStateEvent(Stream.streamID,STREAM_EVENT_MUTED); 
         }
         else
         {
-            err= PolicySetVolume(pPolicyStream->pEndpointInfo->endpointID,
-                                pPolicyStream->pEndpointInfo->type,
-                                pPolicyStream->pEndpointInfo->gsHALAPIName,
-                                pPolicyStream->pRoleName,
-                                pPolicyStream->pEndpointInfo->deviceURIType,                                    
-                                pPolicyStream->pEndpointInfo->iVolume,
+            err= PolicySetVolume(Stream.endpoint.endpointID,
+                                Stream.endpoint.type,
+                                Stream.endpoint.gsHALAPIName,
+                                Stream.pRoleName,
+                                Stream.endpoint.deviceURIType,                                    
+                                Stream.endpoint.iVolume,
                                 true);        
             if(err)                
             {
-                AFB_ERROR("Endpoint:%i Set Volume return with errorcode%i",pPolicyStream->streamID, err);                        
+                AFB_ERROR("Endpoint:%i Set Volume return with errorcode%i",Stream.streamID, err);                        
                 return AHL_POLICY_REJECT;  
             }   
-            PolicyPostStateEvent(pPolicyStream->streamID,STREAM_EVENT_UNMUTED); 
-
+            PolicyPostStateEvent(Stream.streamID,STREAM_EVENT_UNMUTED); 
         }
-
-        pPolicyStream->streamMute = streamMute;
     }
     
     return AHL_POLICY_ACCEPT;
 }
 
-int Policy_SetVolume(json_object *pPolicyEndpointJ)
+int Policy_SetVolume(json_object *pEndpointJ)
 {
     char *volumeStr = NULL;
-    EndpointInfoT EndpointInfo;
+    EndPointInterfaceInfoT Endpoint;
   
-    int err = PolicyCtxJSONToEndpoint(pPolicyEndpointJ, &EndpointInfo);
+    int err = JSONToEndpoint(pEndpointJ, &Endpoint);
     if(err == AHL_POLICY_UTIL_FAIL)
     {
         return AHL_POLICY_ACCEPT;     
@@ -864,7 +860,7 @@ int Policy_SetVolume(json_object *pPolicyEndpointJ)
 
     json_object *volumeJ=NULL;
 
-    if(!json_object_object_get_ex(pPolicyEndpointJ, "arg_volume", &volumeJ))
+    if(!json_object_object_get_ex(pEndpointJ, "arg_volume", &volumeJ))
     {
         return AHL_POLICY_ACCEPT;     
     }
@@ -874,11 +870,11 @@ int Policy_SetVolume(json_object *pPolicyEndpointJ)
     int vol = atoi(volumeStr);
     
     //Set the volume
-    err= PolicySetVolume(EndpointInfo.endpointID, 
-                         EndpointInfo.type,
-                         EndpointInfo.gsHALAPIName,
-                         EndpointInfo.pRoleName,
-                         EndpointInfo.deviceURIType,                            
+    err= PolicySetVolume(Endpoint.endpointID, 
+                         Endpoint.type,
+                         Endpoint.gsHALAPIName,
+                         Endpoint.pRoleName,
+                         Endpoint.deviceURIType,                            
                          vol,
                          false);    
     if (err) 
@@ -890,13 +886,13 @@ int Policy_SetVolume(json_object *pPolicyEndpointJ)
     return AHL_POLICY_ACCEPT; 
 }
 
-int Policy_SetProperty(json_object *pPolicyEndpointJ)
+int Policy_SetProperty(json_object *pEndpointJ)
 {
 
     char *propertyName = NULL;
-    EndpointInfoT EndpointInfo;
+    EndPointInterfaceInfoT Endpoint;
 
-    int err = PolicyCtxJSONToEndpoint(pPolicyEndpointJ, &EndpointInfo);
+    int err = JSONToEndpoint(pEndpointJ, &Endpoint);
     if(err == AHL_POLICY_UTIL_FAIL)
     {
         return AHL_POLICY_ACCEPT;     
@@ -904,49 +900,76 @@ int Policy_SetProperty(json_object *pPolicyEndpointJ)
 
     json_object *propertyNameJ=NULL;
 
-    if(!json_object_object_get_ex(pPolicyEndpointJ, "arg_property_name", &propertyNameJ))
+    if(!json_object_object_get_ex(pEndpointJ, "arg_property_name", &propertyNameJ))
     {
         return AHL_POLICY_ACCEPT;     
     }
     propertyName = (char*)json_object_get_string(propertyNameJ);
 
     json_object *propValueJ;
-    if(!json_object_object_get_ex(pPolicyEndpointJ, "arg_property_value", &propValueJ))
+    if(!json_object_object_get_ex(pEndpointJ, "arg_property_value", &propValueJ))
     {
         return AHL_POLICY_ACCEPT;     
     }
+    json_type currentTypeJ = json_object_get_type(propValueJ);
 
-    gpointer *key_value=NULL;
-
-    key_value = g_hash_table_lookup(EndpointInfo.pPropTable,propertyName);
-    if(key_value == NULL)
+    json_object *propArray;
+    if(!json_object_object_get_ex(pEndpointJ, "properties", &propArray))
     {
-        AFB_ERROR("Can't find property %s, request will be rejected", propertyName);
-        return AHL_POLICY_REJECT; 
+        return AHL_POLICY_ACCEPT;     
     }
 
-    //Get JsonObjectype
-    json_type currentjType = json_object_get_type((json_object*)key_value);
-    json_type newjType = json_object_get_type(propValueJ);
-
-    //Apply policy on set property if needed here
-    //Here we only validate that the type is the same
-    if(currentjType != newjType)
+    int iPropArrayLen = json_object_array_length(propArray);        
+    int foundProperty = 0;
+    
+    for (int i = 0; i < iPropArrayLen; i++) 
     {
-        AFB_ERROR("Property Value Type is wrong");
-        return AHL_POLICY_REJECT; 
+        // get the i-th object in medi_array
+        json_object *propElementJ = json_object_array_get_idx(propArray, i);
+        if(propElementJ)
+        {
+            json_object *propElementNameJ=NULL;
+            if(json_object_object_get_ex(propElementJ, "property_name", &propElementNameJ))
+            {
+                char *propElementName = (char*)json_object_get_string(propElementNameJ);   
+                if(strcasecmp(propElementName,propertyName)==0)         
+                {
+                    json_object *propElementValueJ=NULL;
+                    if(!json_object_object_get_ex(propElementJ, "property_value", &propElementValueJ))
+                    {
+                        //Get JsonObjectype
+                        json_type elementTypeJ = json_object_get_type(propElementValueJ);
+
+                        //Apply policy on set property if needed here
+                        //Here we only validate that the type is the same
+                        if(currentTypeJ != elementTypeJ)
+                        {
+                            AFB_ERROR("Property Value Type is wrong");
+                            return AHL_POLICY_REJECT; 
+                        }
+                        foundProperty = 1;
+                        break;   
+                    }
+                }
+            }                        
+        }
     }
 
+    if(foundProperty== 0)
+    {
+        AFB_ERROR("Can't find property %s, request will be rejected", propertyName);
+        return AHL_POLICY_REJECT;  
+    }
 
     //Create a new Json Object    
     json_object *pEventDataJ = NULL;
     err = wrap_json_pack(&pEventDataJ,"{s:s,s:i,s:i,s:s,s:o,s:s}",
                         "event_name", AHL_ENDPOINT_PROPERTY_EVENT,
-                        "endpoint_id", EndpointInfo.endpointID, 
-                        "endpoint_type", EndpointInfo.type,
+                        "endpoint_id", Endpoint.endpointID, 
+                        "endpoint_type", Endpoint.type,
                         "property_name", propertyName,
                         "value",propValueJ, 
-                        "audio_role", EndpointInfo.pRoleName);
+                        "audio_role", Endpoint.pRoleName);
     if(err)
     {
         AFB_ERROR("Unable to pack property event");        
@@ -988,67 +1011,95 @@ int Policy_PostAction(json_object *pPolicyActionJ)
     return AHL_POLICY_ACCEPT;
 }
 
-int Policy_Endpoint_Init(json_object *pPolicyEndpointJ)
+int Policy_Endpoint_Init(json_object *pInPolicyEndpointJ,json_object **pOutPolicyEndpointJ)
 {
-    EndpointInfoT EndpointInfo;
-  
-    int err = PolicyCtxJSONToEndpoint(pPolicyEndpointJ, &EndpointInfo);
-    if(err == AHL_POLICY_UTIL_FAIL)
-    {
-        return AHL_POLICY_REJECT;     
+    endpointID_t endpointID = AHL_UNDEFINED;
+    EndpointTypeT endpointType = ENDPOINTTYPE_MAXVALUE;
+    DeviceURITypeT deviceURIType = DEVICEURITYPE_MAXVALUE;
+    char * pRoleName = NULL;
+    int iAlsaCardNumber = AHL_UNDEFINED;
+    char * pDeviceName = NULL;
+    int err = wrap_json_unpack(pInPolicyEndpointJ,"{s:i,s:i,s:i,s:s,s:i,s:s}",
+                            "endpoint_id",&endpointID,
+                            "endpoint_type",&endpointType,
+                            "device_uri_type",&deviceURIType,
+                            "audio_role",&pRoleName,
+                            "alsa_cardNum", &iAlsaCardNumber,
+                            "device_name", &pDeviceName ); 
+    if (err) {
+        AFB_ERROR("Unable to unpack JSON endpoint, =%s", wrap_json_get_error_string(err));
+        return AHL_POLICY_REJECT;
     }
 
-    if (EndpointInfo.deviceURIType != DEVICEURITYPE_NOT_ALSA) {
+    StreamConfigT StreamConfig;
+    getStreamConfig(pRoleName, &StreamConfig);
+
+    char * pDisplayName = NULL;
+    char * pHALName = NULL;
+    int iAllocString = 0;
+    if (deviceURIType != DEVICEURITYPE_NOT_ALSA) {
         // Update Hal Name
-        err = RetrieveAssociatedHALAPIName(&EndpointInfo);
+
+        err = RetrieveAssociatedHALAPIName(iAlsaCardNumber,&pDisplayName,&pHALName);
         if (err) {
-            AFB_ERROR("HAL not found for Device %s", EndpointInfo.gsDeviceName);
-            return AHL_POLICY_REJECT;     
+            AFB_WARNING("HAL not found for Device %s", pDeviceName);            
+            pDisplayName = g_strdup(AHL_POLICY_UNDEFINED_DISPLAYNAME);
+            pHALName = g_strdup(AHL_POLICY_UNDEFINED_HALNAME);
+            iAllocString = 1;
         }
-
-        //Set Init Volume
-        StreamConfigT StreamConfig;
-        getStreamConfig(EndpointInfo.pRoleName, &StreamConfig);
-        err = PolicySetVolume(EndpointInfo.endpointID, 
-                            EndpointInfo.type,
-                            EndpointInfo.gsHALAPIName, 
-                            EndpointInfo.pRoleName, 
-                            EndpointInfo.deviceURIType, 
-                            StreamConfig.iVolumeInit,
-                            false);
-        if(err) {                                
-            return AHL_POLICY_REJECT;     
+        else
+        {
+            //Set Init Volume
+            err = PolicySetVolume(endpointID, 
+                                endpointType,
+                                pHALName, 
+                                pRoleName, 
+                                deviceURIType, 
+                                StreamConfig.iVolumeInit,
+                                true); // Do not raise event and no volume ramp
+            if(err) {                                
+                return AHL_POLICY_REJECT;     
+            }
         }
     }
-
-    // Test example
-    Add_Endpoint_Property_Int(&EndpointInfo,AHL_PROPERTY_EQ_LOW,3);
-    Add_Endpoint_Property_Int(&EndpointInfo,AHL_PROPERTY_EQ_MID,0);
-    Add_Endpoint_Property_Int(&EndpointInfo,AHL_PROPERTY_EQ_HIGH,6);
-    Add_Endpoint_Property_Int(&EndpointInfo,AHL_PROPERTY_BALANCE,0);
-    Add_Endpoint_Property_Int(&EndpointInfo,AHL_PROPERTY_FADE,30);
-    Add_Endpoint_Property_String(&EndpointInfo,"preset_name","flat");
+    else {
+        // Set display / HAL for non ALSA devices (default)
+        pDisplayName = g_strdup(AHL_POLICY_UNDEFINED_DISPLAYNAME);
+        pHALName = g_strdup(AHL_POLICY_UNDEFINED_HALNAME);
+        iAllocString = 1;
+    }
 
 
-    gpointer *key_value = g_hash_table_lookup(EndpointInfo.pPropTable,AHL_PROPERTY_BALANCE);
-    if(key_value == NULL)
-    {
-        AFB_ERROR("Can't find property %s, request will be rejected", AHL_PROPERTY_BALANCE);
-        return AHL_POLICY_REJECT; 
+    // Populate special device property (TODO: Should be obtained from HAL)
+    // if (strcasecmp(gsHALAPIName,"Device")==0)
+    // {
+            // Create json object for PropTable
+            json_object *pPropTableJ = json_object_new_array();
+            Add_Endpoint_Property_Int(pPropTableJ,AHL_PROPERTY_EQ_LOW,3);
+            Add_Endpoint_Property_Int(pPropTableJ,AHL_PROPERTY_EQ_MID,0);
+            Add_Endpoint_Property_Int(pPropTableJ,AHL_PROPERTY_EQ_HIGH,6);
+            Add_Endpoint_Property_Int(pPropTableJ,AHL_PROPERTY_BALANCE,0);
+            Add_Endpoint_Property_Int(pPropTableJ,AHL_PROPERTY_FADE,30);
+            Add_Endpoint_Property_String(pPropTableJ,"preset_name","flat");
+    // }
+ 
+    err = wrap_json_pack(pOutPolicyEndpointJ,"{s:i,s:s,s:s,s:o}",
+                    "init_volume",StreamConfig.iVolumeInit,
+                    "display_name",pDisplayName,
+                    "hal_name",pHALName,
+                    "property_table",pPropTableJ
+                    );
+    if (err) {
+        AFB_ERROR("Unable to pack JSON endpoint, =%s", wrap_json_get_error_string(err));
+        return AHL_POLICY_REJECT;
     }
 
-    //Create a new Json Object
-    json_object *pNewPolicyEndpointJ = NULL;
-    err = PolicyEndpointStructToJSON(&EndpointInfo, &pNewPolicyEndpointJ);
-    if (err == AHL_POLICY_UTIL_FAIL)
-    {
-        return AHL_POLICY_REJECT;
-    } 
-    json_object *paramJ= json_object_new_string(AHL_ENDPOINT_INIT_EVENT);
-    json_object_object_add(pNewPolicyEndpointJ, "event_name", paramJ);
+    if (iAllocString) {
+        g_free(pDisplayName);
+        g_free(pHALName);
+    }
 
-    //Raise Event to update HLB
-    audiohlapi_raise_event(pNewPolicyEndpointJ);
+    // TODO: Future policy binding to return request response with pOutPolicyEndpointJ
 
     return AHL_POLICY_ACCEPT; // No errors
 }
diff --git a/src/ahl-policy.h b/src/ahl-policy.h
index 66615e6..b46bbb9 100644
--- a/src/ahl-policy.h
+++ b/src/ahl-policy.h
@@ -20,14 +20,21 @@
 
 #ifndef AHL_DISCONNECT_POLICY
 
-int  Policy_Endpoint_Init(json_object *pPolicyEndpointJ);
-int  Policy_OpenStream(json_object *pPolicyStreamJ);
-int  Policy_CloseStream(json_object *pPolicyStreamJ);
-int  Policy_SetStreamState(json_object *pPolicyStreamJ);
-int  Policy_SetStreamMute(json_object *pPolicyStreamJ);
-int  Policy_PostAction(json_object *pPolicyActionJ);
-int  Policy_SetVolume(json_object *pPolicyEndpointJ);
-int  Policy_SetProperty(json_object *pPolicyEndpointJ);
+#define MAX_ACTIVE_STREAM_POLICY 30
+#define POLICY_FAIL     1
+#define POLICY_SUCCESS  0
+
+#define AHL_POLICY_UNDEFINED_HALNAME "UNDEFINED"
+#define AHL_POLICY_UNDEFINED_DISPLAYNAME "DeviceNotFound"
+
+int  Policy_Endpoint_Init(json_object *pInPolicyEndpointJ,json_object **pOutPolicyEndpointJ);
+int  Policy_OpenStream(json_object *pStreamJ);
+int  Policy_CloseStream(json_object *pStreamJ);
+int  Policy_SetStreamState(json_object *pStreamJ);
+int  Policy_SetStreamMute(json_object *pStreamJ);
+int  Policy_PostAction(json_object *pActionJ);
+int  Policy_SetVolume(json_object *pEndpointJ);
+int  Policy_SetProperty(json_object *pEndpointJ);
 int  Policy_Init();
 void Policy_Term(); 
 void Policy_OnEvent(const char *evtname, json_object *eventJ);
diff --git a/src/ahl-policyJSON.c b/src/ahl-policyJSON.c
new file mode 100644
index 0000000..1fdf2d9
--- /dev/null
+++ b/src/ahl-policyJSON.c
@@ -0,0 +1,307 @@
+/*
+ * Copyright (C) 2017 "Audiokinetic Inc"
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "wrap-json.h"
+#include <json-c/json.h>
+#include <glib.h>
+#include "ahl-policy-utils.h"
+#include "ahl-interface.h"
+#include "ahl-binding.h"
+
+static char * DeviceURITypeEnumToStr(DeviceURITypeT in_eDeviceURIType) {
+    switch(in_eDeviceURIType) {
+        case DEVICEURITYPE_ALSA_HW:  // Alsa hardware device URI
+            return AHL_DEVICEURITYPE_ALSA_HW;
+        case DEVICEURITYPE_ALSA_DMIX:    // Alsa Dmix device URI (only for playback devices)
+            return AHL_DEVICEURITYPE_ALSA_DMIX;
+        case DEVICEURITYPE_ALSA_DSNOOP:  // Alsa DSnoop device URI (only for capture devices)
+            return AHL_DEVICEURITYPE_ALSA_DSNOOP;
+        case DEVICEURITYPE_ALSA_SOFTVOL: // Alsa softvol device URI
+            return AHL_DEVICEURITYPE_ALSA_SOFTVOL;
+        case DEVICEURITYPE_ALSA_PLUG:    // Alsa plug device URI
+            return AHL_DEVICEURITYPE_ALSA_PLUG;
+        case DEVICEURITYPE_ALSA_OTHER:   // Alsa domain URI device of unspecified type
+            return AHL_DEVICEURITYPE_ALSA_OTHER;
+        case DEVICEURITYPE_NOT_ALSA:     // Unknown (not ALSA domain)
+            return AHL_DEVICEURITYPE_NOT_ALSA;
+        default:
+            return "Unknown";
+    }
+}
+
+static char * StreamStateEnumToStr(StreamStateT in_eStreamState) {
+    switch(in_eStreamState) {
+        case STREAM_STATE_IDLE:
+            return AHL_STREAM_STATE_IDLE;
+        case STREAM_STATE_RUNNING: 
+            return AHL_STREAM_STATE_RUNNING;
+        case STREAM_STATE_PAUSED: 
+            return AHL_STREAM_STATE_PAUSED;
+        default:
+            return "Unknown";
+    }
+}
+
+static char * StreamMuteEnumToStr(StreamMuteT in_eStreamMute) {
+    switch(in_eStreamMute) {
+        case STREAM_UNMUTED: 
+            return AHL_STREAM_UNMUTED;
+        case STREAM_MUTED: 
+            return AHL_STREAM_MUTED;
+        default:
+            return "Unknown";
+    }
+}
+
+static int EndpointPropTableToJSON(GHashTable * pPropTable, json_object **ppProptableJ)
+{
+    if(pPropTable == NULL)
+    {
+        AFB_ERROR("Invalid EndpointPropTableToJSON arguments");
+        return AHL_FAIL;
+    } 
+
+    // Create json object for PropTable
+    *ppProptableJ = json_object_new_array();     
+    GHashTableIter iter;
+    gpointer key, value;
+    g_hash_table_iter_init (&iter, pPropTable);
+    while (g_hash_table_iter_next (&iter, &key, &value))
+    {
+        if ( key != NULL && value != NULL) {
+            json_object *pPropertyJ = NULL;
+            json_object_get(value);
+            int err = wrap_json_pack(&pPropertyJ, "{s:s,s:o}",
+                        "property_name", (char*)key, 
+                        "property_value", value                  
+                        );
+            if(err)                    
+            {
+                AFB_ERROR("Unable to pack JSON endpoint, =%s", wrap_json_get_error_string(err));   
+                return AHL_FAIL;             
+            }        
+            json_object_array_add(*ppProptableJ, pPropertyJ);
+        }
+    }
+
+    return AHL_SUCCESS;
+}
+
+int EndpointInfoToJSON(EndpointInfoT * pEndpointInfo, json_object **ppEndpointInfoJ)
+{
+    if(pEndpointInfo == NULL || pEndpointInfo->pPropTable == NULL)
+    {
+        AFB_ERROR("Invalid EndpointInfoToJSON arguments");
+        return AHL_FAIL;
+    } 
+
+    json_object * pPropTableJ = NULL;
+    int err = EndpointPropTableToJSON(pEndpointInfo->pPropTable,&pPropTableJ);
+    if (err) {
+        return AHL_FAIL;
+    }
+
+    // Create json object for EndpointInfo
+    err = wrap_json_pack(ppEndpointInfoJ, "{s:i,s:i,s:s,s:s,s:s,s:s,s:s,s:i,s:s,s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:o}",
+                    "endpoint_id", pEndpointInfo->endpointID, 
+                    "endpoint_type", pEndpointInfo->type,
+                    "device_name", pEndpointInfo->gsDeviceName, 
+                    "display_name", pEndpointInfo->gsDisplayName, 
+                    "device_uri",  pEndpointInfo->gsDeviceURI,
+                    "device_domain", pEndpointInfo->gsDeviceDomain,
+                    "audio_role",pEndpointInfo->pRoleName,
+                    "device_uri_type", pEndpointInfo->deviceURIType,
+                    "hal_api_name", pEndpointInfo->gsHALAPIName,
+                    "alsa_cardNum", pEndpointInfo->alsaInfo.cardNum, 
+                    "alsa_deviceNum", pEndpointInfo->alsaInfo.deviceNum, 
+                    "alsa_subDeviceNum", pEndpointInfo->alsaInfo.subDeviceNum,
+                    "format_samplerate", pEndpointInfo->format.sampleRate,
+                    "format_numchannels", pEndpointInfo->format.numChannels,
+                    "format_sampletype",pEndpointInfo->format.sampleType,
+                    "volume", pEndpointInfo->iVolume,
+                    "property_table", pPropTableJ
+                    );
+    if (err) {
+        AFB_ERROR("Unable to pack JSON endpoint, =%s", wrap_json_get_error_string(err));
+        return AHL_FAIL;
+    }    
+
+    return AHL_SUCCESS;
+}
+
+int StreamInfoToJSON(StreamInfoT * pStreamInfo, json_object **ppStreamInfoJ)
+{
+    if(pStreamInfo == NULL)
+    {
+        AFB_ERROR("Invalid arguments to StreamInfoToJSON");
+        return AHL_FAIL;
+    }
+
+    json_object * pEndpointInfoJ = NULL;
+    int err = EndpointInfoToJSON(pStreamInfo->pEndpointInfo, &pEndpointInfoJ);
+    if (err) {
+        return AHL_FAIL;
+    }
+
+    // Create json object for stream
+    err = wrap_json_pack(ppStreamInfoJ, "{s:i,s:i,s:i,s:I,s:i,s:s,s:i,s:i,s:o}",
+                    "stream_id", pStreamInfo->streamID, 
+                    "stream_state", pStreamInfo->streamState,
+                    "stream_mute", pStreamInfo->streamMute, 
+                    "stream_state_event", &pStreamInfo->streamStateEvent, 
+                    "endpoint_sel_mod",  pStreamInfo->endpointSelMode,
+                    "role_name", pStreamInfo->pRoleName,
+                    "priority", pStreamInfo->iPriority,
+                    "interrupt_behavior", pStreamInfo->eInterruptBehavior,
+                    "endpoint_info", pEndpointInfoJ
+                    );
+    if (err) {
+        AFB_ERROR("Unable to pack JSON endpoint, =%s", wrap_json_get_error_string(err));
+        return AHL_FAIL;
+    }
+
+    return AHL_SUCCESS;
+}
+
+static int UpdatePropertyList(GHashTable * pPropTable, json_object * pPropTableJ) {
+    if (pPropTable == NULL || pPropTableJ == NULL) {
+        AFB_ERROR("Invalid arguments to UpdatePropertyList");
+        return AHL_FAIL;
+    }
+    // Unpack prop table
+    int nbProperties = json_object_array_length(pPropTableJ);
+    for(int i = 0; i < nbProperties; i++)
+    {
+        json_object * propJ = json_object_array_get_idx(pPropTableJ,i);
+        if (propJ) {
+            char * pPropertyName = NULL;
+            json_object * pPropertyValueJ = NULL;
+            int err = wrap_json_unpack(propJ, "{s:s,s:o}",
+                                    "property_name", &pPropertyName, 
+                                    "property_value", &pPropertyValueJ);
+            if (err) {
+                AFB_ERROR("Unable to unpack JSON property, = %s", wrap_json_get_error_string(err));
+                return AHL_FAIL;
+            }        
+
+            // Object type detection for property value (string = state, numeric = property)
+            json_type jType = json_object_get_type(pPropertyValueJ);
+            switch (jType) {
+                case json_type_double:
+                    g_hash_table_insert(pPropTable, pPropertyName, json_object_new_double(json_object_get_double(pPropertyValueJ)));
+                    break;
+                case json_type_int:
+                    g_hash_table_insert(pPropTable, pPropertyName, json_object_new_int(json_object_get_int(pPropertyValueJ)));
+                    break;
+                case json_type_string:
+                    g_hash_table_insert(pPropTable, pPropertyName, json_object_new_string(json_object_get_string(pPropertyValueJ)));
+                    break;
+                default:
+                    AFB_ERROR("Invalid property argument Property value not a valid json object query=%s", json_object_get_string(pPropertyValueJ));
+                    return AHL_FAIL;
+            }
+        }
+    }
+
+    return AHL_SUCCESS;
+}
+
+int UpdateEndpointInfo(EndpointInfoT * pEndpoint, json_object * pEndpointInfoJ) {
+
+    if(pEndpoint == NULL || pEndpointInfoJ == NULL)
+    {
+        AFB_ERROR("Invalid arguments to UpdateEndpointInfo");
+        return AHL_FAIL;
+    }
+
+     // Push information to endpoint info struct
+    json_object * pPropTableJ = NULL;
+    char * pDisplayName = NULL;
+    char * pHALName = NULL;
+    int err = wrap_json_unpack(pEndpointInfoJ,"{s:i,s:s,s:s,s:o}",
+                        "init_volume",&pEndpoint->iVolume,
+                        "display_name",&pDisplayName,
+                        "hal_name", &pHALName,
+                        "property_table",&pPropTableJ);
+    if (err) {
+        AFB_ERROR("Unable to create Endpoint Json object error:%s ",wrap_json_get_error_string(err));
+        return AHL_FAIL;
+    }
+    g_strlcpy(pEndpoint->gsDisplayName,pDisplayName,AHL_STR_MAX_LENGTH);
+    g_strlcpy(pEndpoint->gsHALAPIName,pHALName,AHL_STR_MAX_LENGTH);
+
+    if (pEndpoint->pPropTable && pPropTableJ) {
+        err = UpdatePropertyList(pEndpoint->pPropTable,pPropTableJ);
+        if (err) {
+            AFB_ERROR("Unable to update property table Json object error:%s ",wrap_json_get_error_string(err));
+            return AHL_FAIL;
+        }
+    }
+
+    return AHL_SUCCESS;
+}
+
+static void AudioFormatStructToJSON(json_object **audioFormatJ, AudioFormatT * pAudioFormat)
+{
+    wrap_json_pack(audioFormatJ, "{s:i,s:i,s:i}",
+                    "sample_rate", pAudioFormat->sampleRate, 
+                    "num_channels", pAudioFormat->numChannels, 
+                    "sample_type", pAudioFormat->sampleType);
+}
+
+// Package only information that can useful to application clients when selecting endpoint
+void JSONPublicPackageEndpoint(EndpointInfoT * pEndpointInfo,json_object **endpointInfoJ)
+{
+    json_object *formatInfoJ = NULL;
+    int err = wrap_json_pack(endpointInfoJ, "{s:i,s:s,s:s,s:s,s:s,s:s,s:s}",
+                    "endpoint_id", pEndpointInfo->endpointID, 
+                    "endpoint_type", (pEndpointInfo->type == ENDPOINTTYPE_SOURCE) ? AHL_ENDPOINTTYPE_SOURCE : AHL_ENDPOINTTYPE_SINK,
+                    "device_name", pEndpointInfo->gsDeviceName, 
+                    "display_name", pEndpointInfo->gsDisplayName,
+                    "audio_role", pEndpointInfo->pRoleName,
+                    "device_domain",pEndpointInfo->gsDeviceDomain,
+                    "device_uri_type", DeviceURITypeEnumToStr(pEndpointInfo->deviceURIType));
+    if(err)
+    {
+        AFB_NOTICE("Content object=%s", json_object_get_string(*endpointInfoJ));                            
+    }
+    
+    AudioFormatStructToJSON(&formatInfoJ,&pEndpointInfo->format);
+    json_object_object_add(*endpointInfoJ,"format",formatInfoJ);
+
+    json_object *pPropTableJ = NULL;
+    EndpointPropTableToJSON(pEndpointInfo->pPropTable,&pPropTableJ);
+    json_object_object_add(*endpointInfoJ,"properties",pPropTableJ);
+}
+ 
+// Package only information that can useful to application clients when opening a stream
+void JSONPublicPackageStream(StreamInfoT * pStreamInfo,json_object **streamInfoJ)
+{
+    json_object *endpointInfoJ = NULL;
+    JSONPublicPackageEndpoint(pStreamInfo->pEndpointInfo,&endpointInfoJ);
+    int err = wrap_json_pack(streamInfoJ, "{s:i,s:s,s:s,s:s}", 
+        "stream_id", pStreamInfo->streamID,
+        "state", StreamStateEnumToStr(pStreamInfo->streamState),
+        "mute", StreamMuteEnumToStr(pStreamInfo->streamMute),   
+        "device_uri",pStreamInfo->pEndpointInfo->gsDeviceURI); // Need to open a stream to have access to the device URI
+    
+    if(err)
+    {
+        AFB_NOTICE("Content object=%s", json_object_get_string(*streamInfoJ));        
+    }
+
+    json_object_object_add(*streamInfoJ,"endpoint_info",endpointInfoJ);
+}
\ No newline at end of file
diff --git a/src/ahl-policyJSON.h b/src/ahl-policyJSON.h
new file mode 100644
index 0000000..c651f79
--- /dev/null
+++ b/src/ahl-policyJSON.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2017 "Audiokinetic Inc"
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef AHL_POLICY_JSON_INCLUDE
+#define AHL_POLICY_JSON_INCLUDE
+
+#include <json-c/json.h>
+#include <afb/afb-binding.h>
+#include "ahl-policy-utils.h" // TODO: Should remigrate AHL structures to binding.h
+
+int EndpointInfoToJSON(EndpointInfoT * pEndpointInfo, json_object **ppEndpointInfoJ);
+int StreamInfoToJSON(StreamInfoT * pStreamInfo, json_object **ppStreamInfoJ);
+int UpdateEndpointInfo(EndpointInfoT * pEndpoint,json_object * pEndpointInfoJ);
+void JSONPublicPackageEndpoint(EndpointInfoT * pEndpointInfo,json_object **endpointInfoJ);
+void JSONPublicPackageStream(StreamInfoT * pStreamInfo,json_object **streamInfoJ);
+
+#endif // AHL_POLICY_JSON_INCLUDE