diff --git a/.gitignore b/.gitignore
index adcfda37f4..304b42c1f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,10 +70,12 @@ config.status
 configure.lineno
 /freeswitch
 /fs_cli
+/fs_encode
 /fs_ivrd
 /libtool
 /modules.conf
 /quiet_libtool
+/tone2wav
 /scripts/fsxs
 /scripts/gentls_cert
 /a.out.dSYM
diff --git a/Freeswitch.2010.sln b/Freeswitch.2010.sln
index 5722802839..186969891a 100644
--- a/Freeswitch.2010.sln
+++ b/Freeswitch.2010.sln
@@ -942,11 +942,13 @@ Global
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|Win32.Build.0 = Debug|Win32
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|x64.ActiveCfg = Debug|x64
+		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|x64.Build.0 = Debug|x64
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|x64 Setup.ActiveCfg = Debug|x64
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|Win32.ActiveCfg = Release|Win32
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|Win32.Build.0 = Release|Win32
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|x64.ActiveCfg = Release|x64
+		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|x64.Build.0 = Release|x64
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|x64 Setup.ActiveCfg = Release|x64
 		{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{692F6330-4D87-4C82-81DF-40DB5892636E}.All|Win32.ActiveCfg = Release|x64
@@ -1442,11 +1444,13 @@ Global
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|Win32.Build.0 = Debug|Win32
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|x64.ActiveCfg = Debug|x64
+		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|x64.Build.0 = Debug|x64
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|x64 Setup.ActiveCfg = Debug|x64
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|Win32.ActiveCfg = Release|Win32
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|Win32.Build.0 = Release|Win32
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|x64.ActiveCfg = Release|x64
+		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|x64.Build.0 = Release|x64
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|x64 Setup.ActiveCfg = Release|x64
 		{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.All|Win32.ActiveCfg = Release|x64
@@ -1458,11 +1462,13 @@ Global
 		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|Win32.Build.0 = Debug|Win32
 		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|x64.ActiveCfg = Debug|x64
+		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|x64.Build.0 = Debug|x64
 		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|x64 Setup.ActiveCfg = Debug|x64
 		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|Win32.ActiveCfg = Release|Win32
 		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|Win32.Build.0 = Release|Win32
 		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|x64.ActiveCfg = Release|x64
+		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|x64.Build.0 = Release|x64
 		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|x64 Setup.ActiveCfg = Release|x64
 		{8F992C49-6C51-412F-B2A3-34EAB708EB65}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{4043FC6A-9A30-4577-8AD5-9B233C9575D8}.All|Win32.ActiveCfg = Release|x64
@@ -1510,11 +1516,13 @@ Global
 		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|Win32.Build.0 = Debug|Win32
 		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|x64.ActiveCfg = Debug|x64
+		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|x64.Build.0 = Debug|x64
 		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|x64 Setup.ActiveCfg = Debug|x64
 		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|Win32.ActiveCfg = Release|Win32
 		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|Win32.Build.0 = Release|Win32
 		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|x64.ActiveCfg = Release|x64
+		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|x64.Build.0 = Release|x64
 		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|x64 Setup.ActiveCfg = Release|x64
 		{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4}.All|Win32.ActiveCfg = Release|x64
@@ -1670,11 +1678,13 @@ Global
 		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|Win32.ActiveCfg = Debug|Win32
 		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|Win32.Build.0 = Debug|Win32
 		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x64.ActiveCfg = Debug|x64
+		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x64.Build.0 = Debug|x64
 		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x64 Setup.ActiveCfg = Debug|x64
 		{028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|Win32.ActiveCfg = Release|Win32
 		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|Win32.Build.0 = Release|Win32
 		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x64.ActiveCfg = Release|x64
+		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x64.Build.0 = Release|x64
 		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x64 Setup.ActiveCfg = Release|x64
 		{028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{D7F1E3F2-A3F4-474C-8555-15122571AF52}.All|Win32.ActiveCfg = Release|x64
@@ -1938,11 +1948,13 @@ Global
 		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|Win32.ActiveCfg = Debug|Win32
 		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|Win32.Build.0 = Debug|Win32
 		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|x64.ActiveCfg = Debug|x64
+		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|x64.Build.0 = Debug|x64
 		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|x64 Setup.ActiveCfg = Debug|x64
 		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Debug|x86 Setup.ActiveCfg = Debug|Win32
 		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|Win32.ActiveCfg = Release|Win32
 		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|Win32.Build.0 = Release|Win32
 		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|x64.ActiveCfg = Release|x64
+		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|x64.Build.0 = Release|x64
 		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|x64 Setup.ActiveCfg = Release|x64
 		{36E854E3-CE12-4348-A125-CCF3F9D74813}.Release|x86 Setup.ActiveCfg = Release|Win32
 		{7B077E7F-1BE7-4291-AB86-55E527B25CAC}.All|Win32.ActiveCfg = Release|x64
diff --git a/Makefile.am b/Makefile.am
index 944511dac9..e701494a2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,6 +90,8 @@ $(RECURSIVE_TARGETS):
 	fi; \
 	if test -z "$$fail" ; then \
 	   cd $(top_builddir)/build && $(MAKE) $(AM_MAKEFLAGS) $$target || exit 1; \
+	else \
+	   exit 1; \
 	fi ;
 
 CORE_CFLAGS  = `$(switch_builddir)/libs/apr/apr-1-config --cflags --cppflags --includes`
@@ -374,7 +376,7 @@ src/include/switch_version.h: src/include/switch_version.h.in .version $(libfree
 	  touch .version ; \
 	else \
 	  if [ -d .git ] ; then \
-	    version=`git log --format="%h %ci" -1 HEAD | head -1 | sed -e 's|:|-|g' || echo hacked` ; \
+	    version=`git log --pretty=format:"%h %ci" -1 HEAD | head -1 | sed -e 's|:|-|g' || echo hacked` ; \
 	    if [ "x$$version" = "xhacked" ] ; then \
 	      version="hacked-`date -u +%Y%m%dT%H%M%SZ`" ; \
 	    else \
diff --git a/build/Makefile.am b/build/Makefile.am
index 4b426ef6e3..1d57dad528 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -6,8 +6,13 @@ all:
 	@echo " + Install by running:                           +"
 	@echo " +                                               +"
 	@echo " +               $(MK) install                   +"
+	@echo " +                                               +"
+	@echo " + While you're waiting, register for ClueCon!   +"
+	@echo " + http://www.cluecon.com                        +"
+	@echo " +                                               +"
 	@echo " +-----------------------------------------------+"
 
+
 install:
 	@echo " +---------- FreeSWITCH install Complete ----------+"
 	@echo " + FreeSWITCH has been successfully installed.     +"
diff --git a/build/modules.conf.in b/build/modules.conf.in
index 37244a188a..13e655672c 100644
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@ -62,6 +62,7 @@ endpoints/mod_loopback
 #endpoints/mod_skinny
 #endpoints/mod_skypopen
 #endpoints/mod_h323
+#endpoints/mod_khomp
 #../../libs/openzap/mod_openzap
 #../../libs/freetdm/mod_freetdm
 #asr_tts/mod_unimrcp
@@ -105,5 +106,4 @@ say/mod_say_ru
 #say/mod_say_th
 
 ## Experimental Modules (don't cry if they're broken)
-#endpoints/mod_khomp
 #../../contrib/mod/xml_int/mod_xml_odbc
diff --git a/conf/autoload_configs/modules.conf.xml b/conf/autoload_configs/modules.conf.xml
index f5627fe965..118d7c4d81 100644
--- a/conf/autoload_configs/modules.conf.xml
+++ b/conf/autoload_configs/modules.conf.xml
@@ -38,6 +38,7 @@
     <!-- <load module="mod_openzap"/> -->
     <!-- <load module="mod_unicall"/> -->
     <!-- <load module="mod_skinny"/> -->
+    <!-- <load module="mod_khomp"/>   -->
 
     <!-- Applications -->
     <load module="mod_commands"/>
diff --git a/conf/autoload_configs/sangoma_codec.conf.xml b/conf/autoload_configs/sangoma_codec.conf.xml
index 05d70de0a7..eed9d673e1 100644
--- a/conf/autoload_configs/sangoma_codec.conf.xml
+++ b/conf/autoload_configs/sangoma_codec.conf.xml
@@ -4,14 +4,15 @@
 		<!--
 		Comma separated list of codecs to register with FreeSWITCH, 
 		by default (if this parameter is not set) all available codecs are registered.
-		Valid codec values are: PCMU,PCMA,L16,G729,G726-32,GSM
+		Valid codec values are: PCMU,PCMA,G729,G726-32,G722,GSM,G723,AMR,G7221,iLBC
+		If this parameter is not specified only G729 will be registered
 		<param name="register" value="all"/>
 		-->
 
 		<!-- 
 		List of codecs to not register with FreeSWITCH, by default this is empty,
 	        but you may want to not load PCMU and PCMA or may be others to not use your 
-	        vocallo resources in codecs that are done well and fast in software.	
+	        resources in codecs that are done well and fast in software.	
 		<param name="noregister" value="PCMU,PCMA"/>
 		-->
 
diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index 42a3bcc31f..a19f68399e 100644
--- a/conf/dialplan/default.xml
+++ b/conf/dialplan/default.xml
@@ -265,7 +265,7 @@
 	<action application="set" data="called_party_callgroup=${user_data(${dialed_extension}@${domain_name} var callgroup)}"/>
 	<!--<action application="export" data="nolocal:sip_secure_media=${user_data(${dialed_extension}@${domain_name} var sip_secure_media)}"/>-->
 	<action application="hash" data="insert/${domain_name}-last_dial/${called_party_callgroup}/${uuid}"/>
-	<action application="bridge" data="{sip_invite_domain=$${domain}}user/${dialed_extension}@${domain_name}"/>
+	<action application="bridge" data="user/${dialed_extension}@${domain_name}"/>
 	<action application="answer"/>
 	<action application="sleep" data="1000"/>
 	<action application="bridge" data="loopback/app=voicemail:default ${domain_name} ${dialed_extension}"/>
diff --git a/conf/directory/default.xml b/conf/directory/default.xml
index 1e583033a9..8af7aea135 100644
--- a/conf/directory/default.xml
+++ b/conf/directory/default.xml
@@ -21,7 +21,7 @@
   <!--the domain or ip (the right hand side of the @ in the addr-->
   <domain name="$${domain}">
     <params>
-      <param name="dial-string" value="{presence_id=${dialed_user}@${dialed_domain}}${sofia_contact(${dialed_user}@${dialed_domain})}"/>
+      <param name="dial-string" value="{sip_invite_domain=${dialed_domain},presence_id=${dialed_user}@${dialed_domain}}${sofia_contact(${dialed_user}@${dialed_domain})}"/>
     </params>
 
     <variables>
diff --git a/conf/sip_profiles/internal.xml b/conf/sip_profiles/internal.xml
index 93558a3584..3e756a85c0 100644
--- a/conf/sip_profiles/internal.xml
+++ b/conf/sip_profiles/internal.xml
@@ -132,6 +132,8 @@
     <param name="record-template" value="${caller_id_number}.${target_domain}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/>
     <!--enable to use presence -->
     <param name="manage-presence" value="true"/>
+    <!-- send a presence probe on each register to query devices to send presence instead of sending presence with less info -->
+    <!--<param name="presence-probe-on-register" value="true"/>-->
     <!--<param name="manage-shared-appearance" value="true"/>-->
     <!-- used to share presence info across sofia profiles -->
     <!-- Name of the db to use for this profile -->
diff --git a/configure.in b/configure.in
index de7261266e..77df2a614c 100644
--- a/configure.in
+++ b/configure.in
@@ -373,6 +373,11 @@ if test "x$have_libz" = "xyes"  ; then
 APR_ADDTO(SWITCH_AM_LDFLAGS, -lz)
 fi
 
+AC_CHECK_LIB(resolv, res_init, have_libresolv=yes, have_libresolv=no)
+if test "x$have_libresolv" = "xyes"  ; then
+APR_ADDTO(SWITCH_AM_LDFLAGS, -lresolv)
+fi
+
 ESL_LDFLAGS=
 PLATFORM_CORE_DEPLIBS=
 # tweak platform specific flags
diff --git a/docs/ChangeLog b/docs/ChangeLog
index d6fddd6bfa..96066b6e8c 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -19,6 +19,7 @@ freeswitch (1.0.7)
 	build: add mod_osp Makefile to configure generated Makefiles (r:dc06a039/FS-122)
 	build: Remove mod_spidermonkey from windows 2008 x64 builds - does not work (r:280e894d)
 	build: fix warnings on windows x64 builds src and mods projects - only libsofia included on the libs side (r:45ecbc2f)
+	build: Patch debian init.d script to set ulimit values (r:0eb33e57/FS-2844)
 	codec2: working prototype, still for testing only (r:04ca0751)
 	config: move limit.conf to db.conf
 	config: Update VM phrase macros to voice option then action on main, config menus
@@ -30,6 +31,8 @@ freeswitch (1.0.7)
 	config: Add att_xfer example to default dialplan (r:20ec962a)
 	config: default example to resolve some issues with SCA in cases where host and ip are mixed causing the phone to be confused. (r:0279261b)
 	config: Fix phrase files, still missing a sound file (r:6741f350/FS-2742)
+	config: Disallow global-intercept and group-intercept can intercept an outbound call in default dialplan (r:890871ba/FS-2777)
+	config: fix single domain assumption in default config to be more portable *cough* bkw *cough* (r:f987903e)
 	core: Add RTCP support (FSRTP-14)
 	core: handle some errors on missing db handle conditions
 	core: add ... and shutdown as a fail-safe when no modules are loaded
@@ -110,6 +113,38 @@ freeswitch (1.0.7)
 	core: add bitrate patch from moc with some extra stuff for late neg mode (r:633f193d)
 	core: refactor fmtp parser as a core func (r:56f8c11f)
 	core: add switch_ivr_dmachine async digit parser to core (r:7f3319dc)
+	core: make parens optional on functions as vars ${foo(bar)} is now the same as ${foo bar} (r:fdba0e07)
+	core: fix default ptime for iLBC and make new configurable global map in switch.conf.xml (r:e3c427ad)
+	core: only pause recording media bugs in fifo (r:c1d41dd9)
+	core: Allow IPv6 in proxy mode (r:4e5911c2/FS-2776)
+	core: "Silent recovery" (r:93c2ed94)
+	core: fix switch_find_local_ip to properly handle force_local_ip_v4 and _v6 (r:f42c9036/FS-2778)
+	core: fix att_xfer/3-way scenario (r:0559cc50)
+	core: dmachine - timeout instantly when you have exact match and are equal to max digits (r:81a9f8ef)
+	core: Core ODBC support for transactions with MSSQL (r:d2ca8d40/FS-2050)
+	core: Show the UUID of the session in the log when sending RFC2833 DTMF packet and when receiving a RTP DTMF (r:9241a35e)
+	core: add record_post_process_exec_app and record_post_process_exec_api both can have <app|cmd>:<args> (r:07adca56)
+	core:  add -ncwait for Unix based implememtations to make the backgrounder wait to make sure the process starts before detaching (r:23d5fc19)
+	core: fire DTMF event when converting dtmf to inband with start_dtmf_generate (r:dcdd3811)
+	core: fail calls with uninitialized frame (r:7dafe4e2)
+	core: allow switch_process_import to specify a prefix (r:e0c37c1f)
+	core: add additional info when fail (r:4bbd9a4c/FS-2825)
+	core: avoid hypothetical problem with flushing queue with delayed events (r:49b6237e)
+	core: add send_silence_when_idle and dmachine honoring to park loop (r:3be3cd76)
+	core: ivr_enterprise_originate: Fix export of variable from the originator channel to the called channels (r:025c82e7)
+	core: Better handling of progress and answering to prevent sip profile from locking up at higher volumes (r:04e57577/FS-2801)
+	core: ACL for IPv6 address and swigall to boot (r:db91f0e8/FS-2842)
+	core: add intercept_unanswered_only var akin to intercept_unbridged_only (r:68f18efe)
+	core: switch_odbc_handle_exec_string duplication SQLExecute (r:8b0e7d24/FS-2880)
+	core: Fix timeout while bridge is waiting for CF_BRIDGED flag (r:2572621b/FS-2368)
+	core: don't parse events for b legs from a leg thread in case they are using a monolothic python script as a group_confirm exec over socket to send it messages while the call is ringing (r:ed5266d3)
+	core: add new function to check when messages need parsing to improve performance on parsing messages during originate (r:8b0421ff)
+	core: run execute_on_answer on_media _on_ring apps async (r:ef4a4ed0)
+	core: add switch_ivr_insert_file to insert one file into another at an arbitrary sample point (r:82394b37)
+	core: Slow reload cause calls to hang (r:1ba98b02/FS-2852)
+	core: Application intercept causes FS to stop processing calls (r:12fc65f7/FS-2872)
+	core: fix edge cases for endless loop in sql thread (r:5d7c09ed)
+	core: prevent race while changing codecs mid call (r:7aa72b67)
 	lang: Improve French phrase files (FSCONFIG-23)
 	libapr: Fix issue where after a bridge with a member, uuid of Agent is set to single quote character ' (r:3fee704d/FS-2738)
 	libdingaling: fix race on shutdown causing crash (FSMOD-47)
@@ -126,6 +161,8 @@ freeswitch (1.0.7)
 	libesl: use uint32_t instead of long for timeout as in the rest of the lib, 0 means forever. Also added esl_send_recv_timed() (r:49d6c803)
 	libesl: Fix SEGV when using serialize function without any arguments (r:910729b5/ESL-44)
 	libesl: fix leak-on-error in esl_connect_timeout() (r:4263d60e)
+	libesl: Call close on connection handle if the connection fails (r:413dcc4c/ESL-50)
+	libesl: allow fs_cli -x to have args up to 1024 chars (was 256) (r:7039ba47)
 	libfreetdm: implemented freetdm config nodes and ss7 initial configuration
 	libfreetdm: fix codec for CAS signaling (r:b76e7f18)
 	libfreetdm: freetdm: ss7- added support for incoming group blocks, started adding support for ansi (r:c219a73c)
@@ -137,13 +174,16 @@ freeswitch (1.0.7)
 	libsofiasip: Fix random crashes (r:c15ee980/SFSIP-219)
 	libsofiasip: Fix T.38 bug in sofia_glue (r:2843f1ad/MODSOFIA-94)
 	libsofiasip: VS2010 sofia posix problem (r:46dd24c2/SFSIP-220)
+	libsofiasip: set minimum initital sip t1 timer to 1000ms to work around race condition on retry timer firing before all the things that are supposed to be handled by the timer are set.  The base resolution on this timer is 500ms, so doubling up makes sure we always hit the initial retry timer on the next run, where everything should be set.  The side effect was, 1/2 the time on a request that did not get immediate response, the timer would be fired and cleared, but the action (sending retry) was never done, and a new timer was not set, causing the request to just sit zombied and never retry.  A better solution would be to find and correct the race condition so the timer is never set to early and we never hit this condition. (r:20c2740c)
 	libspandsp: Fixed a typo in spandsp's msvc/inttypes.h Updated sig_tone processing in spandsp to the latest, to allow moy to proceed with his signaling work.
 	libspandsp: removed a saturate16 from spandsp that was causing problems fixed a typo in the MSVC inttypes.h file for spandsp
 	libspandsp: Changes to the signaling tone detector to detect concurrent 2400Hz + 2600Hz tones. This passes voice immunity and other key tests, but it bounces a bit when transitions like 2400 -> 2400+2600 -> 2600 occur. Transitions between tone off and tone on are clean. (r:bc13e944)
 	libspandsp: Fix Windows build after libspandsp update (r:d70cc852/FSBUILD-293)
 	libspandsp: Fix for T.30 processing of operator interrupts, to improve compatibility with some machines, which seem to send them when no operator is around. (r:84ee0ae6)
+	libspandsp: spandsp t38 fax receiving error in win XP - regression from f029f7ef (r:761cec8f/FS-2766)
 	mod_avmd: Initial check in - Advanced Voicemail Detect (r:10c6a30a) (by Eric Des Courtis)
 	mod_avmd: Add to windows build (r:df4bd935)
+	mod_avmd: Fix mem leak (r:cd951384/FS-2839)
 	mod_callcenter: Initial commit of the mod_callcenter application. This module is in it early state of developpement.  You can see documentation on the wiki at : <a href="http://wiki.freeswitch.org/wiki/Mod_callcenter">http://wiki.freeswitch.org/wiki/Mod_callcenter</a> For support/comments, please use <a href="http://jira.freeswitch.org/">http://jira.freeswitch.org/</a> and select the MOD CALLCENTER module. (r:ba09b96d)
 	mod_callcenter: Add ability to unload/reload/load a queue setting (You still need to reloadxml before). Note that joining a queue will check for it in the config and load it on the fly... I've used the same system as in mod_voicemail.  Not sure if we should allow this, but just comment it out of the config before unload and it wont be available anymore (r:3eafca60)
 	mod_callcenter: Try to fix the ring-all, also add cli auto complete done in previous commit (r:1666783c)
@@ -159,6 +199,10 @@ freeswitch (1.0.7)
 	mod_callcenter: Added max-wait-time and max-wait-time-with-no-agent param to a queue. (r:3482f95e)
 	mod_callcenter: Make sure we fail to load if config is not present (r:e1fb79a1)
 	mod_callcenter: Fix invalid update of agent field (r:426a448f/FS-2738)
+	mod_callcenter: Allow to get queue info via api (r:70d592ae)
+	mod_callcenter: Fix bad return type so it compile on archlinux, thx bougyman (r:3a475986)
+	mod_callcenter: Make callcenter_config agent get return the value of the item requested.  Also added queue param max-wait-time-with-no-agent-time-reached: If the max-wai-time-with-no-agent is already reached for the queue, then new caller can wait for x amount of second before it kicked out of the queue rather than get rejected automatically. (r:81a03869)
+	mod_callcenter: Add new event socket agent-offering.  Plus some documentation and better handling of bad agent type -- FS-2869 (r:80174cf3/FS-2869)
 	mod_cidlookup: null xml is bad (r:095815f8)
 	mod_cid_lookup: honor skipcitystate when using whitepages (r:a66654de/FSMOD-53)
 	mod_commands: make break uuid_break and add cascade flag 
@@ -173,6 +217,9 @@ freeswitch (1.0.7)
 	mod_commands: Allow cond API to return empty false value (r:c8a897b9)
 	mod_commands: ***BEHAVIOUR CHANGE*** reloadacl, load <module>, reload <module> will now explicitly call reloadxml (r:42c9df72)
 	mod_commands: add nat_map usage (r:7577b8aa)
+	mod_commands: add escaping empty strings to sql_escape (r:7bd0a5a6/FS-2833)
+	mod_commands: add uuid_fileman <uuid> <cmd>:<val> <-- same vals as the callbacks in js and lua to control the currently playing file of a channel from the cli or ESL (for the people who were ignoring me on the conference call so I decided to implement it instead of try to explain it ) (r:c4369fc8)
+	mod_commands: FS-2210 Add support for auto completion for uuid_simplify (r:72bcc01b/FS-2210)
 	mod_conference: Fix reporting of volume up/down (MODAPP-419)
 	mod_conference: add last talking time per member to conference xml list
 	mod_conference: add terminate-on-silence conference param
@@ -180,30 +227,43 @@ freeswitch (1.0.7)
 	mod_conference: add conference_member_id variable to all sessions with the member id used by their conference participation (For drk__) (r:49c9bfdb)
 	mod_conference: fix relate nohear (r:f029ce07/MODAPP-428)
 	mod_conference: Fix floor change events not always firing (r:8f1767d3/MODAPP-424)
+	mod_conference: refactor conference to use switch_ivr_dmachine for the digit parsing controls are now bound to each member separately based on conference_controls channel var, then the caller-controls param in the profile or a default to "default" (r:ac19f73c)
+	mod_conference: Fix crash on dtmf action (r:4d5389bd/FS-2781)
 	mod_curl: use method=post when post requested (r:c6a4ddd0/FSMOD-69)
+	mod_db: fix stack corruption (MODAPP-407)
 	mod_dialplan_xml: Add in the INFO log the caller id number when processing a request (Currenly only show the caller name) (r:e1df5e13)
 	mod_dingaling: make mod_dingaling compat with google's new free phonecalls thing (r:ba0a2a32)
 	mod_dingaling: make dingaling work with google voice inbound too (r:4ee68141)
 	mod_dingaling: Fix crash when testing the new gv-dingaling with around 24 concurrent calls (r:73e1ec5e/FSCORE-667)
 	mod_dingaling: Fix NULL pointer (r:e3eff816/FS-1103)
+	mod_dingaling: fix leak in chat_send (r:eb109a85)
+	mod_dingaling: use the login as message source when not in component mode. (chat_send) (r:58c28aab)
 	mod_directory: Add variable directory_search_order to allow to search by first name by default is set to "first_name" (r:163ca31f)
-	mod_db: fix stack corruption (MODAPP-407)
+	mod_distributor: Add mod_distributor to VS2010 - not built by default (r:bac79ba1)
 	mod_dptools: add eavesdrop_enable_dtmf chan var (r:596c0012)
 	mod_dptools: Make park app not send 183 session progress (r:76932995/FSCORE-567)
 	mod_dptools: add block_dtmf and unblock_dtmf apps (r:d9eb0197)
 	mod_dptools: refactor export code and add new bridge_export app which is like export but exports across when one channel bridges another (r:4aa9a838)
+	mod_dptools: add bind_digit_action application (r:9537197b)
+	mod_dptools: emit event when user presses DTMFs (r:37298f56)
 	mod_erlang_event: Make XML fetch reply ACKs distinguishable, update freeswitch.erl (r:9d44ed04)
 	mod_erlang_event: Add 3 new commands; session_event, session_noevents, session_nixevent (r:698fa045)
 	mod_erlang_event: generate long node names the same as erlang does (r:9ad509c2)
 	mod_erlang_event: Improve some logging to include UUIDs (r:c0d51b83)
+	mod_erlang_event: Support for reading erlang cookie from a file (r:094ffe37)
+	mod_erlang_event: Rewrite XML fetch conditional wait to be more sane (Reported by James Aimonetti) (r:6941c6eb/FS-2775)
 	mod_event_socket: fix up other users of switch_event_xmlize() to use SWITCH_EVENT_NONE (r:d6eb7562)
 	mod_event_socket: Fix small mem leaks (r:e4f90584/MODEVENT-68)
+	mod_event_socket: Add "-ERR" to api cmd response when failure occurs (r:58759052/FS-2827)
 	mod_fifo: allow multiple dtmf to exit fifo, set fifo_caller_exit_key to specify which (MODAPP-420)
 	mod_fifo: cancel outbound call if customer hangs up (r:cadb4d94)
 	mod_fifo: add taking_calls param to fifo member add and config file (r:821488bf)
 	mod_fifo: add nomedia flag (r:2d30a8c2)
 	mod_fifo: Fix inconsistency between the fifo queue and the channels (num callers in queue can become "-1") (r:07487114/FS-1659)
 	mod_fifo: fix issue leaving stale records in fifo_bridge table (r:b36d015f)
+	mod_fifo: fix fifo race in use count dec (r:402e383b)
+	mod_fifo: add outbound_ring_timeout param to mod_fifo (r:3885eea7)
+	mod_fifo: add default_lag to fifo (r:dd4fb5be)
 	mod_freetdm: Fix for TON and NPI not passed through to channel variables on incoming calls
 	mod_freetdm: add pvt data to freetdm channels fix fxs features (r:9d456900)
 	mod_freetdm: export and import boost custom data (r:edb2d582)
@@ -234,7 +294,12 @@ freeswitch (1.0.7)
 	mod_freetdm: OPENZAP-107 - Patched by Jeff Lenk (r:aa075136/OPENZAP-107)
 	mod_freetdm: allocate channels in their own memory page when debugging (r:fcd8df0a)
 	mod_freetdm: lock the channel when placing call (r:705dd237)
+	mod_freetdm: created cmake files for freetdm (r:fc55997b)
+	mod_freetdm: ss7 - added support to control mtp2, mtp3, and isup timers via freetdm.conf.xml (r:4455d581)
+	mod_freetdm: made ftmod_r2 use FTDM_SPAN_USE_SIGNALS_QUEUE and properly send FTDM_SIGEVENT_SIGSTATUS_CHANGED (r:af5f0a4a)
 	mod_gsmopen: copy from branch
+	mod_gsmopen: fix FS-2793, compilation stops (r:355c0dbb/FS-2793)
+	mod_gsmopen: retry serial initialization if failed, zeroing audio buffers, slower retry on soundcard busy (EAGAIN) (r:c7aefe93)
 	mod_hash: free all hashtables on shutdown (r:e76d7d92)
 	mod_hash: remove unneeded initializer (r:10d468a6)
 	mod_hash: begin working on remote support (r:c5ad49da)
@@ -258,6 +323,8 @@ freeswitch (1.0.7)
 	mod_java: fix eventConsumer issue and add flush() method (r:7fd3aff6)
 	mod_java: Allow user defined java methods to be called at startup and shutdown of JVM (r:1339e218/MODLANG-117)
 	mod_json_cdr: Fix segfault in mod_json_cdr.c (r:f347698a/MODEVENT-66)
+	mod_khomp: Added mod_khomp Endpoint. (r:5fea197b)
+	mod_khomp: Removed alternative contexts / extensions - New struct for matchs - On calls originated from an FXS branch, the Endpoint searches for a valid extension (digits sent) after the DTMF '#' or after the timeout (option fxs-digit-timeout). That search is done in the context defined in section <fxs-options>, or if no context configured, the search is done in context defined in context-fxs. - Added "dialplan" configuration: Name of the dialplan module in use (default XML) - Group context enabled. If set, the search for a valid extension is done only in that context. - Updated documentation (r:1ef3fc9a)
 	mod_lcr: Expand variables (MODAPP-418)
 	mod_lcr: add enable_sip_redir parameter (r:70bf7a0a/MODAPP-427)
 	mod_lcr: don't validate profiles with ${} vars since they are dynamic   and we can't guess what the proper value should be (r:af33afaa)
@@ -268,12 +335,17 @@ freeswitch (1.0.7)
 	mod_loopback: add loopback_bowout_on_execute var to make 1 legged loopback calls bow out of the picture
 	mod_loopback: only execute app once in app mode (r:64f58f2d)
 	mod_loopback: fix bug in mod_loopback where bowout=false (r:e9ab5368)
+	mod_loopback: pass indication when in app mode on mod_loopback (r:c423e209)
+	mod_loopback: fix voicemail failure (r:1a1881e8/FS-2795)
+	mod_loopback: pass ring_ready like we do with pre_answer (r:9d087d45)
 	mod_lua: Add switch_core_sqldb functionality from inside Lua script (r:26f2e095/FS-1384)
 	mod_lua: Made 2nd arg to freeswitch.Dbh:query (cb func) optional (r:87db11af)
 	mod_lua: Added SAF_ROUTING_EXEC flag to lua app, so it can be run inline (r:7d5ca1c0)
 	mod_managed: Added wrapper for switch_event_bind for .net (r:a5f07a80/MODLANG-165)
 	mod_managed: add additional support (r:5be58aac)
+	mod_managed: add mono 2.8 patch file see FS-2774 (r:6a948bd9/FS-2774)
 	mod_mp4v: MP4V-ES passthru for washibechi on IRC
+	mod_mp4: New module. Supports playback of MP4 files. Depends on libmp4v2 <http://code.google.com/p/mp4v2/> (originally compiled against v1.6.1)
 	mod_nibblebill: free allocated mem at shutdown; free properly if using custom_sql
 	mod_nibblebill: Add SAF_SUPPORT_NOMEDIA to nibblebill
 	mod_nibblebill: fix compile issues in latest HEAD (r:b073e82b/FSMOD-51)
@@ -291,7 +363,17 @@ freeswitch (1.0.7)
 	mod_sangoma_codec: added load/noload options for the supported codecs
 	mod_sangoma_codec: rename load/noload to register/noregister
 	mod_sangoma_codec: silence suppression (r:73d9d56f)
-	mod_say_es: fix grammar when saying dates and time (r:6bed19b2/MODAPP-429)
+	mod_sangoma_codec: do not return 0 len frames and return silence instead when there is no transcoding output update stats only when we really receive a frame (r:dc4d19e9)
+	mod_sangoma_codec: flush sockets on first use (r:bbba1148)
+	mod_sangoma_codec: use native L16 for the source codec (r:d2e25519)
+	mod_sangoma_codec: default to G729 only and remove L16 since it did not make any sense (r:1d5aa062)
+	mod_sangoma_codec: add iLBC 13.3k and 15.2k (r:68abb39e)
+	mod_sangoma_codec: add G723.1 (r:3e33540a)
+	mod_sangoma_codec: register AMR (r:31cc2502)
+	mod_sangoma_codec: add G722 (r:ca8c2336)
+	mod_sangoma_codec: add siren7 32kbps (r:fcaf2677)
+	mod_sangoma_codec: add SIREN7 24kbps (r:3acc5fdb)
+ 	mod_say_es: fix grammar when saying dates and time (r:6bed19b2/MODAPP-429)
 	mod_say_ja: initial commit, still needs sound files (r:b2423158/FS-2755)
 	mod_say_ru: Fix saying time with +1 hour of current time (r:68d74c31/MODAPP-444)
 	mod_say_zh: Number reading should now be OK for the whole range of integers for Cantonese and Mandarin
@@ -320,6 +402,7 @@ freeswitch (1.0.7)
 	mod_skypopen: now answer a call only when directed to do it (before was trying to answer any incoming call). Lot of changes to a messy part, so maybe some problem will come out... (r:45c6c4d3)
 	mod_skypopen: ignore early media sent by channels to be bridged before our channel is answered (r:ef14b78a)
 	mod_sndfile: Add support for .alaw and .ulaw to mod_sndfile (r:facf09b8/MODFORM-41)
+	mod_sndfile: return break in mod_sndfile when seek returns failure (r:564dc7e4)
 	mod_sofia: Send SIP MESSAGE to unregistered users by prefixing sip: to user@domain
 	mod_sofia: fix callee being updated with callee information
 	mod_sofia: set appearance-index in update statement for SLA
@@ -391,6 +474,32 @@ freeswitch (1.0.7)
 	mod_sofia: fix parsing of sofia tracelevel param, moved param from profile params to global_settings as its global, and it only worked on reparse before anyways.  Please correct any documentation on this issue on the wiki (r:82c4c4cc/FS-523)
 	mod_sofia: fix nat acl count check to check against the number of nat acls (r:e11550e7/FS-502)
 	mod_sofia: add sofia_glue_find_parameter_value function to get a specific value from a url params string (r:c701d41c)
+	mod_sofia: Sofia SIP Stack Lockup (r:8f13eb89/FS-2762)
+	mod_sofia: ix memory leak caused by regression from FS-2747 (r:6c4cb07b/FS-2747)
+	mod_sofia: Set SDP proper connection type of &quot;c=&quot; field to IP6 or IP4 when IPv6 called IPv4 (r:14361c09/FS-620)
+	mod_sofia: FS wrongly assumes NAT on Cisco 7941G (r:42f534fa/FS-2773)
+	mod_sofia: sofia_reg.c doesn't pass profile name into query, also, typo with all-reg-options-ping (r:6772c795/FS-2787)
+	mod_sofia: adjust sql stmts in presence to allow even non-registered entities to be tracked (r:4e0399d0)
+	mod_sofia: dont update display to ring when call is hungup in pidf presence (r:36851a90)
+	mod_sofia: 1) Add force-publish-expires to set custom presence update expires delta (-1 means endless) 2) Check how many users are registered when receiving a PUBLISH AND Multiple Registrations is enabled: if there is more than just 1 AND you are sending a offline message: skip publishing it to everyone to prevent clients from thinking themselves has gone offline. (r:fd1736b3)
+	mod_sofia: profile param ignore-183nosdp, chanvar sip_ignore_183nosdp FS-1978 (r:59d3b84d/FS-1978)
+	mod_sofia: fix race in codec failure condition, then fix bug in sdp parsing (likely a regression from recent codec changes) to never have the problem in the first place so you are double-protected (r:19325c43)
+	mod_sofia: fix mem leak (r:1970ec1d/FS-2810)
+	mod_sofia: parse static route in sip uri in notify by event (r:35676e7e)
+	mod_sofia: add support for NDLB-force-rport=safe param that does force-rport behavior only on endpoints we know are safe to do so on.  This is a dirty hack to try to work with certain endpoints behind sonicwall which does not use the same port when it does nat, when the devices do not support rport, while not breaking devices that acutally use different ports that force-rport will break (r:fc4d290c)
+	mod_sofia: add separate reg timeout from retry sec (r:e5b891ee)
+	mod_sofia: fix display of timeout (r:2043d5a)
+	mod_sofia: fix missing name and potential segfault in gateway status (r:40ac860a)
+	mod_sofia: Add missing RTP info for early SDP in bypass media (r:10119e9e/FS-2824)
+	mod_sofia: add manual_rtp_bugs to profile and chan var and 3 new RTP bugs SEND_LINEAR_TIMESTAMPS|START_SEQ_AT_ZERO|NEVER_SEND_MARKER (r:b278dd23)
+	mod_sofia: apparently some sip device vendors did not read the RFC (who knew?) adding verbose_sdp=true var to add needless a= lines for standard iana codecs that explicitly do not require them (r:6c4f49a8)
+	mod_sofia: Fix registering a gateway, sofia always places a Via header with ext-sip-ip, even if this gateway is local (r:cf398e1a/FS-535)
+	mod_sofia: add presence-probe-on-register sofia param to send a probe on register instead of presence to deal with some broken phones and add some general improvements to allow multi homed presence (r:14394994)
+	mod_sofia: Fix issue when fs_path is used so we pick the correct media IP in our outbound invite this was soemthing that wouldn't work correctly over ATT on the iphone. (r:a669f76f)
+	mod_sofia: Default T38 Options (r:92f43440/FS-2892)
+	mod_sofia: Fix wrong IP in VIA and contact HEADER for MESSAGE method while fs run in private network (r:59ea4a1b/FS-2886)
+	mod_sofia: SIP-header History-Info might exist multiple times, but only last header is exposed as a channel variable (r:8cf15012/FS-2881)
+	mod_sofia: Add support to reboot Yealink phone remotely (r:fdc31908/FS-2897)
 	mod_spandsp: initial checkin of mod_fax/mod_voipcodecs merge into mod_spandsp (r:fa9a59a8)
 	mod_spandsp: rework of new mod_spandsp to have functions broken up into different c files (r:65400642)
 	mod_spandsp: improve duplicate digit detection and add 'min_dup_digit_spacing_ms' channel variable for use with the dtmf detector (r:eab4f246/FSMOD-45)
@@ -420,14 +529,18 @@ freeswitch (1.0.7)
 	mod_voicemail: fix vm_inject to a group and change syntax for sending to a whole domain to domain= for clarity sake (r:f30a1cc6)
 	mod_voicemail: add quotes to vm_cc command generated internally to escape spaces in the caller id name (r:5f012813)
 	mod_voicemail: Play caller id of callee prior to playing a vmail (r:e7b97907/FS-2719)
+	mod_voicemail: FS-1776 Add support for per user operator exten override param vm-operator-extension (r:df5b3498/FS-1776)
 	mod_xml_cdr: add force_process_cdr var to process b leg cdr on a case by case basis when b leg cdr is disabled (XML-17)
 	mod_xml_cdr: add leg param to query string (XML-24)
 	mod_xml_cdr: fix locked sessions (XML-26)
 	mod_xml_cdr: fix minor memory leaks and config bug (r:19253d83/MODEVENT-62)
 	mod_xml_rpc: Fix crash if unauthorized XML RPC is attempted (r:9835395c/FS-184)
 	scripts: added honeypot.pl and blacklist.pl which add extra SIP security options (r:b6a81ba7)
+	scripts: do simple verification to make sure we are getting IP addresses from VoIP abuse blacklist (r:b0049160)
+	scripts: add_user - cmd line utility that lets admin create new users very easily. (r:ec8f2c2b)
 	sofia-sip: fix null derefernce segfault in soa (r:f356c5e6)
 	sofia-sip: extend timeout for session expires on short timeouts to be 90% of timeout instead of 1/3 to handle devices that do not refresh in time such as polycom (r:a7f48928/SFSIP-212)
+	tools: Add fs_encode tool (r:89b17601)
 	
 freeswitch (1.0.6)
 
diff --git a/libs/apr-util/.update b/libs/apr-util/.update
index f430e64b3b..a573c80504 100644
--- a/libs/apr-util/.update
+++ b/libs/apr-util/.update
@@ -1 +1 @@
-Mon Dec 28 14:55:57 EST 2009
+Thu 18 Nov 2010 20:56:38 EST
diff --git a/libs/apr-util/include/apr_queue.h b/libs/apr-util/include/apr_queue.h
index 5a0181b29e..dcf0c137ed 100644
--- a/libs/apr-util/include/apr_queue.h
+++ b/libs/apr-util/include/apr_queue.h
@@ -78,6 +78,22 @@ APU_DECLARE(apr_status_t) apr_queue_push(apr_queue_t *queue, void *data);
  */
 APU_DECLARE(apr_status_t) apr_queue_pop(apr_queue_t *queue, void **data);
 
+/**
+ * pop/get an object from the queue, blocking if the queue is already empty
+ *
+ * @param queue the queue
+ * @param data the data
+ * @param timeout The amount of time in microseconds to wait. This is 
+ *        a maximum, not a minimum. If the condition is signaled, we 
+ *        will wake up before this time, otherwise the error APR_TIMEUP
+ *        is returned.
+ * @returns APR_TIMEUP the request timed out
+ * @returns APR_EINTR the blocking was interrupted (try again)
+ * @returns APR_EOF if the queue has been terminated
+ * @returns APR_SUCCESS on a successfull pop
+ */
+APU_DECLARE(apr_status_t) apr_queue_pop_timeout(apr_queue_t *queue, void **data, apr_interval_time_t timeout);
+
 /**
  * push/add a object to the queue, returning immediatly if the queue is full
  *
diff --git a/libs/apr-util/misc/apr_queue.c b/libs/apr-util/misc/apr_queue.c
index 28d79afcb5..e905a53ebb 100644
--- a/libs/apr-util/misc/apr_queue.c
+++ b/libs/apr-util/misc/apr_queue.c
@@ -313,6 +313,71 @@ APU_DECLARE(apr_status_t) apr_queue_pop(apr_queue_t *queue, void **data)
     return rv;
 }
 
+/**
+ * Retrieves the next item from the queue. If there are no
+ * items available, it will block until one becomes available, or 
+ * until timeout is elapsed. Once retrieved, the item is placed into
+ * the address specified by'data'.
+ */
+APU_DECLARE(apr_status_t) apr_queue_pop_timeout(apr_queue_t *queue, void **data, apr_interval_time_t timeout)
+{
+    apr_status_t rv;
+
+    if (queue->terminated) {
+        return APR_EOF; /* no more elements ever again */
+    }
+
+    rv = apr_thread_mutex_lock(queue->one_big_mutex);
+    if (rv != APR_SUCCESS) {
+        return rv;
+    }
+
+    /* Keep waiting until we wake up and find that the queue is not empty. */
+    if (apr_queue_empty(queue)) {
+        if (!queue->terminated) {
+            queue->empty_waiters++;
+            rv = apr_thread_cond_timedwait(queue->not_empty, queue->one_big_mutex, timeout);
+            queue->empty_waiters--;
+			/* In the event of a timemout, APR_TIMEUP will be returned */
+            if (rv != APR_SUCCESS) {
+                apr_thread_mutex_unlock(queue->one_big_mutex);
+                return rv;
+            }
+        }
+        /* If we wake up and it's still empty, then we were interrupted */
+        if (apr_queue_empty(queue)) {
+            Q_DBG("queue empty (intr)", queue);
+            rv = apr_thread_mutex_unlock(queue->one_big_mutex);
+            if (rv != APR_SUCCESS) {
+                return rv;
+            }
+            if (queue->terminated) {
+                return APR_EOF; /* no more elements ever again */
+            }
+            else {
+                return APR_EINTR;
+            }
+        }
+    } 
+
+    *data = queue->data[queue->out];
+    queue->nelts--;
+
+    queue->out = (queue->out + 1) % queue->bounds;
+    if (queue->full_waiters) {
+        Q_DBG("signal !full", queue);
+        rv = apr_thread_cond_signal(queue->not_full);
+        if (rv != APR_SUCCESS) {
+            apr_thread_mutex_unlock(queue->one_big_mutex);
+            return rv;
+        }
+    }
+
+    rv = apr_thread_mutex_unlock(queue->one_big_mutex);
+    return rv;
+}
+
+
 /**
  * Retrieves the next item from the queue. If there are no
  * items available, return APR_EAGAIN.  Once retrieved,
diff --git a/libs/esl/fs_cli.c b/libs/esl/fs_cli.c
index 60dd8d8012..73bee7ab5e 100644
--- a/libs/esl/fs_cli.c
+++ b/libs/esl/fs_cli.c
@@ -999,7 +999,7 @@ int main(int argc, char *argv[])
 	int temp_log = -1;
 	int argv_error = 0;
 	int argv_exec = 0;
-	char argv_command[256] = "";
+	char argv_command[1024] = "";
 	char argv_loglevel[128] = "";
 	int argv_quiet = 0;
 	int loops = 2, reconnect = 0;
diff --git a/libs/esl/perl/logger.pl b/libs/esl/perl/logger.pl
index d0dbb1750e..08213c033f 100644
--- a/libs/esl/perl/logger.pl
+++ b/libs/esl/perl/logger.pl
@@ -17,13 +17,13 @@ my $USAGE = "
 FreeSWITCH Logger Utility
 
 USAGE:
--h --helpThis help
+-h --help                   This help
 -p --port <port>            Choose port
 -P -pass  <pass>            Choose password
 -f --file <file>            Output file
 -pb --paste-bin <name>	    Post to FreeSWITCH Paste Bin
 -sp --sip-profiles <list>   List of SIP profiles to trace
--sd --sip-debug <level>      Set SIP debug level
+-sd --sip-debug <level>     Set SIP debug level
 
 No arguments given will trace profile 'internal' to STDOUT
 ";
diff --git a/libs/freetdm/Makefile.am b/libs/freetdm/Makefile.am
index bc92e1db58..af26f7f2af 100644
--- a/libs/freetdm/Makefile.am
+++ b/libs/freetdm/Makefile.am
@@ -55,10 +55,6 @@ COMPILE   = $(CC) $(FTDM_CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE)
 LINK      = $(LIBTOOL) --mode=link --tag=CC $(CC) $(FTDM_CFLAGS) $(LDFLAGS) -o $@
 
-if WANT_DEBUGDTMF
-FTDM_CFLAGS += -DFTDM_DEBUG_DTMF
-endif
-
 
 #
 # GNU pkgconfig file
diff --git a/libs/freetdm/conf/freetdm.conf b/libs/freetdm/conf/freetdm.conf
index bbaf1e3687..2f9643dedd 100644
--- a/libs/freetdm/conf/freetdm.conf
+++ b/libs/freetdm/conf/freetdm.conf
@@ -45,3 +45,29 @@ fxs-channel => 1
 number => 2
 fxo-channel => 3
 
+; MFC-R2 typical span configuration
+
+; MFC-R2 with wanpipe (Sangoma)
+[span wanpipe myWanpipeSpan]
+trunk_type => E1
+cas-channel => 1-15:1101
+cas-channel => 17-31:1101
+
+; MFC-R2 with Zaptel/DAHDI
+[span zt myWanpipeSpan]
+trunk_type => E1
+cas-channel => 1-15:1101
+cas-channel => 17-31:1101
+
+; generic channel parameters
+; this parameters are accepted by any type of span/channel
+; remember that for generic channel parameters only channels
+; below the parameter within the span will be affected
+
+; Channel audio gain
+; rxgain => 0.0
+; txgain => 0.0
+
+; Whether to perform media dumps for DTMF debugging
+; debugdtmf => yes
+
diff --git a/libs/freetdm/conf/freetdm.conf.xml b/libs/freetdm/conf/freetdm.conf.xml
index 986074dffb..63a3ea62cd 100644
--- a/libs/freetdm/conf/freetdm.conf.xml
+++ b/libs/freetdm/conf/freetdm.conf.xml
@@ -1,52 +1,220 @@
 <!-- Please refer to http://wiki.freeswitch.org/wiki/FreeTDM for further documentation  -->
 
+<!-- 
+This is a sample FreeSWITCH XML configuration for FreeTDM
+Remember you still need to configure freetdm.conf (no XML extension) in $prefix/conf/
+directory of FreeSWITCH. The freetdm.conf (no XML extension) is a simple text file
+definining the I/O interfaces (Sangoma, DAHDI etc). This file (freetdm.conf.xml) deals
+with the signaling protocols that you can run on top of your I/O interfaces.
+-->
 <configuration name="freetdm.conf" description="FreeTDM Configuration">
-  <settings>
-    <param name="debug" value="0"/>
-    <!--<param name="hold-music" value="$${moh_uri}"/>-->
-    <!--<param name="enable-analog-option" value="call-swap"/>-->
-    <!--<param name="enable-analog-option" value="3-way"/>-->
-  </settings>
+	
+	<settings>
+		<param name="debug" value="0"/>
+		<!--<param name="hold-music" value="$${moh_uri}"/>-->
+		<!--<param name="enable-analog-option" value="call-swap"/>-->
+		<!--<param name="enable-analog-option" value="3-way"/>-->
+	</settings>
 
-  <!-- use the <pri_spans> tag for native ISDN support (most likely broken at this point, check sangoma_pri_spans or libpri_spans for alternatives) -->
-   <pri_spans>
-     <span name="PRI_1">
-       <!-- Log Levels: none, alert, crit, err, warning, notice, info, debug -->
-       <param name="q921loglevel" value="alert"/>
-       <param name="q931loglevel" value="alert"/>
-       <param name="mode" value="user"/>
-       <param name="dialect" value="5ess"/>
-       <param name="dialplan" value="XML"/>
-       <param name="context" value="default"/>
-     </span>
-     <span name="PRI_2">
-       <param name="q921loglevel" value="alert"/>
-       <param name="q931loglevel" value="alert"/>
-       <param name="mode" value="user"/>
-       <param name="dialect" value="5ess"/>
-       <param name="dialplan" value="XML"/>
-       <param name="context" value="default"/>
-     </span>
-   </pri_spans>
+	<!-- Sample analog configuration -->
+	<analog_spans>
+		<!-- The span name must match the name in your freetdm.conf -->
+		<span name="myAnalog">
+			<!--<param name="hold-music" value="$${moh_uri}"/>-->
+			<!--<param name="enable-analog-option" value="call-swap"/>-->
+			<!--<param name="enable-analog-option" value="3-way"/>-->
+			<param name="tonegroup" value="us"/>
+			<param name="digit-timeout" value="2000"/>
+			<param name="max-digits" value="11"/>
+			<param name="dialplan" value="XML"/>
+			<param name="context" value="default"/>
+			<param name="enable-callerid" value="true"/>
+			<!-- regex to stop dialing when it matches -->
+			<!--<param name="dial-regex" value="5555"/>-->
+			<!-- regex to stop dialing when it does not match -->
+			<!--<param name="fail-dial-regex" value="^5"/>-->
+		</span>
+	</analog_spans>
 
+	<!-- openr2 (MFC-R2 signaling) spans 
+	MFC-R2 signaling has lots of variants from country to country and even sometimes
+	minor variants inside the same country. The only mandatory parameters here are:
+	variant, but typically you also want to set max_ani and max_dnis.
+	IT IS RECOMMENDED that you leave the default values (leaving them commented) for the 
+	other parameters unless you have problems or you have been instructed to change some 
+	parameter. OpenR2 library uses the 'variant' parameter to try to determine the 
+	best defaults for your country.  If you want to contribute your configs for a particular 
+	country send them to the e-mail of the primary OpenR2 developer that you can find in the 
+	AUTHORS file of the OpenR2 package, they will be added to the samples directory of openr2.
+	-->
+	<r2_spans>
+		<span name="wp1" cfgprofile="testr2">
+			
+			<!--
+			MFC/R2 variant. This depends on the OpenR2 supported variants
+			A list of values can be found by executing the openr2 command r2test -l
+			some valid values are:
+			mx (Mexico)
+			ar (Argentina)
+			br (Brazil)
+			ph (Philippines)
+			itu (per ITU spec)
+			-->
+			<param name="variant" value="mx"/>
 
-  <!-- Analog spans go here -->
-  <analog_spans>
-    <span name="myAnalog">
-      <!--<param name="hold-music" value="$${moh_uri}"/>-->
-      <!--<param name="enable-analog-option" value="call-swap"/>-->
-      <!--<param name="enable-analog-option" value="3-way"/>-->
-      <param name="tonegroup" value="us"/>
-      <param name="digit-timeout" value="2000"/>
-      <param name="max-digits" value="11"/>
-      <param name="dialplan" value="XML"/>
-      <param name="context" value="default"/>
-      <param name="enable-callerid" value="true"/>
-      <!-- regex to stop dialing when it matches -->
-      <!--<param name="dial-regex" value="5555"/>-->
-      <!-- regex to stop dialing when it does not match -->
-      <!--<param name="fail-dial-regex" value="^5"/>-->
-    </span>
-  </analog_spans>
+			<!-- switch parameters (required), where to send calls to -->
+			<param name="dialplan" value="XML"/>
+			<param name="context" value="default"/>
 
+			<!-- 
+			Max amount of ANI (caller id digits) to ask for
+			<param name="max_ani" value="4"/> 
+			-->
+			<!-- 
+			Max amount of DNIS to ask for 
+			<param name="max_dnis" value="4"/> 
+			-->
+
+			<!-- Do not set parameters below this line unless you desire to tweak it because is not working -->
+			
+			<!-- 
+			Whether or not to get the ANI before getting DNIS (only affects incoming calls)
+			Some telcos require ANI first some others do not care, if default go wrong on 
+			incoming calls, change this value
+			<param name="get_ani_first" value="yes"/>
+			-->
+
+			<!--
+			Caller Category to send. Accepted values:
+				- national_subscriber
+				- national_priority_subscriber
+				- international_subscriber
+				- international_priority_subscriber
+				- collect_call
+			Usually national_subscriber (the default) works just fine
+			<param name="category" value="national_subscriber"/>
+			-->
+
+			<!--
+			Brazil uses a special calling party category for collect calls (llamadas por cobrar)
+			instead of using the operator (as in Mexico). The R2 spec in Brazil says a special GB tone
+			should be used to reject collect calls. If you want to ALLOW collect calls specify 'yes',
+			if you want to BLOCK collect calls then say 'no'. Default is to block collect calls.
+			(see also 'double_answer')
+			<param name="allow_collect_calls" value="yes"/>
+			-->
+
+			<!--
+			This feature is related but independent of allow_collect_calls
+			Some PBX's require a double-answer process to block collect calls, if
+			you ever have problems blocking collect calls using Group B signals (allow_collect_calls=no)
+			then you may want to try with double_answer=yes, this will cause that every answer signal
+			is changed to perform 'answer -> clear back -> answer' (sort of a flash)
+			(see also 'allow_collect_calls')
+			<param name="double_answer" value="yes"/>
+			-->
+
+			<!--
+			This feature allows to skip the use of Group B/II signals and go directly
+			to the accepted state for incoming calls
+			<param name="immediate_accept" value="yes"/>
+			-->
+
+			<!--
+			Skip request of calling party category and ANI
+			<param name="skip_category" value="yes"/>
+			-->
+
+			<!--
+			Brazil use a special signal to force the release of the line (hangup) from the
+			backward perspective. When forced_release=no, the normal clear back signal
+			will be sent on hangup, which is OK for all mfcr2 variants I know of, except for
+			Brazilian variant, where the central will leave the line up for several seconds (30, 60)
+			which sometimes is not what people really want. When forced_release=yes, a different
+			signal will be sent to hangup the call indicating that the line should be released immediately
+			<param name="forced_release" value="yes"/>
+			-->
+
+			<!--
+			Whether or not report to the other end 'accept call with charge'
+			This setting has no effect with most telecos, usually is safe
+			leave the default (yes), but once in a while when interconnecting with
+			old PBXs this may be useful.
+			Concretely this affects the Group B signal used to accept calls
+			<param name="charge_calls" value="yes"/>
+			-->
+
+			<!--
+			MFC/R2 value in milliseconds for the MF timeout. Any negative value
+			means 'default', smaller values than 500ms are not recommended
+			and can cause malfunctioning. If you experience protocol error
+			due to MF timeout try incrementing this value in 500ms steps
+			<param name="mfback_timeout" value="1500"/>
+			-->
+
+			<!--
+			MFC/R2 value in milliseconds for the metering pulse timeout.
+			Metering pulses are sent by some telcos for some R2 variants
+			during a call presumably for billing purposes to indicate costs,
+			however this pulses use the same signal that is used to indicate
+			call hangup, therefore a timeout is sometimes required to distinguish
+			between a *real* hangup and a billing pulse that should not
+			last more than 500ms, If you experience call drops after some
+			minutes of being stablished try setting a value of some ms here,
+			values greater than 500ms are not recommended.
+			BE AWARE that choosing the proper protocol variant parameter
+			implicitly sets a good recommended value for this timer, use this
+			parameter only when you *really* want to override the default, otherwise
+			just comment out this value.
+			<param name="metering_pulse_timeout" value="1000"/>
+			-->
+
+			<!--
+			WARNING: advanced users only! I really mean it
+			this parameter is commented by default because
+			YOU DON'T NEED IT UNLESS YOU REALLY GROK MFC/R2
+			READ COMMENTS on doc/r2proto.conf in openr2 package 
+			for more info
+			<param name="advanced_protocol_file" value="/usr/local/freeswitch/conf/r2proto.conf"/>
+			-->
+
+			<!-- USE THIS FOR DEBUGGING MFC-R2 PROTOCOL -->
+			<!-- 
+			Where to dump advanced call file protocol logs
+			<param name="logdir" value="$${base_dir}/log/mfcr2"/>
+			-->
+
+			<!-- 
+			MFC/R2 valid logging values are: all,error,warning,debug,notice,cas,mf,nothing
+			error,warning,debug and notice are self-descriptive
+			'cas' is for logging ABCD CAS tx and rx
+			'mf' is for logging of the Multi Frequency tones
+			You can mix up values, like: loglevel=error,debug,mf to log just error, debug and 
+			multi frequency messages
+			'all' is a special value to log all the activity
+			'nothing' is a clean-up value, in case you want to not log any activity for
+			a channel or group of channels
+			BE AWARE that the level of output logged will ALSO depend on
+			the value you have in FreeSWITCH logging configurations, if you disable output FreeSWITCH
+			then it does not matter if you specify 'all' here, nothing will be logged
+			so FreeSWITCH has the last word on what is going to be logged
+			<param name="logging" value="debug,notice,warning,error,mf,cas"/>
+			-->
+
+			<!-- 
+			whether or not to drop protocol call files into 'logdir'
+			<param name="call_files" value="yes"/>
+			-->
+
+			<!--
+			Use only for very technical debugging
+			This is the size (if 0, dumps are disabled) of MF dump files. MF dump files
+			are audio files that are dumped when a protocol error occurs.
+			The files are dumped in whatever you set in the logdir parameter.
+			Value -1 uses a default recommended size (which stores 5 seconds of audio)
+			<param name="mf_dump_size" value="-1"/>
+			-->
+		</span>
+	</r2_spans>
 </configuration>
+
diff --git a/libs/freetdm/configure.ac b/libs/freetdm/configure.ac
index 8b878edc09..592dfd82a3 100644
--- a/libs/freetdm/configure.ac
+++ b/libs/freetdm/configure.ac
@@ -24,7 +24,12 @@ AC_PROG_MAKE_SET
 AM_PROG_CC_C_O
 AC_PROG_LIBTOOL
 AC_PROG_INSTALL
-PKG_PROG_PKG_CONFIG
+
+# NOTE: pkg-config is used to detect libisdn
+m4_ifdef([PKG_PROG_PKG_CONFIG],
+	[PKG_PROG_PKG_CONFIG],
+	[AC_MSG_WARN([pkg-config missing (required for libisdn detection)])]
+)
 
 AX_COMPILER_VENDOR
 
@@ -162,17 +167,6 @@ AC_ARG_WITH([pritap],
 HAVE_PRITAP="${enable_pritap}"
 AM_CONDITIONAL([HAVE_PRITAP],[test "${enable_pritap}" = "yes"])
 
-# debug dtmf?
-AC_ARG_WITH([debugdtmf],
-	[AS_HELP_STRING([--with-debugdtmf], [Debug DTMF])],
-	[case "${withval}" in
-	 no)	enable_debugdtmf="no" ;;
-	 *)	enable_debugdtmf="yes" ;;
-	 esac],
-	[enable_debugdtmf="no"]
-)
-AM_CONDITIONAL([WANT_DEBUGDTMF], [test "${enable_debugdtmf}" = "yes"])
-
 ##
 # OpenR2 stack
 #
@@ -305,41 +299,44 @@ AC_ARG_WITH([libisdn],
 if test "${with_libisdn}" != "no"
 then
 	AC_MSG_RESULT([${as_nl}<<>> ftmod_isdn (libisdn stack)])
-	PKG_CHECK_MODULES([libisdn],
-		[libisdn >= 0.0.1],
-		[AC_MSG_CHECKING([libisdn version])
-		 LIBISDN_VERSION="`${PKG_CONFIG} --modversion libisdn`"
-		 if test -z "${LIBISDN_VERSION}"; then
-			AC_MSG_ERROR([Failed to retrieve libisdn version])
-		 fi
-		 AC_MSG_RESULT([${LIBISDN_VERSION}])
+	m4_ifdef([PKG_CHECK_MODULES],
+		[PKG_CHECK_MODULES([libisdn],
+			[libisdn >= 0.0.1],
+			[AC_MSG_CHECKING([libisdn version])
+			 LIBISDN_VERSION="`${PKG_CONFIG} --modversion libisdn`"
+			 if test -z "${LIBISDN_VERSION}"; then
+				AC_MSG_ERROR([Failed to retrieve libisdn version])
+			 fi
+			 AC_MSG_RESULT([${LIBISDN_VERSION}])
 
-		 # check features
-		 AC_MSG_CHECKING([for new experimental API])
-		 AC_COMPILE_IFELSE(
-			[AC_LANG_PROGRAM(
-				[#include <libisdn/version.h>
-				 #if !LIBISDN_FEATURE(API2)
-				 #error "libisdn API v2 not available"
-				 #endif
-				],
-				[;]
-			)],
-			[AC_MSG_RESULT([yes])],
-			[AC_MSG_RESULT([no])]
+			 # check features
+			 AC_MSG_CHECKING([for new experimental API])
+			 AC_COMPILE_IFELSE(
+				[AC_LANG_PROGRAM(
+					[#include <libisdn/version.h>
+					 #if !LIBISDN_FEATURE(API2)
+					 #error "libisdn API v2 not available"
+					 #endif
+					],
+					[;]
+				)],
+				[AC_MSG_RESULT([yes])],
+				[AC_MSG_RESULT([no])]
+			 )
+
+			 HAVE_LIBISDN="yes"
+			 AC_DEFINE([HAVE_LIBISDN], [1], [libisdn support])
+			 AC_SUBST([LIBISDN_CFLAGS],  [${libisdn_CFLAGS}])
+			 AC_SUBST([LIBISDN_CPPFLAGS],[${libisdn_CPPFLAGS}])
+			 AC_SUBST([LIBISDN_LDFLAGS], [${libisdn_LDFLAGS}])
+			 AC_SUBST([LIBISDN_LIBS],    [${libisdn_LIBS}])
+			 AC_SUBST([LIBISDN_VERSION])
+			],
+			[AC_MSG_ERROR([Need libisdn-0.0.1 or higher])]
 		 )
-
-		 HAVE_LIBISDN="yes"
-		 AC_DEFINE([HAVE_LIBISDN], [1], [libisdn support])
-		 AC_SUBST([LIBISDN_CFLAGS],  [${libisdn_CFLAGS}])
-		 AC_SUBST([LIBISDN_CPPFLAGS],[${libisdn_CPPFLAGS}])
-		 AC_SUBST([LIBISDN_LDFLAGS], [${libisdn_LDFLAGS}])
-		 AC_SUBST([LIBISDN_LIBS],    [${libisdn_LIBS}])
-		 AC_SUBST([LIBISDN_VERSION])
-		],
-		[AC_MSG_ERROR([Need libisdn-0.0.1 or higher])]
+		 AX_LIB_PCAP],
+		[AC_MSG_WARN([pkg-config missing (required for libisdn detection)])]
 	)
-	AX_LIB_PCAP
 fi
 AM_CONDITIONAL([HAVE_LIBISDN], [test "${HAVE_LIBISDN}" = "yes"])
 
diff --git a/libs/freetdm/cyginstall.sh b/libs/freetdm/cyginstall.sh
index 9d486b7dce..e2d5885c4e 100644
--- a/libs/freetdm/cyginstall.sh
+++ b/libs/freetdm/cyginstall.sh
@@ -5,8 +5,9 @@ fsdir=../..
 set -x
 cp Debug/mod/*.dll $fsdir/Debug/mod/
 cp mod_freetdm/Debug/*.pdb $fsdir/Debug/mod/
-cp Debug/*.dll $fsdir/Debug/
-cp Debug/*.pdb $fsdir/Debug/
+cp Debug/freetdm.dll $fsdir/Debug/
+cp Debug/ftmod_*.dll $fsdir/Debug/mod/
+cp Debug/*.pdb $fsdir/Debug/mod/
 #cp Debug/testsangomaboost.exe $fsdir/Debug/
 echo "FRIENDLY REMINDER: RECOMPILE ftmod_wanpipe WHENEVER YOU INSTALL NEW DRIVERS"
 set +x 
diff --git a/libs/freetdm/freetdm.2008.sln b/libs/freetdm/freetdm.2008.sln
index f059d941d3..0e374545eb 100644
--- a/libs/freetdm/freetdm.2008.sln
+++ b/libs/freetdm/freetdm.2008.sln
@@ -64,6 +64,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftmod_sangoma_isdn", "src\f
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftmod_r2", "src\ftmod\ftmod_r2\ftmod_r2.2008.vcproj", "{08C3EA27-A51D-47F8-B47D-B189C649CF30}"
+	ProjectSection(ProjectDependencies) = postProject
+		{93B8812C-3EC4-4F78-8970-FFBFC99E167D} = {93B8812C-3EC4-4F78-8970-FFBFC99E167D}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -131,7 +134,6 @@ Global
 		{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Release|Win32.ActiveCfg = Release|Win32
 		{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Release|x64.ActiveCfg = Release|x64
 		{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Debug|Win32.Build.0 = Debug|Win32
 		{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Debug|x64.ActiveCfg = Debug|x64
 		{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Debug|x64.Build.0 = Debug|x64
 		{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Release|Win32.ActiveCfg = Release|Win32
@@ -139,7 +141,6 @@ Global
 		{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Release|x64.ActiveCfg = Release|x64
 		{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Release|x64.Build.0 = Release|x64
 		{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Debug|Win32.Build.0 = Debug|Win32
 		{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Debug|x64.ActiveCfg = Debug|x64
 		{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Debug|x64.Build.0 = Debug|x64
 		{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Release|Win32.ActiveCfg = Release|Win32
@@ -147,7 +148,6 @@ Global
 		{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Release|x64.ActiveCfg = Release|x64
 		{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Release|x64.Build.0 = Release|x64
 		{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Debug|Win32.Build.0 = Debug|Win32
 		{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Debug|x64.ActiveCfg = Debug|x64
 		{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Debug|x64.Build.0 = Debug|x64
 		{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Release|Win32.ActiveCfg = Release|Win32
@@ -155,16 +155,13 @@ Global
 		{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Release|x64.ActiveCfg = Release|x64
 		{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Release|x64.Build.0 = Release|x64
 		{B2AF4EA6-0CD7-4529-9EB5-5AF43DB90395}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B2AF4EA6-0CD7-4529-9EB5-5AF43DB90395}.Debug|Win32.Build.0 = Debug|Win32
 		{B2AF4EA6-0CD7-4529-9EB5-5AF43DB90395}.Debug|x64.ActiveCfg = Debug|Win32
 		{B2AF4EA6-0CD7-4529-9EB5-5AF43DB90395}.Release|Win32.ActiveCfg = Release|Win32
 		{B2AF4EA6-0CD7-4529-9EB5-5AF43DB90395}.Release|Win32.Build.0 = Release|Win32
 		{B2AF4EA6-0CD7-4529-9EB5-5AF43DB90395}.Release|x64.ActiveCfg = Release|Win32
 		{08C3EA27-A51D-47F8-B47D-B189C649CF30}.Debug|Win32.ActiveCfg = Debug|Win32
-		{08C3EA27-A51D-47F8-B47D-B189C649CF30}.Debug|Win32.Build.0 = Debug|Win32
 		{08C3EA27-A51D-47F8-B47D-B189C649CF30}.Debug|x64.ActiveCfg = Debug|Win32
 		{08C3EA27-A51D-47F8-B47D-B189C649CF30}.Release|Win32.ActiveCfg = Release|Win32
-		{08C3EA27-A51D-47F8-B47D-B189C649CF30}.Release|Win32.Build.0 = Release|Win32
 		{08C3EA27-A51D-47F8-B47D-B189C649CF30}.Release|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
diff --git a/libs/freetdm/freetdm.2010.sln b/libs/freetdm/freetdm.2010.sln
new file mode 100644
index 0000000000..f4bd907a6d
--- /dev/null
+++ b/libs/freetdm/freetdm.2010.sln
@@ -0,0 +1,135 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetdm", "msvc\freetdm.2010.vcxproj", "{93B8812C-3EC4-4F78-8970-FFBFC99E167D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testanalog", "msvc\testanalog\testanalog.2010.vcxproj", "{BB833648-BAFF-4BE2-94DB-F8BB043C588C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testisdn", "msvc\testisdn\testisdn.2010.vcxproj", "{6DA6FD42-641D-4147-92F5-3BC4AAA6589B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_freetdm", "mod_freetdm\mod_freetdm.2010.vcxproj", "{FE3540C5-3303-46E0-A69E-D92F775687F1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftmod_analog", "src\ftmod\ftmod_analog\ftmod_analog.2010.vcxproj", "{37C94798-6E33-4B4F-8EE0-C72A7DC91157}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftmod_analog_em", "src\ftmod\ftmod_analog_em\ftmod_analog_em.2010.vcxproj", "{B3F49375-2834-4937-9D8C-4AC2EC911010}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftmod_isdn", "src\ftmod\ftmod_isdn\ftmod_isdn.2010.vcxproj", "{729344A5-D5E9-434D-8EE8-AF8C6C795D15}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftmod_pika", "src\ftmod\ftmod_pika\ftmod_pika.2010.vcxproj", "{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftmod_wanpipe", "src\ftmod\ftmod_wanpipe\ftmod_wanpipe.2010.vcxproj", "{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftmod_sangoma_boost", "src\ftmod\ftmod_sangoma_boost\ftmod_sangoma_boost.2010.vcxproj", "{D021EF2A-460D-4827-A0F7-41FDECF46F1B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testboost", "msvc\testboost\testboost.2010.vcxproj", "{2B1BAF36-0241-43E7-B865-A8338AD48E2E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsangomaboost", "msvc\testboost\testsangomaboost.2010.vcxproj", "{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftmod_sangoma_isdn", "src\ftmod\ftmod_sangoma_isdn\ftmod_sangoma_isdn.2010.vcxproj", "{B2AF4EA6-0CD7-4529-9EB5-5AF43DB90395}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ftmod_r2", "src\ftmod\ftmod_r2\ftmod_r2.2010.vcxproj", "{08C3EA27-A51D-47F8-B47D-B189C649CF30}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Debug|Win32.Build.0 = Debug|Win32
+		{93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Debug|x64.ActiveCfg = Debug|x64
+		{93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Debug|x64.Build.0 = Debug|x64
+		{93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Release|Win32.ActiveCfg = Release|Win32
+		{93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Release|Win32.Build.0 = Release|Win32
+		{93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Release|x64.ActiveCfg = Release|x64
+		{93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Release|x64.Build.0 = Release|x64
+		{BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Debug|Win32.Build.0 = Debug|Win32
+		{BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Debug|x64.ActiveCfg = Debug|x64
+		{BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Debug|x64.Build.0 = Debug|x64
+		{BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Release|Win32.ActiveCfg = Release|Win32
+		{BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Release|Win32.Build.0 = Release|Win32
+		{BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Release|x64.ActiveCfg = Release|x64
+		{BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Release|x64.Build.0 = Release|x64
+		{6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Debug|x64.ActiveCfg = Debug|x64
+		{6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Release|Win32.ActiveCfg = Release|Win32
+		{6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Release|x64.ActiveCfg = Release|x64
+		{FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.Build.0 = Debug|Win32
+		{FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|x64.ActiveCfg = Debug|x64
+		{FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|x64.Build.0 = Debug|x64
+		{FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.ActiveCfg = Release|Win32
+		{FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.Build.0 = Release|Win32
+		{FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|x64.ActiveCfg = Release|x64
+		{FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|x64.Build.0 = Release|x64
+		{37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Debug|Win32.ActiveCfg = Debug|Win32
+		{37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Debug|Win32.Build.0 = Debug|Win32
+		{37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Debug|x64.ActiveCfg = Debug|x64
+		{37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Debug|x64.Build.0 = Debug|x64
+		{37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Release|Win32.ActiveCfg = Release|Win32
+		{37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Release|Win32.Build.0 = Release|Win32
+		{37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Release|x64.ActiveCfg = Release|x64
+		{37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Release|x64.Build.0 = Release|x64
+		{B3F49375-2834-4937-9D8C-4AC2EC911010}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B3F49375-2834-4937-9D8C-4AC2EC911010}.Debug|Win32.Build.0 = Debug|Win32
+		{B3F49375-2834-4937-9D8C-4AC2EC911010}.Debug|x64.ActiveCfg = Debug|x64
+		{B3F49375-2834-4937-9D8C-4AC2EC911010}.Debug|x64.Build.0 = Debug|x64
+		{B3F49375-2834-4937-9D8C-4AC2EC911010}.Release|Win32.ActiveCfg = Release|Win32
+		{B3F49375-2834-4937-9D8C-4AC2EC911010}.Release|Win32.Build.0 = Release|Win32
+		{B3F49375-2834-4937-9D8C-4AC2EC911010}.Release|x64.ActiveCfg = Release|x64
+		{B3F49375-2834-4937-9D8C-4AC2EC911010}.Release|x64.Build.0 = Release|x64
+		{729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Debug|Win32.ActiveCfg = Debug|Win32
+		{729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Debug|x64.ActiveCfg = Debug|x64
+		{729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Release|Win32.ActiveCfg = Release|Win32
+		{729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Release|x64.ActiveCfg = Release|x64
+		{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}.Debug|x64.ActiveCfg = Debug|x64
+		{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}.Release|Win32.ActiveCfg = Release|Win32
+		{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}.Release|x64.ActiveCfg = Release|x64
+		{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Debug|Win32.Build.0 = Debug|Win32
+		{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Debug|x64.ActiveCfg = Debug|x64
+		{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Release|Win32.ActiveCfg = Release|Win32
+		{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Release|x64.ActiveCfg = Release|x64
+		{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Debug|Win32.Build.0 = Debug|Win32
+		{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Debug|x64.ActiveCfg = Debug|x64
+		{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Debug|x64.Build.0 = Debug|x64
+		{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Release|Win32.ActiveCfg = Release|Win32
+		{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Release|Win32.Build.0 = Release|Win32
+		{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Release|x64.ActiveCfg = Release|x64
+		{D021EF2A-460D-4827-A0F7-41FDECF46F1B}.Release|x64.Build.0 = Release|x64
+		{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Debug|Win32.Build.0 = Debug|Win32
+		{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Debug|x64.ActiveCfg = Debug|x64
+		{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Debug|x64.Build.0 = Debug|x64
+		{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Release|Win32.ActiveCfg = Release|Win32
+		{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Release|Win32.Build.0 = Release|Win32
+		{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Release|x64.ActiveCfg = Release|x64
+		{2B1BAF36-0241-43E7-B865-A8338AD48E2E}.Release|x64.Build.0 = Release|x64
+		{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Debug|Win32.Build.0 = Debug|Win32
+		{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Debug|x64.ActiveCfg = Debug|x64
+		{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Debug|x64.Build.0 = Debug|x64
+		{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Release|Win32.ActiveCfg = Release|Win32
+		{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Release|Win32.Build.0 = Release|Win32
+		{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Release|x64.ActiveCfg = Release|x64
+		{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}.Release|x64.Build.0 = Release|x64
+		{B2AF4EA6-0CD7-4529-9EB5-5AF43DB90395}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B2AF4EA6-0CD7-4529-9EB5-5AF43DB90395}.Debug|Win32.Build.0 = Debug|Win32
+		{B2AF4EA6-0CD7-4529-9EB5-5AF43DB90395}.Debug|x64.ActiveCfg = Debug|x64
+		{B2AF4EA6-0CD7-4529-9EB5-5AF43DB90395}.Release|Win32.ActiveCfg = Release|Win32
+		{B2AF4EA6-0CD7-4529-9EB5-5AF43DB90395}.Release|Win32.Build.0 = Release|Win32
+		{B2AF4EA6-0CD7-4529-9EB5-5AF43DB90395}.Release|x64.ActiveCfg = Release|x64
+		{08C3EA27-A51D-47F8-B47D-B189C649CF30}.Debug|Win32.ActiveCfg = Debug|Win32
+		{08C3EA27-A51D-47F8-B47D-B189C649CF30}.Debug|x64.ActiveCfg = Debug|x64
+		{08C3EA27-A51D-47F8-B47D-B189C649CF30}.Release|Win32.ActiveCfg = Release|Win32
+		{08C3EA27-A51D-47F8-B47D-B189C649CF30}.Release|x64.ActiveCfg = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.2010.vcxproj b/libs/freetdm/mod_freetdm/mod_freetdm.2010.vcxproj
new file mode 100644
index 0000000000..ec69333410
--- /dev/null
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.2010.vcxproj
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>mod_freetdm</ProjectName>
+    <ProjectGuid>{FE3540C5-3303-46E0-A69E-D92F775687F1}</ProjectGuid>
+    <RootNamespace>mod_freetdm</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)\mod\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(PlatformName)\$(Configuration)\mod\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)\mod\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(PlatformName)\$(Configuration)\mod\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../../src/include;../src/include;../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>FreeSwitchCore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../../../$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(OutDir)mod_freetdm.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../../src/include;../src/include;../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>FreeSwitchCore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../../../$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(OutDir)mod_freetdm.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../../src/include;../src/include;../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>FreeSwitchCore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../../../$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(OutDir)mod_freetdm.lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../../src/include;../src/include;../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>FreeSwitchCore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../../../$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(OutDir)mod_freetdm.lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="mod_freetdm.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\msvc\freetdm.2010.vcxproj">
+      <Project>{93b8812c-3ec4-4f78-8970-ffbfc99e167d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.2010.vcxproj.filters b/libs/freetdm/mod_freetdm/mod_freetdm.2010.vcxproj.filters
new file mode 100644
index 0000000000..92ac5ead47
--- /dev/null
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.2010.vcxproj.filters
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="mod_freetdm.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index a410e4eac6..38197bb2f0 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -149,6 +149,7 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id);
 static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id);
 static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
+static const char* channel_get_variable(switch_core_session_t *session, switch_event_t *var_event, const char *variable_name);
 ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session_t **sp);
 void dump_chan(ftdm_span_t *span, uint32_t chan_id, switch_stream_handle_t *stream);
 void dump_chan_xml(ftdm_span_t *span, uint32_t chan_id, switch_stream_handle_t *stream);
@@ -425,8 +426,11 @@ static switch_status_t channel_on_routing(switch_core_session_t *session)
 	tech_pvt = switch_core_session_get_private(session);
 	assert(tech_pvt != NULL);
 
+	assert(tech_pvt->ftdmchan != NULL);
+
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL ROUTING\n", switch_channel_get_name(channel));
 
+	ftdm_channel_call_indicate(tech_pvt->ftdmchan, FTDM_CHANNEL_INDICATE_PROCEED);
 	return SWITCH_STATUS_SUCCESS;
 }
 
@@ -837,9 +841,9 @@ static switch_status_t channel_receive_message_b(switch_core_session_t *session,
 	assert(tech_pvt != NULL);
 
 	if (switch_test_flag(tech_pvt, TFLAG_DEAD)) {
-        switch_channel_hangup(channel, SWITCH_CAUSE_LOSE_RACE);
-        return SWITCH_STATUS_FALSE;
-    }
+		switch_channel_hangup(channel, SWITCH_CAUSE_LOSE_RACE);
+		return SWITCH_STATUS_FALSE;
+    	}
 
 	if (ftdm_channel_call_check_hangup(tech_pvt->ftdmchan)) {
 		return SWITCH_STATUS_SUCCESS;
@@ -852,7 +856,7 @@ static switch_status_t channel_receive_message_b(switch_core_session_t *session,
 	switch (msg->message_id) {
 	case SWITCH_MESSAGE_INDICATE_RINGING:
 		{
-			ftdm_channel_call_indicate(tech_pvt->ftdmchan, FTDM_CHANNEL_INDICATE_PROGRESS);
+			ftdm_channel_call_indicate(tech_pvt->ftdmchan, FTDM_CHANNEL_INDICATE_RINGING);
 		}
 		break;
 	case SWITCH_MESSAGE_INDICATE_PROGRESS:
@@ -884,9 +888,9 @@ static switch_status_t channel_receive_message_fxo(switch_core_session_t *sessio
 	assert(tech_pvt != NULL);
 
 	if (switch_test_flag(tech_pvt, TFLAG_DEAD)) {
-        switch_channel_hangup(channel, SWITCH_CAUSE_LOSE_RACE);
-        return SWITCH_STATUS_FALSE;
-    }
+		switch_channel_hangup(channel, SWITCH_CAUSE_LOSE_RACE);
+		return SWITCH_STATUS_FALSE;
+    	}
 	
 	if (switch_channel_test_flag(channel, CF_OUTBOUND)) {
 		return SWITCH_STATUS_SUCCESS;
@@ -935,7 +939,7 @@ static switch_status_t channel_receive_message_fxs(switch_core_session_t *sessio
 			!switch_channel_test_flag(channel, CF_EARLY_MEDIA) &&
 			!switch_channel_test_flag(channel, CF_RING_READY)
 			) {
-				ftdm_channel_call_indicate(tech_pvt->ftdmchan, FTDM_CHANNEL_INDICATE_RING);
+				ftdm_channel_call_indicate(tech_pvt->ftdmchan, FTDM_CHANNEL_INDICATE_RINGING);
 				switch_channel_mark_ring_ready(channel);
 		}
 		break;
@@ -1046,6 +1050,27 @@ switch_io_routines_t freetdm_io_routines = {
 	/*.receive_message*/ channel_receive_message
 };
 
+static const char* channel_get_variable(switch_core_session_t *session, switch_event_t *var_event, const char *variable_name)
+{
+       const char *variable = NULL;
+
+       if (var_event) {
+               if ((variable = switch_event_get_header(var_event, variable_name))) {
+                       return variable;
+               }
+       }
+       if (session) {
+               switch_channel_t *channel = switch_core_session_get_channel(session);
+               if ((variable = switch_channel_get_variable(channel, variable_name))) {
+                       return variable;
+               }
+       }
+       if ((variable = switch_core_get_variable(variable_name))) {
+               return variable;
+       }
+       return NULL;
+}
+
 /* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines
 that allocate memory or you will have 1 channel with memory allocated from another channel's pool!
 */
@@ -1223,20 +1248,6 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 		}
 	}
 
-	if (session) {
-		/* take out some other values from the session if they're present */
-		switch_channel_t *channel = switch_core_session_get_channel(session);
-		const char *freetdmvar;
-		freetdmvar = switch_channel_get_variable(channel, "freetdm_bearer_capability");
-		if (freetdmvar) {
-			caller_data.bearer_capability = (uint8_t)atoi(freetdmvar);
-		}
-		freetdmvar = switch_channel_get_variable(channel, "freetdm_bearer_layer1");
-		if (freetdmvar) {
-			caller_data.bearer_layer1 = (uint8_t)atoi(freetdmvar);
-		}
-	}
-
 	if (switch_test_flag(outbound_profile, SWITCH_CPF_SCREEN)) {
 		caller_data.screen = 1;
 	}
@@ -1245,29 +1256,37 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 		caller_data.pres = 1;
 	}
 
-	if (!zstr(dest)) {
-		ftdm_set_string(caller_data.dnis.digits, dest);
+	if ((var = channel_get_variable(session, var_event, "freetdm_bearer_capability"))) {
+		caller_data.bearer_capability = (uint8_t)atoi(var);
 	}
 	
-	if ((var = switch_event_get_header(var_event, "freetdm_outbound_ton")) || (var = switch_core_get_variable("freetdm_outbound_ton"))) {
-		if (!strcasecmp(var, "national")) {
-			caller_data.dnis.type = FTDM_TON_NATIONAL;
-		} else if (!strcasecmp(var, "international")) {
-			caller_data.dnis.type = FTDM_TON_INTERNATIONAL;
-		} else if (!strcasecmp(var, "local")) {
-			caller_data.dnis.type = FTDM_TON_SUBSCRIBER_NUMBER;
-		} else if (!strcasecmp(var, "unknown")) {
-			caller_data.dnis.type = FTDM_TON_UNKNOWN;
-		}
+	if ((var = channel_get_variable(session, var_event, "freetdm_bearer_layer1"))) {
+			caller_data.bearer_layer1 = (uint8_t)atoi(var);
+	}
+
+	if ((var = channel_get_variable(session, var_event, "freetdm_screening_ind"))) {
+			ftdm_set_screening_ind(var, &caller_data.screen);
+	}
+
+	if ((var = channel_get_variable(session, var_event, "freetdm_presentation_ind"))) {
+			ftdm_set_presentation_ind(var, &caller_data.pres);
+	}
+
+	if ((var = channel_get_variable(session, var_event, "freetdm_outbound_ton"))) {
+			ftdm_set_ton(var, &caller_data.dnis.type);
 	} else {
 		caller_data.dnis.type = outbound_profile->destination_number_ton;
 	}
 
-	if ((var = switch_event_get_header(var_event, "freetdm_custom_call_data")) || (var = switch_core_get_variable("freetdm_custom_call_data"))) {
+	if ((var = channel_get_variable(session, var_event, "freetdm_custom_call_data"))) {
 		ftdm_set_string(caller_data.raw_data, var);
 		caller_data.raw_data_len = (uint32_t)strlen(var);
 	}
 	
+	if (!zstr(dest)) {
+		ftdm_set_string(caller_data.dnis.digits, dest);
+	}
+
 	caller_data.dnis.plan = outbound_profile->destination_number_numplan;
 
 	/* blindly copy data from outbound_profile. They will be overwritten
@@ -1310,7 +1329,7 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
 			char *v = h->name + FREETDM_VAR_PREFIX_LEN;
 			if (!zstr(v)) {
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding outbound freetdm variable %s=%s to channel %d:%d\n", v, h->value, span_id, chan_id);
-				ftdm_channel_add_var(ftdmchan, v, h->value);
+				ftdm_call_add_var(&caller_data, v, h->value);
 			}
 		}
 	}
@@ -1398,6 +1417,24 @@ fail:
 
 }
 
+static void ftdm_enable_channel_dtmf(ftdm_channel_t *fchan, switch_channel_t *channel)
+{
+	if (channel) {
+		const char *var;
+		if ((var = switch_channel_get_variable(channel, "freetdm_disable_dtmf"))) {
+			if (switch_true(var)) {
+				ftdm_channel_command(fchan, FTDM_COMMAND_DISABLE_DTMF_DETECT, NULL);
+				ftdm_log(FTDM_LOG_INFO, "DTMF detection disabled in channel %d:%d\n", ftdm_channel_get_span_id(fchan), ftdm_channel_get_id(fchan));
+				return;
+			}
+		}
+		/* the variable is not present or has a negative value then proceed to enable DTMF ... */
+	}
+	if (ftdm_channel_command(fchan, FTDM_COMMAND_ENABLE_DTMF_DETECT, NULL) != FTDM_SUCCESS) {
+		ftdm_log(FTDM_LOG_ERROR, "Failed to enable DTMF detection in channel %d:%d\n", ftdm_channel_get_span_id(fchan), ftdm_channel_get_id(fchan));
+	}
+}
+
 ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session_t **sp)
 {
 	switch_core_session_t *session = NULL;
@@ -1421,6 +1458,9 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
 		return FTDM_FAIL;
 	}
 	
+	/* I guess we always want DTMF detection */
+	ftdm_enable_channel_dtmf(sigmsg->channel, NULL);
+
 	switch_core_session_add_stream(session, NULL);
 	
 	tech_pvt = (private_t *) switch_core_session_alloc(session, sizeof(private_t));
@@ -1488,6 +1528,7 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
 	switch_channel_set_variable_printf(channel, "freetdm_chan_number", "%d", chanid);
 	switch_channel_set_variable_printf(channel, "freetdm_bearer_capability", "%d", channel_caller_data->bearer_capability);	
 	switch_channel_set_variable_printf(channel, "freetdm_bearer_layer1", "%d", channel_caller_data->bearer_layer1);
+	
 	if (globals.sip_headers) {
 		switch_channel_set_variable(channel, "sip_h_X-FreeTDM-SpanName", ftdm_channel_get_span_name(sigmsg->channel));
 		switch_channel_set_variable_printf(channel, "sip_h_X-FreeTDM-SpanNumber", "%d", spanid);	
@@ -1521,8 +1562,18 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
 		ftdm_channel_get_current_var(curr, &var_name, &var_value);
 		snprintf(name, sizeof(name), FREETDM_VAR_PREFIX "%s", var_name);
 		switch_channel_set_variable_printf(channel, name, "%s", var_value);
+	}	
+	
+	/* Add any call variable to the dial plan */
+	iter = ftdm_call_get_var_iterator(channel_caller_data, iter);
+	for (curr = iter ; curr; curr = ftdm_iterator_next(curr)) {
+		ftdm_call_get_current_var(curr, &var_name, &var_value);
+		snprintf(name, sizeof(name), FREETDM_VAR_PREFIX "%s", var_name);
+		switch_channel_set_variable_printf(channel, name, "%s", var_value);
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Call Variable: %s=%s\n", name, var_value);
 	}
 	ftdm_iterator_free(iter);
+	
 
 	switch_channel_set_state(channel, CS_INIT);
 	if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) {
@@ -1614,24 +1665,6 @@ static FIO_SIGNAL_CB_FUNCTION(on_common_signal)
 	return FTDM_BREAK;
 }
 
-static void ftdm_enable_channel_dtmf(ftdm_channel_t *fchan, switch_channel_t *channel)
-{
-	if (channel) {
-		const char *var;
-		if ((var = switch_channel_get_variable(channel, "freetdm_disable_dtmf"))) {
-			if (switch_true(var)) {
-				ftdm_channel_command(fchan, FTDM_COMMAND_DISABLE_DTMF_DETECT, NULL);
-				ftdm_log(FTDM_LOG_INFO, "DTMF detection disabled in channel %d:%d\n", ftdm_channel_get_span_id(fchan), ftdm_channel_get_id(fchan));
-				return;
-			}
-		}
-		/* the variable is not present or has a negative value then proceed to enable DTMF ... */
-	}
-	if (ftdm_channel_command(fchan, FTDM_COMMAND_ENABLE_DTMF_DETECT, NULL) != FTDM_SUCCESS) {
-		ftdm_log(FTDM_LOG_ERROR, "Failed to enable DTMF detection in channel %d:%d\n", ftdm_channel_get_span_id(fchan), ftdm_channel_get_id(fchan));
-	}
-}
-
 static FIO_SIGNAL_CB_FUNCTION(on_fxo_signal)
 {
 	switch_core_session_t *session = NULL;
@@ -1639,11 +1672,11 @@ static FIO_SIGNAL_CB_FUNCTION(on_fxo_signal)
 	ftdm_status_t status;
 	uint32_t spanid;
 	uint32_t chanid;
-	ftdm_caller_data_t *callerdata;
+	ftdm_caller_data_t *caller_data;
 
 	spanid = ftdm_channel_get_span_id(sigmsg->channel);
 	chanid = ftdm_channel_get_id(sigmsg->channel);
-	callerdata = ftdm_channel_get_caller_data(sigmsg->channel);
+	caller_data = ftdm_channel_get_caller_data(sigmsg->channel);
 
 	ftdm_log(FTDM_LOG_DEBUG, "got FXO sig %d:%d [%s]\n", spanid, chanid, ftdm_signal_event2str(sigmsg->event_id));
 
@@ -1666,7 +1699,7 @@ static FIO_SIGNAL_CB_FUNCTION(on_fxo_signal)
 				switch_set_flag_locked(tech_pvt, TFLAG_DEAD);
 				ftdm_channel_clear_token(sigmsg->channel, 0);
 				channel = switch_core_session_get_channel(session);
-				switch_channel_hangup(channel, callerdata->hangup_cause);
+				switch_channel_hangup(channel, caller_data->hangup_cause);
 				ftdm_channel_clear_token(sigmsg->channel, switch_core_session_get_uuid(session));
 				switch_core_session_rwunlock(session);
 			}
@@ -1690,7 +1723,8 @@ static FIO_SIGNAL_CB_FUNCTION(on_fxo_signal)
 			}
 		}
 		break;
-
+	case FTDM_SIGEVENT_RELEASED: { /* twiddle */ } break;
+	
 	default:
 		{
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unhandled msg type %d for channel %d:%d\n",
@@ -1744,6 +1778,8 @@ static FIO_SIGNAL_CB_FUNCTION(on_fxs_signal)
 			}
 		}
 		break;
+	case FTDM_SIGEVENT_RELEASED: { /* twiddle */ } break;
+	
     case FTDM_SIGEVENT_STOP:
 		{
 			private_t *tech_pvt = NULL;
@@ -1966,7 +2002,9 @@ static FIO_SIGNAL_CB_FUNCTION(on_r2_signal)
 			status = ftdm_channel_from_event(sigmsg, &session);
 		}
 		break;
-
+		
+		case FTDM_SIGEVENT_RELEASED: { /* twiddle */ } break;
+		
 		/* on DNIS received from the R2 forward side, return status == FTDM_BREAK to stop requesting DNIS */
 		case FTDM_SIGEVENT_COLLECTED_DIGIT: 
 		{
@@ -2007,7 +2045,6 @@ static FIO_SIGNAL_CB_FUNCTION(on_r2_signal)
 		break;
 
 		case FTDM_SIGEVENT_PROGRESS:
-		case FTDM_SIGEVENT_PROGRESS_MEDIA:
 		{
 			if ((session = ftdm_channel_get_session(sigmsg->channel, 0))) {
 				channel = switch_core_session_get_channel(session);
@@ -2017,6 +2054,16 @@ static FIO_SIGNAL_CB_FUNCTION(on_r2_signal)
 		}
 		break;
 
+		case FTDM_SIGEVENT_PROGRESS_MEDIA:
+		{
+			if ((session = ftdm_channel_get_session(sigmsg->channel, 0))) {
+				channel = switch_core_session_get_channel(session);
+				switch_channel_mark_pre_answered(channel);
+				switch_core_session_rwunlock(session);
+			}
+		}
+		break;
+
 		case FTDM_SIGEVENT_UP:
 		{
 			if ((session = ftdm_channel_get_session(sigmsg->channel, 0))) {
@@ -2028,6 +2075,16 @@ static FIO_SIGNAL_CB_FUNCTION(on_r2_signal)
 		}
 		break;
 
+		case FTDM_SIGEVENT_SIGSTATUS_CHANGED:
+		{
+			ftdm_signaling_status_t sigstatus = sigmsg->raw_data ? *((ftdm_signaling_status_t*)(sigmsg->raw_data)) : sigmsg->sigstatus;
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%d:%d signalling changed to: %s\n",
+					spanid, chanid, ftdm_signaling_status2str(sigstatus));
+		}
+		break;
+
+		case FTDM_SIGEVENT_PROCEED:{} break;
+
 		default:
 		{
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unhandled event %d from R2 for channel %d:%d\n",
@@ -2059,10 +2116,14 @@ static FIO_SIGNAL_CB_FUNCTION(on_clear_channel_signal)
     switch(sigmsg->event_id) {
     case FTDM_SIGEVENT_START:
 		{
-			ftdm_enable_channel_dtmf(sigmsg->channel, NULL);
+			ftdm_call_add_var(caller_data, "screening_ind", ftdm_screening2str(caller_data->screen));
+			ftdm_call_add_var(caller_data, "presentation_ind", ftdm_presentation2str(caller_data->pres));
 			return ftdm_channel_from_event(sigmsg, &session);
 		}
 		break;
+
+	case FTDM_SIGEVENT_RELEASED: { /* twiddle */ } break;
+		
     case FTDM_SIGEVENT_STOP:
     case FTDM_SIGEVENT_RESTART:
 		{
@@ -2118,7 +2179,7 @@ static FIO_SIGNAL_CB_FUNCTION(on_clear_channel_signal)
 					spanid, chanid, (uuid) ? uuid : "N/A");
 			}
 		}
-		break;
+		break;	
 	case FTDM_SIGEVENT_SIGSTATUS_CHANGED:
 		{	
 			ftdm_signaling_status_t sigstatus = sigmsg->raw_data ? *((ftdm_signaling_status_t*)(sigmsg->raw_data)) : sigmsg->sigstatus;
@@ -2126,6 +2187,10 @@ static FIO_SIGNAL_CB_FUNCTION(on_clear_channel_signal)
 					spanid, chanid, ftdm_signaling_status2str(sigstatus));
 		}
 		break;
+	case FTDM_SIGEVENT_PROCEED:
+	case FTDM_SIGEVENT_FACILITY:
+		/* FS does not have handlers for these messages, so ignore them for now */
+		break;
 	default:
 		{
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unhandled msg type %d for channel %d:%d\n",
@@ -3193,33 +3258,10 @@ static switch_status_t load_config(void)
 
 	if ((spans = switch_xml_child(cfg, "r2_spans"))) {
 		for (myspan = switch_xml_child(spans, "span"); myspan; myspan = myspan->next) {
-			char *id = (char *) switch_xml_attr(myspan, "id");
 			char *name = (char *) switch_xml_attr(myspan, "name");
+			char *configname = (char *) switch_xml_attr(myspan, "cfgprofile");
 			ftdm_status_t zstatus = FTDM_FAIL;
 
-			/* strings */
-			const char *variant = "itu";
-			const char *category = "national_subscriber";
-			const char *logdir = "/usr/local/freeswitch/log/"; /* FIXME: get PREFIX variable */
-			const char *logging = "notice,warning,error";
-			const char *advanced_protocol_file = "";
-
-			/* booleans */
-			int call_files = 0;
-			int get_ani_first = -1;
-			int immediate_accept = -1;
-			int double_answer = -1;
-			int skip_category = -1;
-			int forced_release = -1;
-			int charge_calls = -1;
-
-			/* integers */
-			int mfback_timeout = -1;
-			int metering_pulse_timeout = -1;
-			int allow_collect_calls = -1;
-			int max_ani = 10;
-			int max_dnis = 4;
-
 			/* common non r2 stuff */
 			const char *context = "default";
 			const char *dialplan = "XML";
@@ -3228,53 +3270,29 @@ static switch_status_t load_config(void)
 			uint32_t span_id = 0;
 			ftdm_span_t *span = NULL;
 
+			ftdm_conf_parameter_t spanparameters[30];
+			unsigned paramindex = 0;
+
+			if (!name) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "'name' attribute required for R2 spans!\n");
+				continue;
+			}
+
+			memset(spanparameters, 0, sizeof(spanparameters));
+
+			if (configname) {
+				paramindex = add_profile_parameters(cfg, configname, spanparameters, ftdm_array_len(spanparameters));
+				if (paramindex) {
+					ftdm_log(FTDM_LOG_DEBUG, "Added %d parameters from profile %s for span %d\n", paramindex, configname, span_id);
+				}
+			}
 
 			for (param = switch_xml_child(myspan, "param"); param; param = param->next) {
 				char *var = (char *) switch_xml_attr_soft(param, "name");
 				char *val = (char *) switch_xml_attr_soft(param, "value");
 
 				/* string parameters */
-				if (!strcasecmp(var, "variant")) {
-					variant = val;
-				} else if (!strcasecmp(var, "category")) {
-					category = val;
-				} else if (!strcasecmp(var, "logdir")) {
-					logdir = val;
-				} else if (!strcasecmp(var, "logging")) {
-					logging = val;
-				} else if (!strcasecmp(var, "advanced_protocol_file")) {
-					advanced_protocol_file = val;
-
-				/* booleans */
-				} else if (!strcasecmp(var, "allow_collect_calls")) {
-					allow_collect_calls = switch_true(val);
-				} else if (!strcasecmp(var, "immediate_accept")) {
-					immediate_accept = switch_true(val);
-				} else if (!strcasecmp(var, "double_answer")) {
-					double_answer = switch_true(val);
-				} else if (!strcasecmp(var, "skip_category")) {
-					skip_category = switch_true(var);
-				} else if (!strcasecmp(var, "forced_release")) {
-					forced_release = switch_true(val);
-				} else if (!strcasecmp(var, "charge_calls")) {
-					charge_calls = switch_true(val);
-				} else if (!strcasecmp(var, "get_ani_first")) {
-					get_ani_first = switch_true(val);
-				} else if (!strcasecmp(var, "call_files")) {
-					call_files = switch_true(val);
-
-				/* integers */
-				} else if (!strcasecmp(var, "mfback_timeout")) {
-					mfback_timeout = atoi(val);
-				} else if (!strcasecmp(var, "metering_pulse_timeout")) {
-					metering_pulse_timeout = atoi(val);
-				} else if (!strcasecmp(var, "max_ani")) {
-					max_ani = atoi(val);
-				} else if (!strcasecmp(var, "max_dnis")) {
-					max_dnis = atoi(val);
-
-				/* common non r2 stuff */
-				} else if (!strcasecmp(var, "context")) {
+				if (!strcasecmp(var, "context")) {
 					context = val;
 				} else if (!strcasecmp(var, "dialplan")) {
 					dialplan = val;
@@ -3282,57 +3300,23 @@ static switch_status_t load_config(void)
 					dial_regex = val;
 				} else if (!strcasecmp(var, "fail-dial-regex")) {
 					fail_dial_regex = val;
+				} else {
+					spanparameters[paramindex].var = var;
+					spanparameters[paramindex].val = val;
+					paramindex++;
 				}
 			}
 
-			if (!id && !name) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "span missing required param 'id'\n");
-				continue;
-			}
-
-			if (name) {
-				zstatus = ftdm_span_find_by_name(name, &span);
-			} else {
-				if (switch_is_number(id)) {
-					span_id = atoi(id);
-					zstatus = ftdm_span_find(span_id, &span);
-				}
-
-				if (zstatus != FTDM_SUCCESS) {
-					zstatus = ftdm_span_find_by_name(id, &span);
-				}
-			}
-
+			zstatus = ftdm_span_find_by_name(name, &span);
 			if (zstatus != FTDM_SUCCESS) {
-				ftdm_log(FTDM_LOG_ERROR, "Error finding FreeTDM span id:%s name:%s\n", switch_str_nil(id), switch_str_nil(name));
+				ftdm_log(FTDM_LOG_ERROR, "Error finding FreeTDM R2 Span '%s'\n", name);
 				continue;
 			}
+			span_id = ftdm_span_get_id(span);
 
-			if (!span_id) {
-				span_id = ftdm_span_get_id(span);
-			}
-
-			if (ftdm_configure_span(span, "r2", on_r2_signal, 
-				"variant", variant, 
-				"max_ani", max_ani,
-				"max_dnis", max_dnis,
-				"category", category,
-				"logdir", logdir,
-				"logging", logging,
-				"advanced_protocol_file", advanced_protocol_file,
-				"allow_collect_calls", allow_collect_calls,
-				"immediate_accept", immediate_accept,
-				"double_answer", double_answer,
-				"skip_category", skip_category,
-				"forced_release", forced_release,
-				"charge_calls", charge_calls,
-				"get_ani_first", get_ani_first,
-				"call_files", call_files,
-				"mfback_timeout", mfback_timeout,
-				"metering_pulse_timeout", metering_pulse_timeout, 
-				FTDM_TAG_END) != FTDM_SUCCESS) {
-				ftdm_log(FTDM_LOG_ERROR, "Error configuring R2 FreeTDM span %d, error: %s\n", 
-				span_id, ftdm_span_get_last_error(span));
+			if (ftdm_configure_span_signaling(span, "r2", on_r2_signal, spanparameters) != FTDM_SUCCESS) {
+				ftdm_log(FTDM_LOG_ERROR, "Error configuring FreeTDM R2 span %s, error: %s\n", 
+				name, ftdm_span_get_last_error(span));
 				continue;
 			}
 
@@ -3347,10 +3331,10 @@ static switch_status_t load_config(void)
 			SPAN_CONFIG[span_id].span = span;
 			switch_copy_string(SPAN_CONFIG[span_id].context, context, sizeof(SPAN_CONFIG[span_id].context));
 			switch_copy_string(SPAN_CONFIG[span_id].dialplan, dialplan, sizeof(SPAN_CONFIG[span_id].dialplan));
-			switch_copy_string(SPAN_CONFIG[span_id].type, "r2", sizeof(SPAN_CONFIG[span_id].type));
+			switch_copy_string(SPAN_CONFIG[span_id].type, "R2", sizeof(SPAN_CONFIG[span_id].type));
 
 			if (ftdm_span_start(span) == FTDM_FAIL) {
-				ftdm_log(FTDM_LOG_ERROR, "Error starting R2 FreeTDM span %d, error: %s\n", span_id, ftdm_span_get_last_error(span));
+				ftdm_log(FTDM_LOG_ERROR, "Error starting FreeTDM R2 span %s, error: %s\n", name, ftdm_span_get_last_error(span));
 				continue;
 			}
 		}
diff --git a/libs/freetdm/msvc/freetdm.2010.vcxproj b/libs/freetdm/msvc/freetdm.2010.vcxproj
new file mode 100644
index 0000000000..71eb6dbf22
--- /dev/null
+++ b/libs/freetdm/msvc/freetdm.2010.vcxproj
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>freetdm</ProjectName>
+    <ProjectGuid>{93B8812C-3EC4-4F78-8970-FFBFC99E167D}</ProjectGuid>
+    <RootNamespace>freetdm</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog-freetdm.htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../src/include;../src/include/private;../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <DisableLanguageExtensions>false</DisableLanguageExtensions>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog-freetdm.htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <AdditionalIncludeDirectories>../src/include;../src/include/private;../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <DisableLanguageExtensions>false</DisableLanguageExtensions>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog-freetdm.htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../src/include;../src/include/private;../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <DisableLanguageExtensions>false</DisableLanguageExtensions>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog-freetdm.htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>../src/include;../src/include/private;../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <DisableLanguageExtensions>false</DisableLanguageExtensions>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\include\freetdm.h" />
+    <ClInclude Include="..\src\include\private\fsk.h" />
+    <ClInclude Include="..\src\include\private\ftdm_buffer.h" />
+    <ClInclude Include="..\src\include\private\ftdm_call_utils.h" />
+    <ClInclude Include="..\src\include\private\ftdm_config.h" />
+    <ClInclude Include="..\src\include\private\ftdm_core.h" />
+    <ClInclude Include="..\src\include\ftdm_declare.h" />
+    <ClInclude Include="..\src\include\private\ftdm_dso.h" />
+    <ClInclude Include="..\src\include\ftdm_os.h" />
+    <ClInclude Include="..\src\include\private\ftdm_sched.h" />
+    <ClInclude Include="..\src\include\ftdm_threadmutex.h" />
+    <ClInclude Include="..\src\include\private\ftdm_types.h" />
+    <ClInclude Include="..\src\include\private\g711.h" />
+    <ClInclude Include="..\src\include\private\hashtable.h" />
+    <ClInclude Include="..\src\include\private\hashtable_itr.h" />
+    <ClInclude Include="..\src\include\private\hashtable_private.h" />
+    <ClInclude Include="..\src\include\private\libteletone.h" />
+    <ClInclude Include="..\src\include\private\libteletone_detect.h" />
+    <ClInclude Include="..\src\include\private\libteletone_generate.h" />
+    <ClInclude Include="..\src\include\private\uart.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\fsk.c" />
+    <ClCompile Include="..\src\ftdm_buffer.c" />
+    <ClCompile Include="..\src\ftdm_call_utils.c" />
+    <ClCompile Include="..\src\ftdm_callerid.c" />
+    <ClCompile Include="..\src\ftdm_config.c" />
+    <ClCompile Include="..\src\ftdm_cpu_monitor.c" />
+    <ClCompile Include="..\src\ftdm_dso.c" />
+    <ClCompile Include="..\src\ftdm_io.c" />
+    <ClCompile Include="..\src\ftdm_queue.c" />
+    <ClCompile Include="..\src\ftdm_sched.c" />
+    <ClCompile Include="..\src\ftdm_threadmutex.c" />
+    <ClCompile Include="..\src\g711.c" />
+    <ClCompile Include="..\src\hashtable.c" />
+    <ClCompile Include="..\src\hashtable_itr.c" />
+    <ClCompile Include="..\src\libteletone_detect.c" />
+    <ClCompile Include="..\src\libteletone_generate.c" />
+    <ClCompile Include="..\src\uart.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/msvc/freetdm.2010.vcxproj.filters b/libs/freetdm/msvc/freetdm.2010.vcxproj.filters
new file mode 100644
index 0000000000..ed642baf3d
--- /dev/null
+++ b/libs/freetdm/msvc/freetdm.2010.vcxproj.filters
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\include\freetdm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\private\fsk.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\private\ftdm_buffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\private\ftdm_call_utils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\private\ftdm_config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\private\ftdm_core.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\ftdm_declare.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\private\ftdm_dso.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\ftdm_os.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\private\ftdm_sched.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\ftdm_threadmutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\private\ftdm_types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\private\g711.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\private\hashtable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\private\hashtable_itr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\private\hashtable_private.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\private\libteletone.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\private\libteletone_detect.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\private\libteletone_generate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\include\private\uart.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\fsk.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\ftdm_buffer.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\ftdm_call_utils.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\ftdm_callerid.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\ftdm_config.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\ftdm_cpu_monitor.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\ftdm_dso.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\ftdm_io.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\ftdm_queue.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\ftdm_sched.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\ftdm_threadmutex.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\g711.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\hashtable.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\hashtable_itr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\libteletone_detect.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\libteletone_generate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\uart.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/msvc/testanalog/testanalog.2010.vcxproj b/libs/freetdm/msvc/testanalog/testanalog.2010.vcxproj
new file mode 100644
index 0000000000..719dc618a9
--- /dev/null
+++ b/libs/freetdm/msvc/testanalog/testanalog.2010.vcxproj
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>testanalog</ProjectName>
+    <ProjectGuid>{BB833648-BAFF-4BE2-94DB-F8BB043C588C}</ProjectGuid>
+    <RootNamespace>testanalog</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog-testanalog.htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../src/include;../../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog-testanalog.htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../src/include;../../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog-testanalog.htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../src/include;../../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog-testanalog.htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../src/include;../../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\testanalog.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\freetdm.2010.vcxproj">
+      <Project>{93b8812c-3ec4-4f78-8970-ffbfc99e167d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/msvc/testanalog/testanalog.2010.vcxproj.filters b/libs/freetdm/msvc/testanalog/testanalog.2010.vcxproj.filters
new file mode 100644
index 0000000000..7ac3635cc5
--- /dev/null
+++ b/libs/freetdm/msvc/testanalog/testanalog.2010.vcxproj.filters
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\testanalog.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/msvc/testboost/testboost.2008.vcproj b/libs/freetdm/msvc/testboost/testboost.2008.vcproj
index afb44b6469..5707033f33 100644
--- a/libs/freetdm/msvc/testboost/testboost.2008.vcproj
+++ b/libs/freetdm/msvc/testboost/testboost.2008.vcproj
@@ -22,7 +22,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="testboost\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
 			BuildLogFile="$(IntDir)\BuildLog-testboost.htm"
@@ -97,87 +97,10 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			BuildLogFile="$(IntDir)\BuildLog-testboost.htm"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../src/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\testboost\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
 			BuildLogFile="$(IntDir)\BuildLog-testboost.htm"
@@ -253,10 +176,87 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="testboost\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			BuildLogFile="$(IntDir)\BuildLog-testboost.htm"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../src/include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				WarnAsError="true"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4100"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\testboost\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
diff --git a/libs/freetdm/msvc/testboost/testboost.2010.vcxproj b/libs/freetdm/msvc/testboost/testboost.2010.vcxproj
new file mode 100644
index 0000000000..62061485c2
--- /dev/null
+++ b/libs/freetdm/msvc/testboost/testboost.2010.vcxproj
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>testboost</ProjectName>
+    <ProjectGuid>{2B1BAF36-0241-43E7-B865-A8338AD48E2E}</ProjectGuid>
+    <RootNamespace>testboost</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\testboost\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\testboost\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\testboost\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\testboost\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog-testboost.htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../src/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>..\..\debug\freetdm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog-testboost.htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../src/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog-testboost.htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../src/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>freetdm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalLibraryDirectories>../../$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog-testboost.htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../src/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalDependencies>freetdm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../../$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\testboost.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\freetdm.2010.vcxproj">
+      <Project>{93b8812c-3ec4-4f78-8970-ffbfc99e167d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/msvc/testboost/testboost.2010.vcxproj.filters b/libs/freetdm/msvc/testboost/testboost.2010.vcxproj.filters
new file mode 100644
index 0000000000..74181d60a8
--- /dev/null
+++ b/libs/freetdm/msvc/testboost/testboost.2010.vcxproj.filters
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\testboost.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/msvc/testboost/testsangomaboost.2008.vcproj b/libs/freetdm/msvc/testboost/testsangomaboost.2008.vcproj
index 834b298505..29c4a2723e 100644
--- a/libs/freetdm/msvc/testboost/testsangomaboost.2008.vcproj
+++ b/libs/freetdm/msvc/testboost/testsangomaboost.2008.vcproj
@@ -97,83 +97,6 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			BuildLogFile="$(IntDir)\BuildLog-testsangomaboost.htm"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../src/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
@@ -253,6 +176,83 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			BuildLogFile="$(IntDir)\BuildLog-testsangomaboost.htm"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../src/include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				WarnAsError="true"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4100"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
@@ -285,7 +285,7 @@
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				WarnAsError="true"
+				WarnAsError="false"
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4100"
 			/>
diff --git a/libs/freetdm/msvc/testboost/testsangomaboost.2010.vcxproj b/libs/freetdm/msvc/testboost/testsangomaboost.2010.vcxproj
new file mode 100644
index 0000000000..5994da6f1a
--- /dev/null
+++ b/libs/freetdm/msvc/testboost/testsangomaboost.2010.vcxproj
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>testsangomaboost</ProjectName>
+    <ProjectGuid>{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}</ProjectGuid>
+    <RootNamespace>testsangomaboost</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog-testsangomaboost.htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../src/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>..\..\debug\freetdm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog-testsangomaboost.htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../src/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog-testsangomaboost.htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../src/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>freetdm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalLibraryDirectories>../../$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog-testsangomaboost.htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../src/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalDependencies>freetdm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../../$(PlatformName)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\testsangomaboost.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\freetdm.2010.vcxproj">
+      <Project>{93b8812c-3ec4-4f78-8970-ffbfc99e167d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/msvc/testboost/testsangomaboost.2010.vcxproj.filters b/libs/freetdm/msvc/testboost/testsangomaboost.2010.vcxproj.filters
new file mode 100644
index 0000000000..e72f14e161
--- /dev/null
+++ b/libs/freetdm/msvc/testboost/testsangomaboost.2010.vcxproj.filters
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\testsangomaboost.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/msvc/testisdn/testisdn.2010.vcxproj b/libs/freetdm/msvc/testisdn/testisdn.2010.vcxproj
new file mode 100644
index 0000000000..2dfdeb042f
--- /dev/null
+++ b/libs/freetdm/msvc/testisdn/testisdn.2010.vcxproj
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>testisdn</ProjectName>
+    <ProjectGuid>{6DA6FD42-641D-4147-92F5-3BC4AAA6589B}</ProjectGuid>
+    <RootNamespace>testisdn</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog-testisdn.htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../src/include;../../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog-testisdn.htm</Path>
+    </BuildLog>
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../src/include;../../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog-testisdn.htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../src/include;../../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog>
+      <Path>$(IntDir)BuildLog-testisdn.htm</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../src/include;../../src/isdn/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\testisdn.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\freetdm.2010.vcxproj">
+      <Project>{93b8812c-3ec4-4f78-8970-ffbfc99e167d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/msvc/testisdn/testisdn.2010.vcxproj.filters b/libs/freetdm/msvc/testisdn/testisdn.2010.vcxproj.filters
new file mode 100644
index 0000000000..9d48828d4a
--- /dev/null
+++ b/libs/freetdm/msvc/testisdn/testisdn.2010.vcxproj.filters
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\testisdn.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/openzap.2005.sln b/libs/freetdm/openzap.2005.sln
deleted file mode 100644
index c9f666b381..0000000000
--- a/libs/freetdm/openzap.2005.sln
+++ /dev/null
@@ -1,82 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openzap", "msvc\openzap.2005.vcproj", "{93B8812C-3EC4-4F78-8970-FFBFC99E167D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testanalog", "msvc\testanalog\testanalog.2005.vcproj", "{BB833648-BAFF-4BE2-94DB-F8BB043C588C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{93B8812C-3EC4-4F78-8970-FFBFC99E167D} = {93B8812C-3EC4-4F78-8970-FFBFC99E167D}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testisdn", "msvc\testisdn\testisdn.2005.vcproj", "{6DA6FD42-641D-4147-92F5-3BC4AAA6589B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{93B8812C-3EC4-4F78-8970-FFBFC99E167D} = {93B8812C-3EC4-4F78-8970-FFBFC99E167D}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_openzap", "mod_openzap\mod_openzap.2005.vcproj", "{FE3540C5-3303-46E0-A69E-D92F775687F1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{93B8812C-3EC4-4F78-8970-FFBFC99E167D} = {93B8812C-3EC4-4F78-8970-FFBFC99E167D}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ozmod_analog", "src\ozmod\ozmod_analog\ozmod_analog.2005.vcproj", "{37C94798-6E33-4B4F-8EE0-C72A7DC91157}"
-	ProjectSection(ProjectDependencies) = postProject
-		{93B8812C-3EC4-4F78-8970-FFBFC99E167D} = {93B8812C-3EC4-4F78-8970-FFBFC99E167D}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ozmod_analog_em", "src\ozmod\ozmod_analog_em\ozmod_analog_em.2005.vcproj", "{C539D7C8-26A8-4A94-B938-77672165C130}"
-	ProjectSection(ProjectDependencies) = postProject
-		{93B8812C-3EC4-4F78-8970-FFBFC99E167D} = {93B8812C-3EC4-4F78-8970-FFBFC99E167D}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ozmod_isdn", "src\ozmod\ozmod_isdn\ozmod_isdn.2005.vcproj", "{729344A5-D5E9-434D-8EE8-AF8C6C795D15}"
-	ProjectSection(ProjectDependencies) = postProject
-		{93B8812C-3EC4-4F78-8970-FFBFC99E167D} = {93B8812C-3EC4-4F78-8970-FFBFC99E167D}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ozmod_wanpipe", "src\ozmod\ozmod_wanpipe\ozmod_wanpipe.2005.vcproj", "{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ozmod_pika", "src\ozmod\ozmod_pika\ozmod_pika.2005.vcproj", "{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Debug|Win32.Build.0 = Debug|Win32
-		{93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Release|Win32.ActiveCfg = Release|Win32
-		{93B8812C-3EC4-4F78-8970-FFBFC99E167D}.Release|Win32.Build.0 = Release|Win32
-		{BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Debug|Win32.Build.0 = Debug|Win32
-		{BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Release|Win32.ActiveCfg = Release|Win32
-		{BB833648-BAFF-4BE2-94DB-F8BB043C588C}.Release|Win32.Build.0 = Release|Win32
-		{6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Debug|Win32.Build.0 = Debug|Win32
-		{6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Release|Win32.ActiveCfg = Release|Win32
-		{6DA6FD42-641D-4147-92F5-3BC4AAA6589B}.Release|Win32.Build.0 = Release|Win32
-		{FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FE3540C5-3303-46E0-A69E-D92F775687F1}.Debug|Win32.Build.0 = Debug|Win32
-		{FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.ActiveCfg = Release|Win32
-		{FE3540C5-3303-46E0-A69E-D92F775687F1}.Release|Win32.Build.0 = Release|Win32
-		{37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Debug|Win32.ActiveCfg = Debug|Win32
-		{37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Debug|Win32.Build.0 = Debug|Win32
-		{37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Release|Win32.ActiveCfg = Release|Win32
-		{37C94798-6E33-4B4F-8EE0-C72A7DC91157}.Release|Win32.Build.0 = Release|Win32
-		{C539D7C8-26A8-4A94-B938-77672165C130}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C539D7C8-26A8-4A94-B938-77672165C130}.Debug|Win32.Build.0 = Debug|Win32
-		{C539D7C8-26A8-4A94-B938-77672165C130}.Release|Win32.ActiveCfg = Release|Win32
-		{C539D7C8-26A8-4A94-B938-77672165C130}.Release|Win32.Build.0 = Release|Win32
-		{729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Debug|Win32.ActiveCfg = Debug|Win32
-		{729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Debug|Win32.Build.0 = Debug|Win32
-		{729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Release|Win32.ActiveCfg = Release|Win32
-		{729344A5-D5E9-434D-8EE8-AF8C6C795D15}.Release|Win32.Build.0 = Release|Win32
-		{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}.Release|Win32.ActiveCfg = Release|Win32
-		{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}.Release|Win32.ActiveCfg = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/libs/freetdm/src/ftdm_call_utils.c b/libs/freetdm/src/ftdm_call_utils.c
index d91b3bc9e2..69f2fb4fff 100644
--- a/libs/freetdm/src/ftdm_call_utils.c
+++ b/libs/freetdm/src/ftdm_call_utils.c
@@ -36,80 +36,101 @@
 #include <ctype.h>
 
 
-FT_DECLARE(ftdm_status_t) ftdm_span_set_npi(const char *npi_string, uint8_t *target)
+FT_DECLARE(ftdm_status_t) ftdm_set_npi(const char *string, uint8_t *target)
 {
-	if (!strcasecmp(npi_string, "isdn") || !strcasecmp(npi_string, "e164")) {
-		*target = FTDM_NPI_ISDN;
-	} else if (!strcasecmp(npi_string, "data")) {
-		*target = FTDM_NPI_DATA;
-	} else if (!strcasecmp(npi_string, "telex")) {
-		*target = FTDM_NPI_TELEX;
-	} else if (!strcasecmp(npi_string, "national")) {
-		*target = FTDM_NPI_NATIONAL;
-	} else if (!strcasecmp(npi_string, "private")) {
-		*target = FTDM_NPI_PRIVATE;
-	} else if (!strcasecmp(npi_string, "reserved")) {
-		*target = FTDM_NPI_RESERVED;
-	} else if (!strcasecmp(npi_string, "unknown")) {
-		*target = FTDM_NPI_UNKNOWN;
-	} else {
-		ftdm_log(FTDM_LOG_WARNING, "Invalid NPI value (%s)\n", npi_string);
-		*target = FTDM_NPI_UNKNOWN;
-		return FTDM_FAIL;
+	uint8_t val;
+	ftdm_status_t status = FTDM_SUCCESS;
+
+	val = ftdm_str2ftdm_npi(string);
+	if (val == FTDM_NPI_INVALID) {
+		ftdm_log(FTDM_LOG_WARNING, "Invalid NPI string (%s)\n", string);
+		status = FTDM_FAIL;
+		val = FTDM_NPI_UNKNOWN;
 	}
-	return FTDM_SUCCESS;
+	*target = val;
+	return status;
 }
 
-FT_DECLARE(ftdm_status_t) ftdm_span_set_ton(const char *ton_string, uint8_t *target)
+FT_DECLARE(ftdm_status_t) ftdm_set_ton(const char *string, uint8_t *target)
 {
-	if (!strcasecmp(ton_string, "national")) {
-		*target = FTDM_TON_NATIONAL;
-	} else if (!strcasecmp(ton_string, "international")) {
-		*target = FTDM_TON_INTERNATIONAL;
-	} else if (!strcasecmp(ton_string, "local")) {
-		*target = FTDM_TON_SUBSCRIBER_NUMBER;
-	} else if (!strcasecmp(ton_string, "unknown")) {
-		*target = FTDM_TON_UNKNOWN;
-	} else {
-		ftdm_log(FTDM_LOG_WARNING, "Invalid TON value (%s)\n", ton_string);
-		*target = FTDM_TON_UNKNOWN;
-		return FTDM_FAIL;
+	uint8_t val;
+	ftdm_status_t status = FTDM_SUCCESS;
+
+	val = ftdm_str2ftdm_ton(string);
+	if (val == FTDM_TON_INVALID) {
+		ftdm_log(FTDM_LOG_WARNING, "Invalid TON string (%s)\n", string);
+		status = FTDM_FAIL;
+		val = FTDM_TON_UNKNOWN;
 	}
-	return FTDM_SUCCESS;
+	*target = val;
+	return status;
 }
 
-FT_DECLARE(ftdm_status_t) ftdm_span_set_bearer_capability(const char *bc_string, ftdm_bearer_cap_t *target)
+FT_DECLARE(ftdm_status_t) ftdm_set_bearer_capability(const char *string, uint8_t *target)
 {
-	if (!strcasecmp(bc_string, "speech")) {
-		*target = FTDM_BEARER_CAP_SPEECH;
-	} else if (!strcasecmp(bc_string, "unrestricted-digital")) {
-		*target = FTDM_BEARER_CAP_64K_UNRESTRICTED;
-	} else if (!strcasecmp(bc_string, "3.1Khz")) {
-		*target = FTDM_BEARER_CAP_3_1KHZ_AUDIO;
-	} else {
-		ftdm_log(FTDM_LOG_WARNING, "Unsupported Bearer Capability value (%s)\n", bc_string);
-		return FTDM_FAIL;
+	uint8_t val;
+	ftdm_status_t status = FTDM_SUCCESS;
+
+	val = ftdm_str2ftdm_bearer_cap(string);
+	if (val == FTDM_NPI_INVALID) {
+		ftdm_log(FTDM_LOG_WARNING, "Invalid Bearer-Capability string (%s)\n", string);
+		status = FTDM_FAIL;
+		val = FTDM_BEARER_CAP_SPEECH;
 	}
-	return FTDM_SUCCESS;
+
+	*target = val;
+	return status;
 }
 
-FT_DECLARE(ftdm_status_t) ftdm_span_set_bearer_layer1(const char *bc_string, ftdm_user_layer1_prot_t *target)
+FT_DECLARE(ftdm_status_t) ftdm_set_bearer_layer1(const char *string, uint8_t *target)
 {
-	if (!strcasecmp(bc_string, "v110")) {
-		*target = FTDM_USER_LAYER1_PROT_V110;
-	} else if (!strcasecmp(bc_string, "ulaw")) {
-		*target = FTDM_USER_LAYER1_PROT_ULAW;
-	} else if (!strcasecmp(bc_string, "alaw")) {
-		*target =FTDM_USER_LAYER1_PROT_ALAW ;
-	} else {
-		ftdm_log(FTDM_LOG_WARNING, "Unsupported Bearer Layer1 Prot value (%s)\n", bc_string);
-		return FTDM_FAIL;
+	uint8_t val;
+	ftdm_status_t status = FTDM_SUCCESS;
+
+	val = ftdm_str2ftdm_usr_layer1_prot(string);
+	if (val == FTDM_USER_LAYER1_PROT_INVALID) {
+		ftdm_log(FTDM_LOG_WARNING, "Invalid Bearer Layer 1 Protocol string (%s)\n", string);
+		status = FTDM_FAIL;
+		val = FTDM_USER_LAYER1_PROT_ULAW;
 	}
-	return FTDM_SUCCESS;
+
+	*target = val;
+	return status;
 }
 
+FT_DECLARE(ftdm_status_t) ftdm_set_screening_ind(const char *string, uint8_t *target)
+{
+	uint8_t val;
+	ftdm_status_t status = FTDM_SUCCESS;
 
-FT_DECLARE(ftdm_status_t) ftdm_is_number(char *number)
+	val = ftdm_str2ftdm_screening(string);
+	if (val == FTDM_SCREENING_INVALID) {
+		ftdm_log(FTDM_LOG_WARNING, "Invalid screening indicator string (%s)\n", string);
+		status = FTDM_FAIL;
+		val = FTDM_SCREENING_NOT_SCREENED;
+	}
+
+	*target = val;
+	return status;
+}
+
+FT_DECLARE(ftdm_status_t) ftdm_set_presentation_ind(const char *string, uint8_t *target)
+{
+	uint8_t val;
+	ftdm_status_t status = FTDM_SUCCESS;
+
+	val = ftdm_str2ftdm_presentation(string);
+	if (val == FTDM_PRES_INVALID) {
+		ftdm_log(FTDM_LOG_WARNING, "Invalid presentation string (%s)\n", string);
+		status = FTDM_FAIL;
+		val = FTDM_PRES_ALLOWED;
+	}
+
+	*target = val;
+	return status;
+}
+
+FT_DECLARE(ftdm_status_t) ftdm_is_number(const char *number)
 {
 	if (!number) {
 		return FTDM_FAIL;
diff --git a/libs/freetdm/src/ftdm_io.c b/libs/freetdm/src/ftdm_io.c
index 0aeaeedce4..eaa25e3da5 100644
--- a/libs/freetdm/src/ftdm_io.c
+++ b/libs/freetdm/src/ftdm_io.c
@@ -38,8 +38,6 @@
  */
 
 #define _GNU_SOURCE
-#ifndef WIN32
-#endif
 #include "private/ftdm_core.h"
 #include <stdarg.h>
 #ifdef WIN32
@@ -50,12 +48,21 @@
 #endif
 #include "ftdm_cpu_monitor.h"
 
+#ifndef localtime_r
+struct tm *localtime_r(const time_t *clock, struct tm *result);
+#endif
+
 #define FORCE_HANGUP_TIMER 3000
 #define SPAN_PENDING_CHANS_QUEUE_SIZE 1000
 #define SPAN_PENDING_SIGNALS_QUEUE_SIZE 1000
 #define FTDM_READ_TRACE_INDEX 0
 #define FTDM_WRITE_TRACE_INDEX 1
 
+ftdm_time_t time_last_throttle_log = 0;
+ftdm_time_t time_current_throttle_log = 0;
+
+static ftdm_iterator_t *get_iterator(ftdm_iterator_type_t type, ftdm_iterator_t *iter);
+
 static int time_is_init = 0;
 
 static void time_init(void)
@@ -85,6 +92,123 @@ FT_DECLARE(ftdm_time_t) ftdm_current_time_in_ms(void)
 #endif
 }
 
+static void write_chan_io_dump(ftdm_io_dump_t *dump, char *dataptr, int dlen)
+{
+	int windex = dump->windex;
+	int avail = (int)dump->size - windex;
+
+	if (!dump->buffer) {
+		return;
+	}
+
+	if (dlen > avail) {
+		int diff = dlen - avail;
+		
+		ftdm_assert(diff < (int)dump->size, "Very small buffer or very big IO chunk!\n");
+
+		/* write only what we can and the rest at the beginning of the buffer */
+		memcpy(&dump->buffer[windex], dataptr, avail);
+		memcpy(&dump->buffer[0], &dataptr[avail], diff);
+		windex = diff;
+
+		/*ftdm_log_chan(fchan, FTDM_LOG_DEBUG, "wrapping around dump buffer %p up to index %d\n\n", dump, windex);*/
+		dump->wrapped = 1;
+	} else {
+		memcpy(&dump->buffer[windex], dataptr, dlen);
+		windex += dlen;
+	}
+
+	if (windex == (int)dump->size) {
+		/*ftdm_log_chan(fchan, FTDM_LOG_DEBUG, "wrapping around dump buffer %p\n", dump);*/
+		windex = 0;
+		dump->wrapped = 1;
+	}
+
+	dump->windex = windex;
+}
+
+static void dump_chan_io_to_file(ftdm_channel_t *fchan, ftdm_io_dump_t *dump, FILE *file)
+{
+	/* write the saved audio buffer */
+	ftdm_size_t rc = 0;
+	ftdm_size_t towrite = 0;
+
+	if (!dump->buffer) {
+		return;
+	}
+
+	towrite = dump->size - dump->windex;
+
+	if (dump->wrapped) {
+		rc = fwrite(&dump->buffer[dump->windex], 1, towrite, file);
+		if (rc != towrite) {
+			ftdm_log_chan(fchan, FTDM_LOG_ERROR, "only wrote %d out of %d bytes in io dump buffer\n", 
+					rc, towrite, strerror(errno));
+		}
+	}
+	if (dump->windex) {
+		towrite = dump->windex;
+		rc = fwrite(&dump->buffer[0], 1, towrite, file);
+		if (rc != towrite) {
+			ftdm_log_chan(fchan, FTDM_LOG_ERROR, "only wrote %d out of %d bytes in io dump buffer: %s\n", 
+					rc, towrite, strerror(errno));
+		}
+	}
+	dump->windex = 0;
+	dump->wrapped = 0;
+}
+
+static void stop_chan_io_dump(ftdm_io_dump_t *dump)
+{
+	if (!dump->buffer) {
+		return;
+	}
+	ftdm_safe_free(dump->buffer);
+	memset(dump, 0, sizeof(dump));
+}
+
+static ftdm_status_t start_chan_io_dump(ftdm_channel_t *chan, ftdm_io_dump_t *dump, ftdm_size_t size)
+{
+	if (dump->buffer) {
+		ftdm_log_chan_msg(chan, FTDM_LOG_ERROR, "IO dump is already started\n");
+		return FTDM_FAIL;
+	}
+	memset(dump, 0, sizeof(*dump));
+	dump->buffer = ftdm_malloc(size);
+	if (!dump->buffer) {
+		return FTDM_FAIL;
+	}
+	dump->size = size;
+	return FTDM_SUCCESS;
+}
+
+
+static void close_dtmf_debug_file(ftdm_channel_t *ftdmchan)
+{
+	if (ftdmchan->dtmfdbg.file) {
+		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "closing debug dtmf file\n");
+		fclose(ftdmchan->dtmfdbg.file);
+		ftdmchan->dtmfdbg.file = NULL;
+	}
+}
+
+static ftdm_status_t disable_dtmf_debug(ftdm_channel_t *ftdmchan)
+{
+	if (!ftdmchan->dtmfdbg.enabled) {
+		return FTDM_SUCCESS;
+	}
+
+	if (!ftdmchan->rxdump.buffer) {
+		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_ERROR, "DTMF debug enabled but no rx dump?\n");	
+		return FTDM_FAIL;
+	}
+
+	close_dtmf_debug_file(ftdmchan);
+	stop_chan_io_dump(&ftdmchan->rxdump);
+	ftdmchan->dtmfdbg.enabled = 0;
+	return FTDM_SUCCESS;
+}
+
 typedef struct {
 	uint8_t 	enabled;
 	uint8_t         running;
@@ -147,6 +271,24 @@ FTDM_STR2ENUM(ftdm_str2ftdm_chan_type, ftdm_chan_type2str, ftdm_chan_type_t, CHA
 FTDM_ENUM_NAMES(SIGNALING_STATUS_NAMES, SIGSTATUS_STRINGS)
 FTDM_STR2ENUM(ftdm_str2ftdm_signaling_status, ftdm_signaling_status2str, ftdm_signaling_status_t, SIGNALING_STATUS_NAMES, FTDM_SIG_STATE_INVALID)
 
+FTDM_ENUM_NAMES(TON_NAMES, TON_STRINGS)
+FTDM_STR2ENUM(ftdm_str2ftdm_ton, ftdm_ton2str, ftdm_ton_t, TON_NAMES, FTDM_TON_INVALID)
+
+FTDM_ENUM_NAMES(NPI_NAMES, NPI_STRINGS)
+FTDM_STR2ENUM(ftdm_str2ftdm_npi, ftdm_npi2str, ftdm_npi_t, NPI_NAMES, FTDM_NPI_INVALID)
+
+FTDM_ENUM_NAMES(PRESENTATION_NAMES, PRESENTATION_STRINGS)
+FTDM_STR2ENUM(ftdm_str2ftdm_presentation, ftdm_presentation2str, ftdm_presentation_t, PRESENTATION_NAMES, FTDM_PRES_INVALID)
+
+FTDM_ENUM_NAMES(SCREENING_NAMES, SCREENING_STRINGS)
+FTDM_STR2ENUM(ftdm_str2ftdm_screening, ftdm_screening2str, ftdm_screening_t, SCREENING_NAMES, FTDM_SCREENING_INVALID)
+
+FTDM_ENUM_NAMES(BEARER_CAP_NAMES, BEARER_CAP_STRINGS)
+FTDM_STR2ENUM(ftdm_str2ftdm_bearer_cap, ftdm_bearer_cap2str, ftdm_bearer_cap_t, BEARER_CAP_NAMES, FTDM_BEARER_CAP_INVALID)
+
+FTDM_ENUM_NAMES(USER_LAYER1_PROT_NAMES, USER_LAYER1_PROT_STRINGS)
+FTDM_STR2ENUM(ftdm_str2ftdm_usr_layer1_prot, ftdm_user_layer1_prot2str, ftdm_user_layer1_prot_t, USER_LAYER1_PROT_NAMES, FTDM_USER_LAYER1_PROT_INVALID)
+
 static ftdm_status_t ftdm_group_add_channels(ftdm_span_t* span, int currindex, const char* name);
 
 static const char *cut_path(const char *in)
@@ -217,7 +359,7 @@ static __inline__ void *ftdm_std_malloc(void *pool, ftdm_size_t size)
 {
 	void *ptr = malloc(size);
 	pool = NULL; /* fix warning */
-	ftdm_assert_return(ptr != NULL, NULL, "Out of memory");
+	ftdm_assert_return(ptr != NULL, NULL, "Out of memory\n");
 	return ptr;
 }
 
@@ -225,7 +367,7 @@ static __inline__ void *ftdm_std_calloc(void *pool, ftdm_size_t elements, ftdm_s
 {
 	void *ptr = calloc(elements, size);
 	pool = NULL;
-	ftdm_assert_return(ptr != NULL, NULL, "Out of memory");
+	ftdm_assert_return(ptr != NULL, NULL, "Out of memory\n");
 	return ptr;
 }
 
@@ -233,7 +375,7 @@ static __inline__ void *ftdm_std_realloc(void *pool, void *buff, ftdm_size_t siz
 {
 	buff = realloc(buff, size);
 	pool = NULL;
-	ftdm_assert_return(buff != NULL, NULL, "Out of memory");
+	ftdm_assert_return(buff != NULL, NULL, "Out of memory\n");
 	return buff;
 }
 
@@ -295,43 +437,43 @@ static ftdm_status_t ftdm_set_caller_data(ftdm_span_t *span, ftdm_caller_data_t
 		return FTDM_FAIL;
 	}
 
-	if (caller_data->dnis.plan == FTDM_NPI_INVALID) {
+	if (caller_data->dnis.plan >= FTDM_NPI_INVALID) {
 		caller_data->dnis.plan = span->default_caller_data.dnis.plan;
 	}
 
-	if (caller_data->dnis.type == FTDM_TON_INVALID) {
+	if (caller_data->dnis.type >= FTDM_TON_INVALID) {
 		caller_data->dnis.type = span->default_caller_data.dnis.type;
 	}
 
-	if (caller_data->cid_num.plan == FTDM_NPI_INVALID) {
+	if (caller_data->cid_num.plan >= FTDM_NPI_INVALID) {
 		caller_data->cid_num.plan = span->default_caller_data.cid_num.plan;
 	}
 
-	if (caller_data->cid_num.type == FTDM_TON_INVALID) {
+	if (caller_data->cid_num.type >= FTDM_TON_INVALID) {
 		caller_data->cid_num.type = span->default_caller_data.cid_num.type;
 	}
 
-	if (caller_data->ani.plan == FTDM_NPI_INVALID) {
+	if (caller_data->ani.plan >= FTDM_NPI_INVALID) {
 		caller_data->ani.plan = span->default_caller_data.ani.plan;
 	}
 
-	if (caller_data->ani.type == FTDM_TON_INVALID) {
+	if (caller_data->ani.type >= FTDM_TON_INVALID) {
 		caller_data->ani.type = span->default_caller_data.ani.type;
 	}
 
-	if (caller_data->rdnis.plan == FTDM_NPI_INVALID) {
+	if (caller_data->rdnis.plan >= FTDM_NPI_INVALID) {
 		caller_data->rdnis.plan = span->default_caller_data.rdnis.plan;
 	}
 
-	if (caller_data->rdnis.type == FTDM_NPI_INVALID) {
+	if (caller_data->rdnis.type >= FTDM_NPI_INVALID) {
 		caller_data->rdnis.type = span->default_caller_data.rdnis.type;
 	}
 
-	if (caller_data->bearer_capability == FTDM_INVALID_INT_PARM) {
+	if (caller_data->bearer_capability >= FTDM_INVALID_INT_PARM) {
 		caller_data->bearer_capability = span->default_caller_data.bearer_capability;
 	}
 
-	if (caller_data->bearer_layer1 == FTDM_INVALID_INT_PARM) {
+	if (caller_data->bearer_layer1 >= FTDM_INVALID_INT_PARM) {
 		caller_data->bearer_layer1 = span->default_caller_data.bearer_layer1;
 	}
 
@@ -429,10 +571,6 @@ static ftdm_status_t ftdm_channel_destroy(ftdm_channel_t *ftdmchan)
 			ftdm_sleep(500);
 		}
 
-#ifdef FTDM_DEBUG_DTMF
-		ftdm_mutex_destroy(&ftdmchan->dtmfdbg.mutex);
-#endif
-
 		ftdm_mutex_lock(ftdmchan->pre_buffer_mutex);
 		ftdm_buffer_destroy(&ftdmchan->pre_buffer);
 		ftdm_mutex_unlock(ftdmchan->pre_buffer_mutex);
@@ -851,9 +989,6 @@ FT_DECLARE(ftdm_status_t) ftdm_span_add_channel(ftdm_span_t *span, ftdm_socket_t
 
 		ftdm_mutex_create(&new_chan->mutex);
 		ftdm_mutex_create(&new_chan->pre_buffer_mutex);
-#ifdef FTDM_DEBUG_DTMF
-		ftdm_mutex_create(&new_chan->dtmfdbg.mutex);
-#endif
 
 		ftdm_buffer_create(&new_chan->digit_buffer, 128, 128, 0);
 		ftdm_buffer_create(&new_chan->gen_dtmf_buffer, 128, 128, 0);
@@ -985,6 +1120,51 @@ FT_DECLARE(ftdm_status_t) ftdm_span_next_event(ftdm_span_t *span, ftdm_event_t *
 	return status;
 }
 
+FT_DECLARE(ftdm_status_t) ftdm_channel_read_event(ftdm_channel_t *ftdmchan, ftdm_event_t **event)
+{
+	ftdm_status_t status = FTDM_FAIL;
+	ftdm_sigmsg_t sigmsg;
+	ftdm_span_t *span = ftdmchan->span;
+	ftdm_assert_return(span->fio != NULL, FTDM_FAIL, "No I/O module attached to this span!\n");
+
+	if (!span->fio->channel_next_event) {
+		ftdm_log(FTDM_LOG_ERROR, "channel_next_event method not implemented in module %s!", span->fio->name);
+		return FTDM_NOTIMPL;
+	}
+
+	status = span->fio->channel_next_event(ftdmchan, event);
+	if (status != FTDM_SUCCESS) {
+		return status;
+	}
+
+	/* before returning the event to the user we do some core operations with certain OOB events */
+	memset(&sigmsg, 0, sizeof(sigmsg));
+	sigmsg.span_id = span->span_id;
+	sigmsg.chan_id = (*event)->channel->chan_id;
+	sigmsg.channel = (*event)->channel;
+	switch ((*event)->enum_id) {
+	case FTDM_OOB_ALARM_CLEAR:
+		{
+			sigmsg.event_id = FTDM_SIGEVENT_ALARM_CLEAR;
+			ftdm_clear_flag_locked((*event)->channel, FTDM_CHANNEL_IN_ALARM);
+			ftdm_span_send_signal(span, &sigmsg);
+		}
+		break;
+	case FTDM_OOB_ALARM_TRAP:
+		{
+			sigmsg.event_id = FTDM_SIGEVENT_ALARM_TRAP;
+			ftdm_set_flag_locked((*event)->channel, FTDM_CHANNEL_IN_ALARM);
+			ftdm_span_send_signal(span, &sigmsg);
+		}
+		break;
+	default:
+		/* NOOP */
+		break;
+	}
+
+	return status;
+}
+
 static ftdm_status_t ftdmchan_fsk_write_sample(int16_t *buf, ftdm_size_t buflen, void *user_data)
 {
 	ftdm_channel_t *ftdmchan = (ftdm_channel_t *) user_data;
@@ -1715,7 +1895,9 @@ static ftdm_status_t ftdm_channel_reset(ftdm_channel_t *ftdmchan)
 	if (!ftdmchan->dtmf_off) {
 		ftdmchan->dtmf_off = FTDM_DEFAULT_DTMF_OFF;
 	}
-	
+
+	ftdm_call_clear_vars(&ftdmchan->caller_data);
+			
 	memset(ftdmchan->dtmf_hangup_buf, '\0', ftdmchan->span->dtmf_hangup_len);
 
 	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_TRANSCODE)) {
@@ -1745,16 +1927,26 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_open_chan(ftdm_channel_t *ftdmchan)
 
 	ftdm_mutex_lock(ftdmchan->mutex);
 
-	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_SUSPENDED)) {
-		snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "%s", "Channel is suspended\n");
-		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_WARNING, "Cannot open channel when is suspended\n");
-		goto done;
-	}
-
-	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_IN_ALARM) && !ftdm_test_flag(ftdmchan->span, FTDM_SPAN_PWR_SAVING)) {
-		snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "%s", "Channel is alarmed\n");
-		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_WARNING, "Cannot open channel when is alarmed\n");
-		goto done;
+	if (FTDM_IS_VOICE_CHANNEL(ftdmchan)) {
+		if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_SUSPENDED)) {
+			snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "%s", "Channel is suspended\n");
+			ftdm_log_chan_msg(ftdmchan, FTDM_LOG_WARNING, "Cannot open channel when is suspended\n");
+			goto done;
+		}
+		
+		if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_IN_ALARM) && !ftdm_test_flag(ftdmchan->span, FTDM_SPAN_PWR_SAVING)) {
+			snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "%s", "Channel is alarmed\n");
+			ftdm_log_chan_msg(ftdmchan, FTDM_LOG_WARNING, "Cannot open channel when is alarmed\n");
+			goto done;
+		}
+		
+		if (globals.cpu_monitor.alarm &&
+				  globals.cpu_monitor.alarm_action_flags & FTDM_CPU_ALARM_ACTION_REJECT) {
+			snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "%s", "CPU usage alarm is on - refusing to open channel\n");
+			ftdm_log_chan_msg(ftdmchan, FTDM_LOG_WARNING, "CPU usage alarm is on - refusing to open channel\n");
+			ftdmchan->caller_data.hangup_cause = FTDM_CAUSE_SWITCH_CONGESTION;
+			goto done;
+		}
 	}
 
 	if (!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_READY)) {
@@ -1763,15 +1955,6 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_open_chan(ftdm_channel_t *ftdmchan)
 		goto done;
 	}
 
-	if (globals.cpu_monitor.alarm && 
-	    globals.cpu_monitor.alarm_action_flags & FTDM_CPU_ALARM_ACTION_REJECT) {
-		snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "%s", "CPU usage alarm is on - refusing to open channel\n");
-		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_WARNING, "CPU usage alarm is on - refusing to open channel\n");
-		ftdmchan->caller_data.hangup_cause = FTDM_CAUSE_SWITCH_CONGESTION;
-		goto done;
-	}
-
-
 	status = ftdmchan->fio->open(ftdmchan);
 	if (status == FTDM_SUCCESS) {
 		ftdm_set_flag(ftdmchan, FTDM_CHANNEL_OPEN | FTDM_CHANNEL_INUSE);
@@ -2030,27 +2213,31 @@ FT_DECLARE(ftdm_status_t) _ftdm_channel_call_answer(const char *file, const char
 		goto done;
 	}
 
+	if (!ftdm_test_flag(ftdmchan->span, FTDM_SPAN_USE_SKIP_STATES)) {
+		/* We will fail RFC's if we not skip states, but some modules apart from ftmod_sangoma_isdn 
+		* expect the call to always to go PROGRESS and PROGRESS MEDIA state before going to UP, so
+		* use FTDM_SPAN_USE_SKIP_STATESfor now while we update the sig modules */
 
-	if (ftdmchan->state < FTDM_CHANNEL_STATE_PROGRESS) {
-		ftdm_channel_set_state(file, func, line, ftdmchan, FTDM_CHANNEL_STATE_PROGRESS, 1);
+		if (ftdmchan->state < FTDM_CHANNEL_STATE_PROGRESS) {
+			ftdm_channel_set_state(file, func, line, ftdmchan, FTDM_CHANNEL_STATE_PROGRESS, 1);
+		}
+
+		/* set state unlocks the channel so we need to re-confirm that the channel hasn't gone to hell */
+		if (ftdmchan->state == FTDM_CHANNEL_STATE_TERMINATING) {
+			ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Ignoring answer because the call has moved to TERMINATING while we're moving to PROGRESS\n");
+			goto done;
+		}
+
+		if (ftdmchan->state < FTDM_CHANNEL_STATE_PROGRESS_MEDIA) {
+			ftdm_channel_set_state(file, func, line, ftdmchan, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, 1);
+		}
+
+		/* set state unlocks the channel so we need to re-confirm that the channel hasn't gone to hell */
+		if (ftdmchan->state == FTDM_CHANNEL_STATE_TERMINATING) {
+			ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Ignoring answer because the call has moved to TERMINATING while we're moving to UP\n");
+			goto done;
+		}
 	}
-
-	/* set state unlocks the channel so we need to re-confirm that the channel hasn't gone to hell */
-	if (ftdmchan->state == FTDM_CHANNEL_STATE_TERMINATING) {
-		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Ignoring answer because the call has moved to TERMINATING while we're moving to PROGRESS\n");
-		goto done;
-	}
-
-	if (ftdmchan->state < FTDM_CHANNEL_STATE_PROGRESS_MEDIA) {
-		ftdm_channel_set_state(file, func, line, ftdmchan, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, 1);
-	}
-
-	/* set state unlocks the channel so we need to re-confirm that the channel hasn't gone to hell */
-	if (ftdmchan->state == FTDM_CHANNEL_STATE_TERMINATING) {
-		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Ignoring answer because the call has moved to TERMINATING while we're moving to UP\n");
-		goto done;
-	}
-
 	ftdm_channel_set_state(file, func, line, ftdmchan, FTDM_CHANNEL_STATE_UP, 1);
 
 done:
@@ -2078,7 +2265,7 @@ static ftdm_status_t call_hangup(ftdm_channel_t *chan, const char *file, const c
 	} else {
 		/* the signaling stack did not touch the state, 
 		 * core is responsible from clearing flags and stuff */
-		ftdm_channel_done(chan);
+		ftdm_channel_close(&chan);
 	}
 	return FTDM_SUCCESS;
 }
@@ -2199,14 +2386,19 @@ FT_DECLARE(ftdm_status_t) _ftdm_channel_call_indicate(const char *file, const ch
 	switch (indication) {
 	/* FIXME: ring and busy cannot be used with all signaling stacks 
 	 * (particularly isdn stacks I think, we should emulate or just move to hangup with busy cause) */
-	case FTDM_CHANNEL_INDICATE_RING:
-		ftdm_channel_set_state(file, func, line, ftdmchan, FTDM_CHANNEL_STATE_RING, 1);
+	case FTDM_CHANNEL_INDICATE_RINGING:
+		ftdm_channel_set_state(file, func, line, ftdmchan, FTDM_CHANNEL_STATE_RINGING, 1);
 		break;
-
 	case FTDM_CHANNEL_INDICATE_BUSY:
 		ftdm_channel_set_state(file, func, line, ftdmchan, FTDM_CHANNEL_STATE_BUSY, 1);
 		break;
-
+	case FTDM_CHANNEL_INDICATE_PROCEED:
+		if (ftdm_test_flag(ftdmchan->span, FTDM_SPAN_USE_PROCEED_STATE)) {
+			if (ftdmchan->state == FTDM_CHANNEL_STATE_RING) {
+				ftdm_channel_set_state(file, func, line, ftdmchan, FTDM_CHANNEL_STATE_PROCEED, 1);
+			}
+		}
+		break;
 	case FTDM_CHANNEL_INDICATE_PROGRESS:
 		if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
 			ftdm_set_flag(ftdmchan, FTDM_CHANNEL_PROGRESS);
@@ -2214,7 +2406,6 @@ FT_DECLARE(ftdm_status_t) _ftdm_channel_call_indicate(const char *file, const ch
 			ftdm_channel_set_state(file, func, line, ftdmchan, FTDM_CHANNEL_STATE_PROGRESS, 1);
 		}
 		break;
-
 	case FTDM_CHANNEL_INDICATE_PROGRESS_MEDIA:
 		if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
 			ftdm_set_flag(ftdmchan, FTDM_CHANNEL_PROGRESS);
@@ -2233,7 +2424,6 @@ FT_DECLARE(ftdm_status_t) _ftdm_channel_call_indicate(const char *file, const ch
 			ftdm_channel_set_state(file, func, line, ftdmchan, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, 1);
 		}
 		break;
-
 	default:
 		ftdm_log(file, func, line, FTDM_LOG_LEVEL_WARNING, "Do not know how to indicate %d\n", indication);
 		status = FTDM_FAIL;
@@ -2246,6 +2436,27 @@ done:
 	return FTDM_SUCCESS;
 }
 
+FT_DECLARE(ftdm_status_t) _ftdm_channel_call_send_msg(const char *file, const char *func, int line, ftdm_channel_t *ftdmchan, ftdm_sigmsg_t *sigmsg)
+{
+	ftdm_status_t status = FTDM_FAIL;
+	ftdm_assert_return(ftdmchan != NULL, FTDM_FAIL, "null channel");
+#ifdef __WINDOWS__
+	UNREFERENCED_PARAMETER(file);
+	UNREFERENCED_PARAMETER(func);
+	UNREFERENCED_PARAMETER(line);
+#endif
+
+	ftdm_channel_lock(ftdmchan);
+	if (ftdmchan->span->send_msg) {
+		status = ftdmchan->span->send_msg(ftdmchan, sigmsg);
+	} else {
+		status = FTDM_NOTIMPL;
+		ftdm_log(FTDM_LOG_ERROR, "send_msg method not implemented in this span!\n");
+	}
+	ftdm_channel_unlock(ftdmchan);
+	return status;
+}
+
 FT_DECLARE(ftdm_status_t) _ftdm_channel_call_place(const char *file, const char *func, int line, ftdm_channel_t *ftdmchan)
 {
 	ftdm_status_t status = FTDM_FAIL;
@@ -2270,6 +2481,8 @@ FT_DECLARE(ftdm_status_t) _ftdm_channel_call_place(const char *file, const char
 	UNREFERENCED_PARAMETER(line);
 #endif
 
+	ftdm_wait_for_flag_cleared(ftdmchan, FTDM_CHANNEL_STATE_CHANGE, 100);
+
 	ftdm_channel_unlock(ftdmchan);
 
 	return status;
@@ -2326,23 +2539,6 @@ FT_DECLARE(ftdm_status_t) ftdm_span_get_sig_status(ftdm_span_t *span, ftdm_signa
 	}
 }
 
-#ifdef FTDM_DEBUG_DTMF
-static void close_dtmf_debug(ftdm_channel_t *ftdmchan)
-{
-	ftdm_mutex_lock(ftdmchan->dtmfdbg.mutex);
-
-	if (ftdmchan->dtmfdbg.file) {
-		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "closing debug dtmf file\n");
-		fclose(ftdmchan->dtmfdbg.file);
-		ftdmchan->dtmfdbg.file = NULL;
-	}
-	ftdmchan->dtmfdbg.windex = 0;
-	ftdmchan->dtmfdbg.wrapped = 0;
-
-	ftdm_mutex_unlock(ftdmchan->dtmfdbg.mutex);
-}
-#endif
-
 static ftdm_status_t ftdm_channel_clear_vars(ftdm_channel_t *ftdmchan);
 FT_DECLARE(ftdm_status_t) ftdm_channel_done(ftdm_channel_t *ftdmchan)
 {
@@ -2371,9 +2567,6 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_done(ftdm_channel_t *ftdmchan)
 	ftdm_buffer_destroy(&ftdmchan->pre_buffer);
 	ftdmchan->pre_buffer_size = 0;
 	ftdm_mutex_unlock(ftdmchan->pre_buffer_mutex);
-#ifdef FTDM_DEBUG_DTMF
-	close_dtmf_debug(ftdmchan);
-#endif
 	ftdm_channel_clear_vars(ftdmchan);
 	if (ftdmchan->hangup_timer) {
 		ftdm_sched_cancel_timer(globals.timingsched, ftdmchan->hangup_timer);
@@ -2382,7 +2575,27 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_done(ftdm_channel_t *ftdmchan)
 	ftdmchan->init_state = FTDM_CHANNEL_STATE_DOWN;
 	ftdmchan->state = FTDM_CHANNEL_STATE_DOWN;
 
-	ftdm_log(FTDM_LOG_DEBUG, "channel done %u:%u\n", ftdmchan->span_id, ftdmchan->chan_id);
+	ftdm_channel_command(ftdmchan, FTDM_COMMAND_DISABLE_DEBUG_DTMF, NULL);
+	ftdm_channel_command(ftdmchan, FTDM_COMMAND_DISABLE_INPUT_DUMP, NULL);
+	ftdm_channel_command(ftdmchan, FTDM_COMMAND_DISABLE_OUTPUT_DUMP, NULL);
+
+	if (FTDM_IS_VOICE_CHANNEL(ftdmchan)) {
+		ftdm_sigmsg_t sigmsg;
+		memset(&sigmsg, 0, sizeof(sigmsg));
+		sigmsg.span_id = ftdmchan->span_id;
+		sigmsg.chan_id = ftdmchan->chan_id;
+		sigmsg.channel = ftdmchan;
+		sigmsg.event_id = FTDM_SIGEVENT_RELEASED;
+		ftdm_span_send_signal(ftdmchan->span, &sigmsg);
+	}
+
+	if (ftdmchan->txdrops || ftdmchan->rxdrops) {
+		ftdm_log_chan(ftdmchan, FTDM_LOG_WARNING, "channel dropped data: txdrops = %d, rxdrops = %d\n", 
+				ftdmchan->txdrops, ftdmchan->rxdrops);
+	}
+
+	ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "channel done\n");
+
 
 	ftdm_mutex_unlock(ftdmchan->mutex);
 
@@ -2392,7 +2605,7 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_done(ftdm_channel_t *ftdmchan)
 FT_DECLARE(ftdm_status_t) ftdm_channel_use(ftdm_channel_t *ftdmchan)
 {
 
-	assert(ftdmchan != NULL);
+	ftdm_assert(ftdmchan != NULL, "Null channel\n");
 
 	ftdm_set_flag_locked(ftdmchan, FTDM_CHANNEL_INUSE);
 
@@ -2466,8 +2679,8 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_command(ftdm_channel_t *ftdmchan, ftdm_co
 {
 	ftdm_status_t status = FTDM_FAIL;
 	
-	assert(ftdmchan != NULL);
-	assert(ftdmchan->fio != NULL);
+	ftdm_assert_return(ftdmchan != NULL, FTDM_FAIL, "No channel\n");
+	ftdm_assert_return(ftdmchan->fio != NULL, FTDM_FAIL, "No IO attached to channel\n");
 
 	ftdm_mutex_lock(ftdmchan->mutex);
 
@@ -2494,7 +2707,7 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_command(ftdm_channel_t *ftdmchan, ftdm_co
 		break;
 	case FTDM_COMMAND_TRACE_INPUT:
 		{
-			char *path = (char *) obj;
+			char *path = FTDM_COMMAND_OBJ_CHAR_P;
 			if (ftdmchan->fds[FTDM_READ_TRACE_INDEX] > 0) {
 				close(ftdmchan->fds[FTDM_READ_TRACE_INDEX]);
 				ftdmchan->fds[FTDM_READ_TRACE_INDEX] = -1;
@@ -2537,6 +2750,135 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_command(ftdm_channel_t *ftdmchan, ftdm_co
 			GOTO_STATUS(done, FTDM_SUCCESS);
 		}
 		break;
+
+	/*!< Enable DTMF debugging */
+	case FTDM_COMMAND_ENABLE_DEBUG_DTMF:
+		{
+			if (ftdmchan->dtmfdbg.enabled) {
+				ftdm_log_chan_msg(ftdmchan, FTDM_LOG_ERROR, "Cannot enable debug DTMF again\n");	
+				GOTO_STATUS(done, FTDM_FAIL);
+			}
+			if (ftdmchan->rxdump.buffer) {
+				ftdm_log_chan_msg(ftdmchan, FTDM_LOG_ERROR, "Cannot debug DTMF if Rx dumping is already enabled\n");	
+				GOTO_STATUS(done, FTDM_FAIL);
+			}
+			if (start_chan_io_dump(ftdmchan, &ftdmchan->rxdump, FTDM_IO_DUMP_DEFAULT_BUFF_SIZE) != FTDM_SUCCESS) {
+				ftdm_log_chan_msg(ftdmchan, FTDM_LOG_ERROR, "Failed to enable rx dump for DTMF debugging\n");	
+				GOTO_STATUS(done, FTDM_FAIL);
+			}
+			ftdmchan->dtmfdbg.enabled = 1;
+			ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Enabled DTMF debugging\n");	
+			GOTO_STATUS(done, FTDM_SUCCESS);
+		}
+		break;
+
+	/*!< Disable DTMF debugging (if not disabled explicitly, it is disabled automatically when calls hangup) */
+	case FTDM_COMMAND_DISABLE_DEBUG_DTMF:
+		{
+			if (!ftdmchan->dtmfdbg.enabled) {
+				ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "DTMF debug is already disabled\n");	
+				GOTO_STATUS(done, FTDM_SUCCESS);
+			}
+			if (disable_dtmf_debug(ftdmchan) != FTDM_SUCCESS) {
+				ftdm_log_chan_msg(ftdmchan, FTDM_LOG_ERROR, "Failed to disable DTMF debug\n");	
+				GOTO_STATUS(done, FTDM_FAIL);
+			}
+			GOTO_STATUS(done, FTDM_SUCCESS);
+		}
+		break;
+
+	/*!< Start dumping all input to a circular buffer. The size of the circular buffer can be specified, default used otherwise */
+	case FTDM_COMMAND_ENABLE_INPUT_DUMP:
+		{
+			ftdm_size_t size = obj ? FTDM_COMMAND_OBJ_SIZE : FTDM_IO_DUMP_DEFAULT_BUFF_SIZE;
+			if (ftdmchan->rxdump.buffer) {
+				ftdm_log_chan_msg(ftdmchan, FTDM_LOG_ERROR, "Input dump is already enabled\n");
+				GOTO_STATUS(done, FTDM_FAIL);
+			}
+			if (start_chan_io_dump(ftdmchan, &ftdmchan->rxdump, size) != FTDM_SUCCESS) {
+				ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Failed to enable input dump of size %zd\n", size);
+				GOTO_STATUS(done, FTDM_FAIL);
+			}
+			ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Enabled input dump with size %zd\n", size);
+			GOTO_STATUS(done, FTDM_SUCCESS);
+		}
+		break;
+
+	/*!< Stop dumping all input to a circular buffer. */
+	case FTDM_COMMAND_DISABLE_INPUT_DUMP:
+		{
+			if (!ftdmchan->rxdump.buffer) {
+				ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "No need to disable input dump\n");
+				GOTO_STATUS(done, FTDM_SUCCESS);
+			}
+			ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Disabled input dump of size %zd\n", ftdmchan->rxdump.size);
+			stop_chan_io_dump(&ftdmchan->rxdump);
+			GOTO_STATUS(done, FTDM_SUCCESS);
+		}
+		break;
+
+	/*!< Start dumping all output to a circular buffer. The size of the circular buffer can be specified, default used otherwise */
+	case FTDM_COMMAND_ENABLE_OUTPUT_DUMP:
+		{
+			ftdm_size_t size = obj ? FTDM_COMMAND_OBJ_SIZE : FTDM_IO_DUMP_DEFAULT_BUFF_SIZE;
+			if (ftdmchan->txdump.buffer) {
+				ftdm_log_chan_msg(ftdmchan, FTDM_LOG_ERROR, "Output dump is already enabled\n");
+				GOTO_STATUS(done, FTDM_FAIL);
+			}
+			if (start_chan_io_dump(ftdmchan, &ftdmchan->txdump, size) != FTDM_SUCCESS) {
+				ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Failed to enable output dump of size %d\n", size);	
+				GOTO_STATUS(done, FTDM_FAIL);
+			}
+			ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Enabled output dump with size %zd\n", size);
+			GOTO_STATUS(done, FTDM_SUCCESS);
+		}
+		break;
+
+	/*!< Stop dumping all output to a circular buffer. */
+	case FTDM_COMMAND_DISABLE_OUTPUT_DUMP:
+		{
+			if (!ftdmchan->txdump.buffer) {
+				ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "No need to disable output dump\n");
+				GOTO_STATUS(done, FTDM_SUCCESS);
+			}
+			ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Disabled output dump of size %zd\n", ftdmchan->rxdump.size);
+			stop_chan_io_dump(&ftdmchan->txdump);
+			GOTO_STATUS(done, FTDM_SUCCESS);
+		}
+		break;
+
+	/*!< Dump the current input circular buffer to the specified FILE* structure */
+	case FTDM_COMMAND_DUMP_INPUT:
+		{
+			if (!obj) {
+				GOTO_STATUS(done, FTDM_FAIL);
+			}
+			if (!ftdmchan->rxdump.buffer) {
+				ftdm_log_chan(ftdmchan, FTDM_LOG_WARNING, "Not dumped input to file %p, input dump is not enabled\n", obj);
+				GOTO_STATUS(done, FTDM_FAIL);
+			}
+			dump_chan_io_to_file(ftdmchan, &ftdmchan->rxdump, obj);
+			ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Dumped input of size %d to file %p\n", ftdmchan->rxdump.size, obj);
+			GOTO_STATUS(done, FTDM_SUCCESS);
+		}
+		break;
+
+	/*!< Dump the current output circular buffer to the specified FILE* structure */
+	case FTDM_COMMAND_DUMP_OUTPUT:
+		{
+			if (!obj) {
+				GOTO_STATUS(done, FTDM_FAIL);
+			}
+			if (!ftdmchan->txdump.buffer) {
+				ftdm_log_chan(ftdmchan, FTDM_LOG_WARNING, "Not dumped output to file %p, output dump is not enabled\n", obj);
+				GOTO_STATUS(done, FTDM_FAIL);
+			}
+			dump_chan_io_to_file(ftdmchan, &ftdmchan->txdump, obj);
+			ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Dumped input of size %zd to file %p\n", ftdmchan->txdump.size, obj);
+			GOTO_STATUS(done, FTDM_SUCCESS);
+		}
+		break;
+
 	case FTDM_COMMAND_SET_INTERVAL:
 		{
 			if (!ftdm_channel_test_feature(ftdmchan, FTDM_CHANNEL_FEATURE_INTERVAL)) {
@@ -2808,21 +3150,17 @@ done:
 
 FT_DECLARE(ftdm_status_t) ftdm_channel_wait(ftdm_channel_t *ftdmchan, ftdm_wait_flag_t *flags, int32_t to)
 {
-	assert(ftdmchan != NULL);
-	assert(ftdmchan->fio != NULL);
+	ftdm_status_t status = FTDM_FAIL;
+	ftdm_assert_return(ftdmchan != NULL, FTDM_FAIL, "Null channel\n");
+	ftdm_assert_return(ftdmchan->fio != NULL, FTDM_FAIL, "Null io interface\n");
+	ftdm_assert_return(ftdmchan->fio->wait != NULL, FTDM_NOTIMPL, "wait method not implemented\n");
 
-    if (!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OPEN)) {
-		snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "channel not open");
-        return FTDM_FAIL;
-    }
-
-	if (!ftdmchan->fio->wait) {
-		snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "method not implemented");
-		return FTDM_FAIL;
+	status = ftdmchan->fio->wait(ftdmchan, flags, to);
+	if (status == FTDM_TIMEOUT) {
+		/* make sure the flags are cleared on timeout */
+		*flags = 0;
 	}
-
-    return ftdmchan->fio->wait(ftdmchan, flags, to);
-
+	return status;
 }
 
 /*******************************/
@@ -3009,55 +3347,45 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_queue_dtmf(ftdm_channel_t *ftdmchan, cons
 	ftdm_size_t wr = 0;
 	const char *p;
 	
-	assert(ftdmchan != NULL);
+	ftdm_assert_return(ftdmchan != NULL, FTDM_FAIL, "No channel\n");
 
-	ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Queuing DTMF %s\n", dtmf);
+	ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Queuing DTMF %s (debug = %d)\n", dtmf, ftdmchan->dtmfdbg.enabled);
+
+	if (!ftdmchan->dtmfdbg.enabled) {
+		goto skipdebug;
+	}
 
-#ifdef FTDM_DEBUG_DTMF
-	ftdm_mutex_lock(ftdmchan->dtmfdbg.mutex);
 	if (!ftdmchan->dtmfdbg.file) {
 		struct tm currtime;
 		time_t currsec;
 		char dfile[512];
 
 		currsec = time(NULL);
+
+#ifdef WIN32
+		_tzset();
+		_localtime64_s(&currtime, &currsec);
+#else
 		localtime_r(&currsec, &currtime);
+#endif
 
 		snprintf(dfile, sizeof(dfile), "dtmf-s%dc%d-20%d-%d-%d-%d:%d:%d.%s", 
 				ftdmchan->span_id, ftdmchan->chan_id, 
 				currtime.tm_year-100, currtime.tm_mon+1, currtime.tm_mday,
 				currtime.tm_hour, currtime.tm_min, currtime.tm_sec, ftdmchan->native_codec == FTDM_CODEC_ULAW ? "ulaw" : ftdmchan->native_codec == FTDM_CODEC_ALAW ? "alaw" : "sln");
-		ftdmchan->dtmfdbg.file = fopen(dfile, "w");
+		ftdmchan->dtmfdbg.file = fopen(dfile, "w");	
 		if (!ftdmchan->dtmfdbg.file) {
 			ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "failed to open debug dtmf file %s\n", dfile);
 		} else {
-			/* write the saved audio buffer */
-			int rc = 0;
-			int towrite = sizeof(ftdmchan->dtmfdbg.buffer) - ftdmchan->dtmfdbg.windex;
-		
-			ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "created debug DTMF file %s\n", dfile);
 			ftdmchan->dtmfdbg.closetimeout = DTMF_DEBUG_TIMEOUT;
-			if (ftdmchan->dtmfdbg.wrapped) {
-				rc = fwrite(&ftdmchan->dtmfdbg.buffer[ftdmchan->dtmfdbg.windex], 1, towrite, ftdmchan->dtmfdbg.file);
-				if (rc != towrite) {
-					ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "only wrote %d out of %d bytes in DTMF debug buffer\n", rc, towrite);
-				}
-			}
-			if (ftdmchan->dtmfdbg.windex) {
-				towrite = ftdmchan->dtmfdbg.windex;
-				rc = fwrite(&ftdmchan->dtmfdbg.buffer[0], 1, towrite, ftdmchan->dtmfdbg.file);
-				if (rc != towrite) {
-					ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "only wrote %d out of %d bytes in DTMF debug buffer\n", rc, towrite);
-				}
-			}
-			ftdmchan->dtmfdbg.windex = 0;
-			ftdmchan->dtmfdbg.wrapped = 0;
+			ftdm_channel_command(ftdmchan, FTDM_COMMAND_DUMP_INPUT, ftdmchan->dtmfdbg.file);
+			ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Dumped initial DTMF output to %s\n", dfile);
 		}
 	} else {
-			ftdmchan->dtmfdbg.closetimeout = DTMF_DEBUG_TIMEOUT;
+		ftdmchan->dtmfdbg.closetimeout = DTMF_DEBUG_TIMEOUT;
 	}
-	ftdm_mutex_unlock(ftdmchan->dtmfdbg.mutex);
-#endif
+
+skipdebug:
 
 	if (ftdmchan->pre_buffer) {
 		ftdm_buffer_zero(ftdmchan->pre_buffer);
@@ -3102,22 +3430,32 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_queue_dtmf(ftdm_channel_t *ftdmchan, cons
 
 static FIO_WRITE_FUNCTION(ftdm_raw_write)
 {
+	int dlen = (int) *datalen;
+	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_TX_DISABLED)) {
+		ftdmchan->txdrops++;
+		if (ftdmchan->txdrops <= 10) {
+			ftdm_log_chan_msg(ftdmchan, FTDM_LOG_WARNING, "cannot write in channel with tx disabled\n");
+		} 
+		if (ftdmchan->txdrops == 10) {
+			ftdm_log_chan_msg(ftdmchan, FTDM_LOG_WARNING, "Too many tx drops, not printing anymore\n");
+		}
+		return FTDM_FAIL;
+	}
 	if (ftdmchan->fds[FTDM_WRITE_TRACE_INDEX] > -1) {
-		int dlen = (int) *datalen;
 		if ((write(ftdmchan->fds[FTDM_WRITE_TRACE_INDEX], data, dlen)) != dlen) {
 			ftdm_log(FTDM_LOG_WARNING, "Raw output trace failed to write all of the %zd bytes\n", dlen);
 		}
 	}
+	write_chan_io_dump(&ftdmchan->txdump, data, dlen);
 	return ftdmchan->fio->write(ftdmchan, data, datalen);
 }
 
-
 static FIO_READ_FUNCTION(ftdm_raw_read)
 {
 	ftdm_status_t  status = ftdmchan->fio->read(ftdmchan, data, datalen);
 	if (status == FTDM_SUCCESS && ftdmchan->fds[FTDM_READ_TRACE_INDEX] > -1) {
-		int dlen = (int) *datalen;
-		if (write(ftdmchan->fds[FTDM_READ_TRACE_INDEX], data, dlen) != dlen) {
+		ftdm_size_t dlen = *datalen;
+		if ((ftdm_size_t)write(ftdmchan->fds[FTDM_READ_TRACE_INDEX], data, dlen) != dlen) {
 			ftdm_log(FTDM_LOG_WARNING, "Raw input trace failed to write all of the %zd bytes\n", dlen);
 		}
 	}
@@ -3126,48 +3464,24 @@ static FIO_READ_FUNCTION(ftdm_raw_read)
 		ftdmchan->span->sig_read(ftdmchan, data, *datalen);
 	}
 
-#ifdef FTDM_DEBUG_DTMF
 	if (status == FTDM_SUCCESS) {
-		int dlen = (int) *datalen;
-		int rc = 0;
-		ftdm_mutex_lock(ftdmchan->dtmfdbg.mutex);
-		if (!ftdmchan->dtmfdbg.file) {
-			/* no file yet, write to our circular buffer */
-			int windex = ftdmchan->dtmfdbg.windex;
-			int avail = sizeof(ftdmchan->dtmfdbg.buffer) - windex;
-			char *dataptr = data;
+		ftdm_size_t dlen = *datalen;
+		ftdm_size_t rc = 0;
 
-			if (dlen > avail) {
-				int diff = dlen - avail;
-				/* write only what we can and the rest at the beginning of the buffer */
-				memcpy(&ftdmchan->dtmfdbg.buffer[windex], dataptr, avail);
-				memcpy(&ftdmchan->dtmfdbg.buffer[0], &dataptr[avail], diff);
-				windex = diff;
-				/*ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "wrapping around dtmf read buffer up to index %d\n\n", windex);*/
-				ftdmchan->dtmfdbg.wrapped = 1;
-			} else {
-				memcpy(&ftdmchan->dtmfdbg.buffer[windex], dataptr, dlen);
-				windex += dlen;
-			}
-			if (windex == sizeof(ftdmchan->dtmfdbg.buffer)) {
-				/*ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "wrapping around dtmf read buffer\n");*/
-				windex = 0;
-				ftdmchan->dtmfdbg.wrapped = 1;
-			}
-			ftdmchan->dtmfdbg.windex = windex;
-		} else {
+		write_chan_io_dump(&ftdmchan->rxdump, data, dlen);
+
+		/* if dtmf debug is enabled and initialized, write there too */
+		if (ftdmchan->dtmfdbg.file) {
 			rc = fwrite(data, 1, dlen, ftdmchan->dtmfdbg.file);
 			if (rc != dlen) {
 				ftdm_log(FTDM_LOG_WARNING, "DTMF debugger wrote only %d out of %d bytes: %s\n", rc, datalen, strerror(errno));
 			}
 			ftdmchan->dtmfdbg.closetimeout--;
 			if (!ftdmchan->dtmfdbg.closetimeout) {
-				close_dtmf_debug(ftdmchan);
+				close_dtmf_debug_file(ftdmchan);
 			}
 		}
-		ftdm_mutex_unlock(ftdmchan->dtmfdbg.mutex);
 	}
-#endif
 	return status;
 }
 
@@ -3299,6 +3613,18 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_read(ftdm_channel_t *ftdmchan, void *data
 		goto done;
 	}
 
+	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_RX_DISABLED)) {
+		ftdmchan->rxdrops++;
+		if (ftdmchan->rxdrops <= 10) {
+			ftdm_log_chan_msg(ftdmchan, FTDM_LOG_WARNING, "cannot read from channel with rx disabled\n");
+		}
+		if (ftdmchan->rxdrops == 10) {
+			ftdm_log_chan_msg(ftdmchan, FTDM_LOG_WARNING, "too many rx drops, not logging anymore\n");
+		}
+		status = FTDM_FAIL;
+		goto done;
+	}
+
 	status = ftdm_raw_read(ftdmchan, data, datalen);
 
 	if (status != FTDM_SUCCESS) {
@@ -3498,7 +3824,7 @@ done:
 
 FT_DECLARE(ftdm_status_t) ftdm_channel_write(ftdm_channel_t *ftdmchan, void *data, ftdm_size_t datasize, ftdm_size_t *datalen)
 {
-	ftdm_status_t status = FTDM_FAIL;
+	ftdm_status_t status = FTDM_SUCCESS;
 	fio_codec_t codec_func = NULL;
 	ftdm_size_t max = datasize;
 	unsigned int i = 0;
@@ -3506,22 +3832,28 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_write(ftdm_channel_t *ftdmchan, void *dat
 	ftdm_assert_return(ftdmchan != NULL, FTDM_FAIL, "null channel on write!\n");
 	ftdm_assert_return(ftdmchan->fio != NULL, FTDM_FAIL, "null I/O on write!\n");
 
+	ftdm_channel_lock(ftdmchan);
+
 	if (!ftdmchan->buffer_delay && 
 		((ftdmchan->dtmf_buffer && ftdm_buffer_inuse(ftdmchan->dtmf_buffer)) ||
 		 (ftdmchan->fsk_buffer && ftdm_buffer_inuse(ftdmchan->fsk_buffer)))) {
 		/* read size writing DTMF ATM */
-		return FTDM_SUCCESS;
+		goto done;
 	}
 
 
 	if (!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OPEN)) {
+		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_ERROR, "cannot write in channel not open\n");
 		snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "channel not open");
-		return FTDM_FAIL;
+		status = FTDM_FAIL;
+		goto done;
 	}
 
 	if (!ftdmchan->fio->write) {
+		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_ERROR, "write method not implemented\n");
 		snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "method not implemented");
-		return FTDM_FAIL;
+		status = FTDM_FAIL;
+		goto done;
 	}
 	
 	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_TRANSCODE) && ftdmchan->effective_codec != ftdmchan->native_codec) {
@@ -3538,10 +3870,13 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_write(ftdm_channel_t *ftdmchan, void *dat
 		if (codec_func) {
 			status = codec_func(data, max, datalen);
 		} else {
+			ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Do not know how to handle transcoding from %d to %d\n", 
+					ftdmchan->effective_codec, ftdmchan->native_codec);
 			snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "codec error!");
 			status = FTDM_FAIL;
+			goto done;
 		}
-	}	
+	}
 	
 	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_USE_TX_GAIN) 
 		&& (ftdmchan->native_codec == FTDM_CODEC_ALAW || ftdmchan->native_codec == FTDM_CODEC_ULAW)) {
@@ -3551,11 +3886,117 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_write(ftdm_channel_t *ftdmchan, void *dat
 		}
 	}
 
+	if (ftdmchan->span->sig_write) {
+		status = ftdmchan->span->sig_write(ftdmchan, data, *datalen);
+		if (status == FTDM_BREAK) {
+			/* signaling module decided to drop user frame */
+			status = FTDM_SUCCESS;
+			goto done;
+		}
+	}
+
 	status = ftdm_raw_write(ftdmchan, data, datalen);
 
+done:
+	ftdm_channel_unlock(ftdmchan);
+
 	return status;
 }
 
+FT_DECLARE(void) ftdm_call_clear_data(ftdm_caller_data_t *caller_data)
+{
+	ftdm_call_clear_vars(caller_data);
+	memset(&caller_data->raw_data, 0, sizeof(caller_data->raw_data));
+	caller_data->raw_data_len = 0;
+	return;
+}
+
+FT_DECLARE(ftdm_status_t) ftdm_call_clear_vars(ftdm_caller_data_t *caller_data)
+{
+	if (caller_data->variables) {
+		hashtable_destroy(caller_data->variables);
+	}
+	caller_data->variables = NULL;
+	return FTDM_SUCCESS;
+}
+
+FT_DECLARE(ftdm_status_t) ftdm_call_remove_var(ftdm_caller_data_t *caller_data, const char *var_name)
+{
+	if (caller_data->variables) {
+		hashtable_remove(caller_data->variables, (void *)var_name);
+	}
+	
+	return FTDM_SUCCESS;
+}
+
+
+FT_DECLARE(ftdm_status_t) ftdm_call_add_var(ftdm_caller_data_t *caller_data, const char *var_name, const char *value)
+{
+	char *t_name = 0, *t_val = 0;
+
+	if (!var_name || !value) {
+		return FTDM_FAIL;
+	}
+	
+	if (!caller_data->variables) {
+		/* initialize on first use */
+		caller_data->variables = create_hashtable(16, ftdm_hash_hashfromstring, ftdm_hash_equalkeys);
+		ftdm_assert_return(caller_data->variables, FTDM_FAIL, "Failed to create hash table\n");
+	}
+	
+	t_name = ftdm_strdup(var_name);
+	t_val = ftdm_strdup(value);
+	hashtable_insert(caller_data->variables, t_name, t_val, HASHTABLE_FLAG_FREE_KEY | HASHTABLE_FLAG_FREE_VALUE);
+	return FTDM_SUCCESS;
+}
+
+FT_DECLARE(const char *) ftdm_call_get_var(ftdm_caller_data_t *caller_data, const char *var_name)
+{
+	const char *var = NULL;
+	
+	if (!caller_data->variables || !var_name) {
+		return NULL;
+	}
+
+	var = (const char *)hashtable_search(((struct hashtable*)caller_data->variables), (void *)var_name);
+	return var;
+}
+
+FT_DECLARE(ftdm_iterator_t *) ftdm_call_get_var_iterator(const ftdm_caller_data_t *caller_data, ftdm_iterator_t *iter)
+{
+	ftdm_hash_iterator_t *hashiter = NULL;
+	hashiter = caller_data->variables == NULL ? NULL : hashtable_first(caller_data->variables);
+	
+	if (hashiter == NULL) {
+		return NULL;
+	}
+	
+	if (!(iter = get_iterator(FTDM_ITERATOR_VARS, iter))) {
+		return NULL;
+	}
+	iter->pvt.hashiter = hashiter;
+	return iter;
+}
+
+FT_DECLARE(ftdm_status_t) ftdm_call_get_current_var(ftdm_iterator_t *iter, const char **var_name, const char **var_val)
+{
+	const void *key = NULL;
+	void *val = NULL;
+
+	*var_name = NULL;
+	*var_val = NULL;
+
+	ftdm_assert_return(iter && (iter->type == FTDM_ITERATOR_VARS) && iter->pvt.hashiter, FTDM_FAIL, "Cannot get variable from invalid iterator!\n");
+
+	hashtable_this(iter->pvt.hashiter, &key, NULL, &val);
+
+	*var_name = key;
+	*var_val = val;
+
+	return FTDM_SUCCESS;
+}
+
+
 static ftdm_status_t ftdm_channel_clear_vars(ftdm_channel_t *ftdmchan)
 {
 	ftdm_channel_lock(ftdmchan);
@@ -3602,6 +4043,7 @@ done:
 	return status;
 }
 
+
 FT_DECLARE(const char *) ftdm_channel_get_var(ftdm_channel_t *ftdmchan, const char *var_name)
 {
 	const char *var = NULL;
@@ -3766,6 +4208,53 @@ static struct {
 	ftdm_io_interface_t *pika_interface;
 } interfaces;
 
+static void print_channels_by_flag(ftdm_stream_handle_t *stream, int32_t flagval, int not, int *count)
+{
+	ftdm_hash_iterator_t *i = NULL;
+	ftdm_span_t *span;
+	ftdm_channel_t *fchan = NULL;
+	ftdm_iterator_t *citer = NULL;
+	ftdm_iterator_t *curr = NULL;
+	const void *key = NULL;
+	void *val = NULL;
+	uint32_t flag = (1 << flagval);
+
+	*count = 0;
+
+	ftdm_mutex_lock(globals.mutex);
+
+	for (i = hashtable_first(globals.span_hash); i; i = hashtable_next(i)) {
+		hashtable_this(i, &key, NULL, &val);
+		if (!key || !val) {
+			break;
+		}
+		span = val;
+		citer = ftdm_span_get_chan_iterator(span, NULL);
+		if (!citer) {
+			continue;
+		}
+		for (curr = citer ; curr; curr = ftdm_iterator_next(curr)) {
+			fchan = ftdm_iterator_current(curr);
+			if (not && !ftdm_test_flag(fchan, flag)) {
+				stream->write_function(stream, "[s%dc%d][%d:%d] has not flag %d\n", 
+						fchan->span_id, fchan->chan_id, 
+						fchan->physical_span_id, fchan->physical_chan_id, 
+						flagval);
+				(*count)++;
+			} else if (!not && ftdm_test_flag(fchan, flag)) {
+				stream->write_function(stream, "[s%dc%d][%d:%d] has flag %d\n", 
+						fchan->span_id, fchan->chan_id, 
+						fchan->physical_span_id, fchan->physical_chan_id, 
+						flagval);
+				(*count)++;
+			}
+		}
+		ftdm_iterator_free(citer);
+	}
+
+	ftdm_mutex_unlock(globals.mutex);
+}
+
 static void print_channels_by_state(ftdm_stream_handle_t *stream, ftdm_channel_state_t state, int not, int *count)
 {
 	ftdm_hash_iterator_t *i = NULL;
@@ -3818,6 +4307,8 @@ static char *handle_core_command(const char *cmd)
 	int not = 0;
 	char *argv[10] = { 0 };
 	char *state = NULL;
+	char *flag = NULL;
+	uint32_t flagval = 0;
 	ftdm_channel_state_t i = FTDM_CHANNEL_STATE_INVALID;
 	ftdm_stream_handle_t stream = { 0 };
 
@@ -3852,6 +4343,19 @@ static char *handle_core_command(const char *cmd)
 		}
 		print_channels_by_state(&stream, i, not, &count);
 		stream.write_function(&stream, "\nTotal channels %s %s: %d\n", not ? "not in state" : "in state", ftdm_channel_state2str(i), count);
+	} else if (!strcasecmp(argv[0], "flag")) {
+		if (argc < 2) {
+			stream.write_function(&stream, "core state command requires an argument\n");
+			goto done;
+		}
+		flag = argv[1];
+		if (argv[1][0] == '!') {
+			not = 1;
+			flag++;
+		}
+		flagval = atoi(flag);
+		print_channels_by_flag(&stream, flagval, not, &count);
+		stream.write_function(&stream, "\nTotal channels %s %d: %d\n", not ? "without flag" : "with flag", flagval, count);
 	} else {
 		stream.write_function(&stream, "invalid core command %s\n", argv[0]);
 	}
@@ -3963,6 +4467,7 @@ static ftdm_status_t ftdm_set_channels_alarms(ftdm_span_t *span, int currindex)
 FT_DECLARE(ftdm_status_t) ftdm_configure_span_channels(ftdm_span_t *span, const char* str, ftdm_channel_config_t *chan_config, unsigned *configured)
 {
 	int currindex;
+	unsigned chan_index = 0;
 
 	ftdm_assert_return(span != NULL, FTDM_EINVAL, "span is null\n");
 	ftdm_assert_return(chan_config != NULL, FTDM_EINVAL, "config is null\n");
@@ -3996,6 +4501,14 @@ FT_DECLARE(ftdm_status_t) ftdm_configure_span_channels(ftdm_span_t *span, const
 		return FTDM_FAIL;
 	}
 
+	if (chan_config->debugdtmf) {
+		for (chan_index = currindex+1; chan_index <= span->chan_count; chan_index++) {
+			if (!FTDM_IS_VOICE_CHANNEL(span->channels[chan_index])) {
+				continue;
+			}
+			span->channels[chan_index]->dtmfdbg.requested = 1;
+		}
+	}
 	return FTDM_SUCCESS;
 }
 
@@ -4014,7 +4527,7 @@ static ftdm_status_t load_config(void)
 	ftdm_channel_config_t chan_config;
 
 	memset(&chan_config, 0, sizeof(chan_config));
-	sprintf(chan_config.group_name,"default");
+	sprintf(chan_config.group_name, "__default");
 
 	if (!ftdm_config_open_file(&cfg, cfg_name)) {
 		return FTDM_FAIL;
@@ -4051,6 +4564,9 @@ static ftdm_status_t load_config(void)
 				if (ftdm_span_create(type, name, &span) == FTDM_SUCCESS) {
 					ftdm_log(FTDM_LOG_DEBUG, "created span %d (%s) of type %s\n", span->span_id, span->name, type);
 					d = 0;
+					/* it is confusing that parameters from one span affect others, so let's clear them */
+					memset(&chan_config, 0, sizeof(chan_config));
+					sprintf(chan_config.group_name, "__default");
 				} else {
 					ftdm_log(FTDM_LOG_CRIT, "failure creating span of type %s\n", type);
 					span = NULL;
@@ -4174,6 +4690,9 @@ static ftdm_status_t load_config(void)
 				if (sscanf(val, "%f", &(chan_config.rxgain)) != 1) {
 					ftdm_log(FTDM_LOG_ERROR, "invalid rxgain: '%s'\n", val);
 				}
+			} else if (!strcasecmp(var, "debugdtmf")) {
+				chan_config.debugdtmf = ftdm_true(val);
+				ftdm_log(FTDM_LOG_DEBUG, "Setting debugdtmf to '%s'\n", chan_config.debugdtmf ? "yes" : "no");
 			} else if (!strcasecmp(var, "group")) {
 				len = strlen(val);
 				if (len >= FTDM_MAX_NAME_STR_SZ) {
@@ -4758,7 +5277,11 @@ FT_DECLARE(ftdm_status_t) ftdm_group_create(ftdm_group_t **group, const char *na
 
 static ftdm_status_t ftdm_span_trigger_signal(const ftdm_span_t *span, ftdm_sigmsg_t *sigmsg)
 {
-	return span->signal_cb(sigmsg);
+	ftdm_status_t status = span->signal_cb(sigmsg);
+	if (sigmsg->channel) {
+		ftdm_call_clear_data(&(sigmsg->channel->caller_data));
+	}
+	return status;
 }
 
 static ftdm_status_t ftdm_span_queue_signal(const ftdm_span_t *span, ftdm_sigmsg_t *sigmsg)
@@ -4807,7 +5330,7 @@ FT_DECLARE(ftdm_status_t) ftdm_span_send_signal(ftdm_span_t *span, ftdm_sigmsg_t
 	if (sigmsg->channel) {
 		ftdm_mutex_lock(sigmsg->channel->mutex);
 	}
-
+	
 	/* some core things to do on special events */
 	switch (sigmsg->event_id) {
 
@@ -4825,6 +5348,9 @@ FT_DECLARE(ftdm_status_t) ftdm_span_send_signal(ftdm_span_t *span, ftdm_sigmsg_t
 	case FTDM_SIGEVENT_START:
 		{
 			ftdm_set_echocancel_call_begin(sigmsg->channel);
+			if (sigmsg->channel->dtmfdbg.requested) {
+				ftdm_channel_command(sigmsg->channel, FTDM_COMMAND_ENABLE_DEBUG_DTMF, NULL);
+			}
 
 			/* when cleaning up the public API I added this because mod_freetdm.c on_fxs_signal was
 			* doing it during SIGEVENT_START, but now that flags are private they can't, wonder if
@@ -4859,6 +5385,7 @@ FT_DECLARE(ftdm_status_t) ftdm_span_send_signal(ftdm_span_t *span, ftdm_sigmsg_t
 	}
 
 done:
+	
 	if (sigmsg->channel) {
 		ftdm_mutex_unlock(sigmsg->channel->mutex);
 	}
diff --git a/libs/freetdm/src/ftdm_threadmutex.c b/libs/freetdm/src/ftdm_threadmutex.c
index 1271d80f4a..b1884ec587 100644
--- a/libs/freetdm/src/ftdm_threadmutex.c
+++ b/libs/freetdm/src/ftdm_threadmutex.c
@@ -417,7 +417,7 @@ FT_DECLARE(ftdm_status_t) ftdm_interrupt_destroy(ftdm_interrupt_t **ininterrupt)
 FT_DECLARE(ftdm_status_t) ftdm_interrupt_multiple_wait(ftdm_interrupt_t *interrupts[], ftdm_size_t size, int ms)
 {
 	int numdevices = 0;
-	unsigned i;
+	unsigned i = 0;
 
 #if defined(__WINDOWS__)
 	DWORD res = 0;
@@ -496,6 +496,8 @@ pollagain:
 		}
 	}
 #else
+	/* for MacOS compilation, unused vars */
+	numdevices = i;
 #endif
 	return FTDM_SUCCESS;
 }
diff --git a/libs/freetdm/src/ftmod/ftmod_analog/ftdm_analog.h b/libs/freetdm/src/ftmod/ftmod_analog/ftdm_analog.h
index 487829fd7b..2c79822b29 100644
--- a/libs/freetdm/src/ftmod/ftmod_analog/ftdm_analog.h
+++ b/libs/freetdm/src/ftmod/ftmod_analog/ftdm_analog.h
@@ -46,6 +46,7 @@ typedef enum {
 struct ftdm_analog_data {
 	uint32_t flags;
 	uint32_t max_dialstr;
+	uint32_t wait_dialtone_timeout;
 	uint32_t digit_timeout;
 	char hotline[FTDM_MAX_HOTLINE_STR];
 };
diff --git a/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.2008.vcproj b/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.2008.vcproj
index 448f03a545..09349fc05f 100644
--- a/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.2008.vcproj
+++ b/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.2008.vcproj
@@ -1,353 +1,353 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="ftmod_analog"
-	ProjectGUID="{37C94798-6E33-4B4F-8EE0-C72A7DC91157}"
-	RootNamespace="ftmod_analog"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="ftmod_analog.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="ftdm_analog.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="ftmod_analog"
+	ProjectGUID="{37C94798-6E33-4B4F-8EE0-C72A7DC91157}"
+	RootNamespace="ftmod_analog"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				WarnAsError="true"
+				DebugInformationFormat="4"
+				DisableSpecificWarnings="4100"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				WarnAsError="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4100"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				WarnAsError="true"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4100"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				WarnAsError="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4100"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="ftmod_analog.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="ftdm_analog.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.2010.vcxproj b/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.2010.vcxproj
new file mode 100644
index 0000000000..301d821af6
--- /dev/null
+++ b/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.2010.vcxproj
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>ftmod_analog</ProjectName>
+    <ProjectGuid>{37C94798-6E33-4B4F-8EE0-C72A7DC91157}</ProjectGuid>
+    <RootNamespace>ftmod_analog</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\include;..\..\isdn\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\include;..\..\isdn\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\include;..\..\isdn\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\include;..\..\isdn\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="ftmod_analog.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ftdm_analog.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\msvc\freetdm.2010.vcxproj">
+      <Project>{93b8812c-3ec4-4f78-8970-ffbfc99e167d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.2010.vcxproj.filters b/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.2010.vcxproj.filters
new file mode 100644
index 0000000000..b6fed5927a
--- /dev/null
+++ b/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.2010.vcxproj.filters
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ftmod_analog.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ftdm_analog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.c b/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.c
index dacda7e448..f07f48b0d6 100644
--- a/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.c
+++ b/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.c
@@ -49,13 +49,16 @@ static void *ftdm_analog_channel_run(ftdm_thread_t *me, void *obj);
  */
 static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(analog_fxo_outgoing_call)
 {
+	ftdm_analog_data_t *analog_data = ftdmchan->span->signal_data;
 	if (!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OFFHOOK) && !ftdm_test_flag(ftdmchan, FTDM_CHANNEL_INTHREAD)) {		
 		ftdm_channel_clear_needed_tones(ftdmchan);
 		ftdm_channel_clear_detected_tones(ftdmchan);
 
 		ftdm_channel_command(ftdmchan, FTDM_COMMAND_OFFHOOK, NULL);
 		ftdm_channel_command(ftdmchan, FTDM_COMMAND_ENABLE_PROGRESS_DETECT, NULL);
-		ftdmchan->needed_tones[FTDM_TONEMAP_DIAL] = 1;
+		if (analog_data->wait_dialtone_timeout) {
+			ftdmchan->needed_tones[FTDM_TONEMAP_DIAL] = 1;
+		}
 		ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DIALING);
 		ftdm_thread_create_detached(ftdm_analog_channel_run, ftdmchan);
 		return FTDM_SUCCESS;
@@ -157,6 +160,7 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_analog_configure_span)
 	const char *tonemap = "us";
 	const char *hotline = "";
 	uint32_t digit_timeout = 10;
+	uint32_t wait_dialtone_timeout = 30000;
 	uint32_t max_dialstr = MAX_DTMF;
 	const char *var, *val;
 	int *intval;
@@ -191,6 +195,15 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_analog_configure_span)
 				break;
 			}
 			digit_timeout = *intval;
+		} else if (!strcasecmp(var, "wait_dialtone_timeout")) {
+			if (!(intval = va_arg(ap, int *))) {
+				break;
+			}
+			wait_dialtone_timeout = *intval;
+			if (wait_dialtone_timeout < 0) {
+				wait_dialtone_timeout = 0;
+			}
+			ftdm_log_chan(span->channels[i], FTDM_LOG_DEBUG, "Wait dial tone ms = %d\n", wait_dialtone_timeout);
 		} else if (!strcasecmp(var, "enable_callerid")) {
 			if (!(val = va_arg(ap, char *))) {
                 		break;
@@ -221,7 +234,6 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_analog_configure_span)
 		}			
 	}
 
-
 	if (digit_timeout < 2000 || digit_timeout > 10000) {
 		digit_timeout = 2000;
 	}
@@ -241,6 +253,7 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_analog_configure_span)
 	span->stop = ftdm_analog_stop;
 	analog_data->flags = flags;
 	analog_data->digit_timeout = digit_timeout;
+	analog_data->wait_dialtone_timeout = wait_dialtone_timeout;
 	analog_data->max_dialstr = max_dialstr;
 	span->signal_cb = sig_cb;
 	strncpy(analog_data->hotline, hotline, sizeof(analog_data->hotline));
@@ -325,6 +338,27 @@ static void send_caller_id(ftdm_channel_t *ftdmchan)
 	ftdm_channel_send_fsk_data(ftdmchan, &fsk_data, -14);
 }
 
+static void analog_dial(ftdm_channel_t *ftdmchan, uint32_t *state_counter, uint32_t *dial_timeout)
+{
+	if (ftdm_strlen_zero(ftdmchan->caller_data.dnis.digits)) {
+		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "No digits to send, moving to UP!\n");
+		ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_UP);
+	} else {
+		if (ftdm_channel_command(ftdmchan, FTDM_COMMAND_SEND_DTMF, ftdmchan->caller_data.dnis.digits) != FTDM_SUCCESS) {
+			ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Send Digits Failed [%s]\n", ftdmchan->last_error);
+			ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_BUSY);
+		} else {
+			*state_counter = 0;
+			ftdmchan->needed_tones[FTDM_TONEMAP_RING] = 1;
+			ftdmchan->needed_tones[FTDM_TONEMAP_BUSY] = 1;
+			ftdmchan->needed_tones[FTDM_TONEMAP_FAIL1] = 1;
+			ftdmchan->needed_tones[FTDM_TONEMAP_FAIL2] = 1;
+			ftdmchan->needed_tones[FTDM_TONEMAP_FAIL3] = 1;
+			*dial_timeout = ((ftdmchan->dtmf_on + ftdmchan->dtmf_off) * strlen(ftdmchan->caller_data.dnis.digits)) + 2000;
+		}
+	}
+}
+
 /**
  * \brief Main thread function for analog channel (outgoing call)
  * \param me Current thread
@@ -342,7 +376,7 @@ static void *ftdm_analog_channel_run(ftdm_thread_t *me, void *obj)
 	ftdm_size_t dtmf_offset = 0;
 	ftdm_analog_data_t *analog_data = ftdmchan->span->signal_data;
 	ftdm_channel_t *closed_chan;
-	uint32_t state_counter = 0, elapsed = 0, collecting = 0, interval = 0, last_digit = 0, indicate = 0, dial_timeout = 30000;
+	uint32_t state_counter = 0, elapsed = 0, collecting = 0, interval = 0, last_digit = 0, indicate = 0, dial_timeout = analog_data->wait_dialtone_timeout;
 	ftdm_sigmsg_t sig;
 	ftdm_status_t status;
 	
@@ -383,7 +417,11 @@ static void *ftdm_analog_channel_run(ftdm_thread_t *me, void *obj)
 	sig.span_id = ftdmchan->span_id;
 	sig.channel = ftdmchan;
 	
-	assert(interval != 0);
+	ftdm_assert(interval != 0, NULL);
+
+	if (!dial_timeout) {
+		ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Not waiting for dial tone to dial number %s\n", ftdmchan->caller_data.dnis.digits);
+	}
 
 	while (ftdm_running() && ftdm_test_flag(ftdmchan, FTDM_CHANNEL_INTHREAD)) {
 		ftdm_wait_flag_t flags = FTDM_READ;
@@ -400,7 +438,7 @@ static void *ftdm_analog_channel_run(ftdm_thread_t *me, void *obj)
 				{
 					if (state_counter > 5000 || !ftdm_test_flag(ftdmchan, FTDM_CHANNEL_CALLERID_DETECT)) {
 						ftdm_channel_command(ftdmchan, FTDM_COMMAND_DISABLE_CALLERID_DETECT, NULL);
-						ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_IDLE);
+						ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_RING);
 					}
 				}
 				break;
@@ -412,7 +450,7 @@ static void *ftdm_analog_channel_run(ftdm_thread_t *me, void *obj)
 						} else {
 							ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_UP);
 						}
-					} 
+					}
 				}
 				break;
 			case FTDM_CHANNEL_STATE_GENRING:
@@ -453,9 +491,10 @@ static void *ftdm_analog_channel_run(ftdm_thread_t *me, void *obj)
 							ftdm_channel_command(ftdmchan, FTDM_COMMAND_GENERATE_RING_OFF, NULL);
 						}
 						
-						if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OFFHOOK) && 
-							(ftdmchan->last_state == FTDM_CHANNEL_STATE_RING || ftdmchan->last_state == FTDM_CHANNEL_STATE_DIALTONE 
-							 || ftdmchan->last_state >= FTDM_CHANNEL_STATE_IDLE)) {
+						if (ftdmchan->type == FTDM_CHAN_TYPE_FXS &&
+							   ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OFFHOOK) && 
+							(ftdmchan->last_state == FTDM_CHANNEL_STATE_RINGING || ftdmchan->last_state == FTDM_CHANNEL_STATE_DIALTONE 
+							 || ftdmchan->last_state == FTDM_CHANNEL_STATE_RING)) {
 							ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_BUSY);
 						} else {
 							ftdmchan->caller_data.hangup_cause = FTDM_CAUSE_NORMAL_CLEARING;
@@ -497,7 +536,7 @@ static void *ftdm_analog_channel_run(ftdm_thread_t *me, void *obj)
 					}
 				}
 			case FTDM_CHANNEL_STATE_UP:
-			case FTDM_CHANNEL_STATE_IDLE:
+			case FTDM_CHANNEL_STATE_RING:
 				{
 					ftdm_sleep(interval);
 					continue;
@@ -561,7 +600,7 @@ static void *ftdm_analog_channel_run(ftdm_thread_t *me, void *obj)
 					ftdm_channel_use(ftdmchan);
 				}
 				break;
-			case FTDM_CHANNEL_STATE_IDLE:
+			case FTDM_CHANNEL_STATE_RING:
 				{
 					ftdm_channel_use(ftdmchan);
 					sig.event_id = FTDM_SIGEVENT_START;
@@ -631,7 +670,7 @@ static void *ftdm_analog_channel_run(ftdm_thread_t *me, void *obj)
 					continue;
 				}
 				break;
-			case FTDM_CHANNEL_STATE_RING:
+			case FTDM_CHANNEL_STATE_RINGING:
 				{
 					ftdm_buffer_zero(dt_buffer);
 					teletone_run(&ts, ftdmchan->span->tone_map[FTDM_TONEMAP_RING]);
@@ -694,7 +733,7 @@ static void *ftdm_analog_channel_run(ftdm_thread_t *me, void *obj)
 
 		if (last_digit && (!collecting || ((elapsed - last_digit > analog_data->digit_timeout) || strlen(dtmf) >= analog_data->max_dialstr))) {
 			ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Number obtained [%s]\n", dtmf);
-			ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_IDLE);
+			ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_RING);
 			last_digit = 0;
 			collecting = 0;
 		}
@@ -730,28 +769,15 @@ static void *ftdm_analog_channel_run(ftdm_thread_t *me, void *obj)
 				ftdm_log_chan_msg(ftdmchan, FTDM_LOG_ERROR, "Failure indication detected!\n");
 				ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_BUSY);
 			} else if (ftdmchan->detected_tones[FTDM_TONEMAP_DIAL]) {
-				if (ftdm_strlen_zero(ftdmchan->caller_data.dnis.digits)) {
-					ftdm_log_chan_msg(ftdmchan, FTDM_LOG_ERROR, "No Digits to send!\n");
-					ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_BUSY);
-				} else {
-					if (ftdm_channel_command(ftdmchan, FTDM_COMMAND_SEND_DTMF, ftdmchan->caller_data.dnis.digits) != FTDM_SUCCESS) {
-						ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Send Digits Failed [%s]\n", ftdmchan->last_error);
-						ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_BUSY);
-					} else {
-						state_counter = 0;
-						ftdmchan->needed_tones[FTDM_TONEMAP_RING] = 1;
-						ftdmchan->needed_tones[FTDM_TONEMAP_BUSY] = 1;
-						ftdmchan->needed_tones[FTDM_TONEMAP_FAIL1] = 1;
-						ftdmchan->needed_tones[FTDM_TONEMAP_FAIL2] = 1;
-						ftdmchan->needed_tones[FTDM_TONEMAP_FAIL3] = 1;
-						dial_timeout = ((ftdmchan->dtmf_on + ftdmchan->dtmf_off) * strlen(ftdmchan->caller_data.dnis.digits)) + 2000;
-					}
-				}
+				analog_dial(ftdmchan, &state_counter, &dial_timeout);
 			} else if (ftdmchan->detected_tones[FTDM_TONEMAP_RING]) {
 				ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_UP);
 			}
 			
 			ftdm_channel_clear_detected_tones(ftdmchan);
+		} else if (!dial_timeout) {
+			/* we were requested not to wait for dial tone, we can dial immediately */
+			analog_dial(ftdmchan, &state_counter, &dial_timeout);
 		}
 
 		if ((ftdmchan->dtmf_buffer && ftdm_buffer_inuse(ftdmchan->dtmf_buffer)) || (ftdmchan->fsk_buffer && ftdm_buffer_inuse(ftdmchan->fsk_buffer))) {
@@ -865,7 +891,7 @@ static __inline__ ftdm_status_t process_event(ftdm_span_t *span, ftdm_event_t *e
 				if (ftdm_test_flag(analog_data, FTDM_ANALOG_CALLERID)) {
 					ftdm_set_state_locked(event->channel, FTDM_CHANNEL_STATE_GET_CALLERID);
 				} else {
-					ftdm_set_state_locked(event->channel, FTDM_CHANNEL_STATE_IDLE);
+					ftdm_set_state_locked(event->channel, FTDM_CHANNEL_STATE_RING);
 				}
 				event->channel->ring_count = 1;
 				ftdm_mutex_unlock(event->channel->mutex);
diff --git a/libs/freetdm/src/ftmod/ftmod_analog/ozmod_analog.2005.vcproj b/libs/freetdm/src/ftmod/ftmod_analog/ozmod_analog.2005.vcproj
deleted file mode 100644
index 7a1cf53b20..0000000000
--- a/libs/freetdm/src/ftmod/ftmod_analog/ozmod_analog.2005.vcproj
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="ftmod_analog"
-	ProjectGUID="{37C94798-6E33-4B4F-8EE0-C72A7DC91157}"
-	RootNamespace="ftmod_analog"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="ftmod_analog.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="ftdm_analog.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.2008.vcproj b/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.2008.vcproj
index 8ad183797a..837ba7de0f 100644
--- a/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.2008.vcproj
+++ b/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.2008.vcproj
@@ -1,353 +1,353 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="ftmod_analog_em"
-	ProjectGUID="{B3F49375-2834-4937-9D8C-4AC2EC911010}"
-	RootNamespace="ftmod_analog_em"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="false"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="ftmod_analog_em.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="ftdm_analog_em.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="ftmod_analog_em"
+	ProjectGUID="{B3F49375-2834-4937-9D8C-4AC2EC911010}"
+	RootNamespace="ftmod_analog_em"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				WarnAsError="true"
+				DebugInformationFormat="4"
+				DisableSpecificWarnings="4100"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				WarnAsError="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4100"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				WarnAsError="true"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4100"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				WarnAsError="false"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4100"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="ftmod_analog_em.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="ftdm_analog_em.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.2010.vcxproj b/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.2010.vcxproj
new file mode 100644
index 0000000000..3643e271ef
--- /dev/null
+++ b/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.2010.vcxproj
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>ftmod_analog_em</ProjectName>
+    <ProjectGuid>{B3F49375-2834-4937-9D8C-4AC2EC911010}</ProjectGuid>
+    <RootNamespace>ftmod_analog_em</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\include;..\..\isdn\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\include;..\..\isdn\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\include;..\..\isdn\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\include;..\..\isdn\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="ftmod_analog_em.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ftdm_analog_em.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\msvc\freetdm.2010.vcxproj">
+      <Project>{93b8812c-3ec4-4f78-8970-ffbfc99e167d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.2010.vcxproj.filters b/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.2010.vcxproj.filters
new file mode 100644
index 0000000000..3326f9fd16
--- /dev/null
+++ b/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.2010.vcxproj.filters
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ftmod_analog_em.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ftdm_analog_em.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.c b/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.c
index 199bba43a3..886c4a8fec 100644
--- a/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.c
+++ b/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.c
@@ -329,8 +329,8 @@ static void *ftdm_analog_em_channel_run(ftdm_thread_t *me, void *obj)
 				{
 					if (state_counter > 500) {
 						if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OFFHOOK) && 
-							(ftdmchan->last_state == FTDM_CHANNEL_STATE_RING || ftdmchan->last_state == FTDM_CHANNEL_STATE_DIALTONE 
-							 || ftdmchan->last_state >= FTDM_CHANNEL_STATE_IDLE)) {
+							(ftdmchan->last_state == FTDM_CHANNEL_STATE_RINGING || ftdmchan->last_state == FTDM_CHANNEL_STATE_DIALTONE 
+							 || ftdmchan->last_state == FTDM_CHANNEL_STATE_RING)) {
 							ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_BUSY);
 						} else {
 							ftdmchan->caller_data.hangup_cause = FTDM_CAUSE_NORMAL_CLEARING;
@@ -340,7 +340,7 @@ static void *ftdm_analog_em_channel_run(ftdm_thread_t *me, void *obj)
 				}
 				break;
 			case FTDM_CHANNEL_STATE_UP:
-			case FTDM_CHANNEL_STATE_IDLE:
+			case FTDM_CHANNEL_STATE_RING:
 				{
 					ftdm_sleep(interval);
 					continue;
@@ -386,7 +386,7 @@ static void *ftdm_analog_em_channel_run(ftdm_thread_t *me, void *obj)
 					ftdm_channel_use(ftdmchan);
 				}
 				break;
-			case FTDM_CHANNEL_STATE_IDLE:
+			case FTDM_CHANNEL_STATE_RING:
 				{
 					ftdm_channel_use(ftdmchan);
 
@@ -421,7 +421,7 @@ static void *ftdm_analog_em_channel_run(ftdm_thread_t *me, void *obj)
 					ftdm_channel_command(ftdmchan, FTDM_COMMAND_WINK, NULL);
 				}
 				break;
-			case FTDM_CHANNEL_STATE_RING:
+			case FTDM_CHANNEL_STATE_RINGING:
 				{
 					ftdm_buffer_zero(dt_buffer);
 					teletone_run(&ts, ftdmchan->span->tone_map[FTDM_TONEMAP_RING]);
@@ -477,7 +477,7 @@ static void *ftdm_analog_em_channel_run(ftdm_thread_t *me, void *obj)
 
 		if (last_digit && (!collecting || ((elapsed - last_digit > analog_data->digit_timeout) || strlen(dtmf) > analog_data->max_dialstr))) {
 			ftdm_log(FTDM_LOG_DEBUG, "Number obtained [%s]\n", dtmf);
-			ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_IDLE);
+			ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_RING);
 			last_digit = 0;
 			collecting = 0;
 		}
diff --git a/libs/freetdm/src/ftmod/ftmod_analog_em/ozmod_analog_em.2005.vcproj b/libs/freetdm/src/ftmod/ftmod_analog_em/ozmod_analog_em.2005.vcproj
deleted file mode 100644
index 9ecbadc232..0000000000
--- a/libs/freetdm/src/ftmod/ftmod_analog_em/ozmod_analog_em.2005.vcproj
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="ftmod_analog_em"
-	ProjectGUID="{C539D7C8-26A8-4A94-B938-77672165C130}"
-	RootNamespace="ftmod_analog_em"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="ftmod_analog_em.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="ftdm_analog_em.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.2010.vcxproj b/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.2010.vcxproj
new file mode 100644
index 0000000000..bd2e2fe4f0
--- /dev/null
+++ b/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.2010.vcxproj
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>ftmod_isdn</ProjectName>
+    <ProjectGuid>{729344A5-D5E9-434D-8EE8-AF8C6C795D15}</ProjectGuid>
+    <RootNamespace>ftmod_isdn</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\isdn\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\isdn\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\isdn\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\isdn\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\isdn\5ESSmes.c" />
+    <ClCompile Include="..\..\isdn\5ESSStateNT.c" />
+    <ClCompile Include="..\..\isdn\5ESSStateTE.c" />
+    <ClCompile Include="..\..\isdn\DMSmes.c" />
+    <ClCompile Include="..\..\isdn\DMSStateNT.c" />
+    <ClCompile Include="..\..\isdn\DMSStateTE.c" />
+    <ClCompile Include="..\..\isdn\EuroISDNStateNT.c" />
+    <ClCompile Include="..\..\isdn\EuroISDNStateTE.c" />
+    <ClCompile Include="..\..\isdn\mfifo.c" />
+    <ClCompile Include="..\..\isdn\nationalmes.c" />
+    <ClCompile Include="..\..\isdn\nationalStateNT.c" />
+    <ClCompile Include="..\..\isdn\nationalStateTE.c" />
+    <ClCompile Include="ftmod_isdn.c" />
+    <ClCompile Include="..\..\isdn\Q921.c" />
+    <ClCompile Include="..\..\isdn\Q931.c" />
+    <ClCompile Include="..\..\isdn\Q931api.c" />
+    <ClCompile Include="..\..\isdn\Q931ie.c" />
+    <ClCompile Include="..\..\isdn\Q931mes.c" />
+    <ClCompile Include="..\..\isdn\Q931StateNT.c" />
+    <ClCompile Include="..\..\isdn\Q931StateTE.c" />
+    <ClCompile Include="..\..\isdn\Q932mes.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\isdn\include\5ESS.h" />
+    <ClInclude Include="..\..\isdn\include\DMS.h" />
+    <ClInclude Include="..\..\isdn\include\mfifo.h" />
+    <ClInclude Include="..\..\isdn\include\national.h" />
+    <ClInclude Include="..\..\isdn\include\Q921.h" />
+    <ClInclude Include="..\..\isdn\include\Q921priv.h" />
+    <ClInclude Include="..\..\isdn\include\Q931.h" />
+    <ClInclude Include="..\..\isdn\include\Q931ie.h" />
+    <ClInclude Include="..\..\isdn\include\Q932.h" />
+    <ClInclude Include="ftdm_isdn.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\msvc\freetdm.2010.vcxproj">
+      <Project>{93b8812c-3ec4-4f78-8970-ffbfc99e167d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.2010.vcxproj.filters b/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.2010.vcxproj.filters
new file mode 100644
index 0000000000..30824888fc
--- /dev/null
+++ b/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.2010.vcxproj.filters
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\isdn\5ESSmes.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\isdn\5ESSStateNT.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\isdn\5ESSStateTE.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\isdn\DMSmes.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\isdn\DMSStateNT.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\isdn\DMSStateTE.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\isdn\EuroISDNStateNT.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\isdn\EuroISDNStateTE.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\isdn\mfifo.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\isdn\nationalmes.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\isdn\nationalStateNT.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\isdn\nationalStateTE.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ftmod_isdn.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\isdn\Q921.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\isdn\Q931.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\isdn\Q931api.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\isdn\Q931ie.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\isdn\Q931mes.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\isdn\Q931StateNT.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\isdn\Q931StateTE.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\isdn\Q932mes.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\isdn\include\5ESS.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\isdn\include\DMS.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\isdn\include\mfifo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\isdn\include\national.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\isdn\include\Q921.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\isdn\include\Q921priv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\isdn\include\Q931.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\isdn\include\Q931ie.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\isdn\include\Q932.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ftdm_isdn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c b/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c
index 1dbd6d362e..6a8a4eb379 100644
--- a/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c
+++ b/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c
@@ -594,9 +594,10 @@ static void ftdm_isdn_call_event(struct Q931_Call *call, struct Q931_CallEvent *
 						return;
 					}
 
-					if (ftdmchan->state != FTDM_CHANNEL_STATE_DOWN) {
+					if (ftdm_channel_get_state(ftdmchan) != FTDM_CHANNEL_STATE_DOWN) {
 						ftdm_log(FTDM_LOG_DEBUG, "Channel %d:%d not in DOWN state, cleaning up\n",
-											ftdmchan->span_id, ftdmchan->chan_id);
+									ftdm_channel_get_span_id(ftdmchan),
+									ftdm_channel_get_id(ftdmchan));
 
 						/*
 						 * Send hangup signal to mod_openzap
@@ -606,7 +607,7 @@ static void ftdm_isdn_call_event(struct Q931_Call *call, struct Q931_CallEvent *
 						}
 
 						sig.event_id = FTDM_SIGEVENT_STOP;
-						isdn_data->sig_cb(&sig);
+						ftdm_span_send_signal(ftdm_channel_get_span(ftdmchan), &sig);
 
 						/* Release zap channel */
 						ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
@@ -640,7 +641,9 @@ static void ftdm_isdn_call_event(struct Q931_Call *call, struct Q931_CallEvent *
 						return;
 					}
 
-					ftdm_log(FTDM_LOG_DEBUG, "Call setup failed on channel %d:%d\n", ftdmchan->span_id, ftdmchan->chan_id);
+					ftdm_log(FTDM_LOG_DEBUG, "Call setup failed on channel %d:%d\n",
+								ftdm_channel_get_span_id(ftdmchan),
+								ftdm_channel_get_id(ftdmchan));
 
 					/*
 					 * Send signal to mod_openzap
@@ -648,7 +651,7 @@ static void ftdm_isdn_call_event(struct Q931_Call *call, struct Q931_CallEvent *
 					sig.channel->caller_data.hangup_cause = FTDM_CAUSE_NETWORK_OUT_OF_ORDER;
 
 					sig.event_id = FTDM_SIGEVENT_STOP;
-					isdn_data->sig_cb(&sig);
+					ftdm_span_send_signal(ftdm_channel_get_span(ftdmchan), &sig);
 
 					/* Release zap channel */
 					ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
@@ -908,7 +911,7 @@ static L3INT ftdm_isdn_931_34(void *pvt, struct Q931_Call *call, Q931mes_Generic
 						sig.channel->caller_data.hangup_cause = (cause) ? cause->Value : FTDM_CAUSE_NORMAL_UNSPECIFIED;
 
 						sig.event_id = FTDM_SIGEVENT_STOP;
-						status = isdn_data->sig_cb(&sig);
+						status = ftdm_span_send_signal(span, &sig);
 
 						ftdm_log(FTDM_LOG_DEBUG, "Received %s in state %s, requested hangup for channel %d:%d\n", what,
 								ftdm_channel_get_state_str(ftdmchan),
@@ -1297,6 +1300,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 {
 	Q931mes_Generic *gen = (Q931mes_Generic *) ftdmchan->caller_data.raw_data;
 	ftdm_isdn_data_t *isdn_data = ftdmchan->span->signal_data;
+	ftdm_span_t *span = ftdm_channel_get_span(ftdmchan);
 	ftdm_sigmsg_t sig;
 	ftdm_status_t status;
 
@@ -1328,7 +1332,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 		{
 			if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
 				sig.event_id = FTDM_SIGEVENT_PROGRESS;
-				if ((status = isdn_data->sig_cb(&sig) != FTDM_SUCCESS)) {
+				if ((status = ftdm_span_send_signal(ftdm_channel_get_span(ftdmchan), &sig) != FTDM_SUCCESS)) {
 					ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
 				}
 			} else {
@@ -1376,7 +1380,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 		{
 			if (!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
 				sig.event_id = FTDM_SIGEVENT_START;
-				if ((status = isdn_data->sig_cb(&sig) != FTDM_SUCCESS)) {
+				if ((status = ftdm_span_send_signal(span, &sig) != FTDM_SUCCESS)) {
 					ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
 				}
 			}
@@ -1386,7 +1390,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 		{
 			ftdmchan->caller_data.hangup_cause = FTDM_CAUSE_NORMAL_UNSPECIFIED;
 			sig.event_id = FTDM_SIGEVENT_RESTART;
-			status = isdn_data->sig_cb(&sig);
+			status = ftdm_span_send_signal(span, &sig);
 			ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
 		}
 		break;
@@ -1394,7 +1398,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 		{
 			if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
 				sig.event_id = FTDM_SIGEVENT_PROGRESS_MEDIA;
-				if ((status = isdn_data->sig_cb(&sig) != FTDM_SUCCESS)) {
+				if ((status = ftdm_span_send_signal(span, &sig) != FTDM_SUCCESS)) {
 					ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
 				}
 			} else {
@@ -1414,7 +1418,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 		{
 			if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
 				sig.event_id = FTDM_SIGEVENT_UP;
-				if ((status = isdn_data->sig_cb(&sig) != FTDM_SUCCESS)) {
+				if ((status = ftdm_span_send_signal(span, &sig) != FTDM_SUCCESS)) {
 					ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
 				}
 			} else {
@@ -1635,7 +1639,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
 			ftdm_log(FTDM_LOG_DEBUG, "Terminating: Direction %s\n", ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND) ? "Outbound" : "Inbound");
 
 			sig.event_id = FTDM_SIGEVENT_STOP;
-			status = isdn_data->sig_cb(&sig);
+			status = ftdm_span_send_signal(span, &sig);
 
 			gen->MesType = Q931mes_RELEASE;
 			gen->CRVFlag = ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND) ? 0 : 1;
@@ -1672,7 +1676,6 @@ static __inline__ void check_state(ftdm_span_t *span)
 
 static __inline__ ftdm_status_t process_event(ftdm_span_t *span, ftdm_event_t *event)
 {
-	ftdm_isdn_data_t *isdn_data = span->signal_data;
 	ftdm_alarm_flag_t alarmbits;
 	ftdm_sigmsg_t sig;
 
@@ -1696,7 +1699,7 @@ static __inline__ ftdm_status_t process_event(ftdm_span_t *span, ftdm_event_t *e
 			}
 			ftdm_set_flag(event->channel, FTDM_CHANNEL_SUSPENDED);
 			ftdm_channel_get_alarms(event->channel, &alarmbits);
-			isdn_data->sig_cb(&sig);
+			ftdm_span_send_signal(span, &sig);
 
 			ftdm_log(FTDM_LOG_WARNING, "channel %d:%d (%d:%d) has alarms [%s]\n",
 					ftdm_channel_get_span_id(event->channel),
@@ -1711,7 +1714,7 @@ static __inline__ ftdm_status_t process_event(ftdm_span_t *span, ftdm_event_t *e
 			sig.event_id = FTDM_OOB_ALARM_CLEAR;
 			ftdm_clear_flag(event->channel, FTDM_CHANNEL_SUSPENDED);
 			ftdm_channel_get_alarms(event->channel, &alarmbits);
-			isdn_data->sig_cb(&sig);
+			ftdm_span_send_signal(span, &sig);
 		}
 		break;
 #ifdef __BROKEN_BY_FREETDM_CONVERSION__
@@ -2056,8 +2059,7 @@ static void *ftdm_isdn_run(ftdm_thread_t *me, void *obj)
 	}
 
 done:
-//	ftdm_channel_close(&isdn_data->dchans[0]);
-//	ftdm_channel_close(&isdn_data->dchans[1]);
+	ftdm_channel_close(&isdn_data->dchan);
 	ftdm_clear_flag(isdn_data, FTDM_ISDN_RUNNING);
 
 #ifdef WIN32
@@ -2744,8 +2746,7 @@ static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(isdn_configure_span)
 		}
 	}
 
-	isdn_data->sig_cb = sig_cb;
-	isdn_data->dchan  = dchan;
+	isdn_data->dchan = dchan;
 	isdn_data->digit_timeout = digit_timeout;
 
 	Q921_InitTrunk(&isdn_data->q921,
@@ -2787,6 +2788,7 @@ static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(isdn_configure_span)
 	span->state_map     = &isdn_state_map;
 	span->signal_data   = isdn_data;
 	span->signal_type   = FTDM_SIGTYPE_ISDN;
+	span->signal_cb     = sig_cb;
 	span->start         = ftdm_isdn_start;
 	span->stop          = ftdm_isdn_stop;
 	span->outgoing_call = isdn_outgoing_call;
diff --git a/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.h b/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.h
index 95eee90887..6b17f2cbef 100644
--- a/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.h
+++ b/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.h
@@ -63,9 +63,6 @@ struct ftdm_isdn_data {
 	Q921Data_t q921;
 	Q931_TrunkInfo_t q931;
 	ftdm_channel_t *dchan;
-	ftdm_channel_t *dchans[2];
-	struct ftdm_sigmsg sigmsg;
-	fio_signal_cb_t sig_cb;
 	uint32_t flags;
 	int32_t mode;
 	int32_t digit_timeout;
diff --git a/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c b/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c
index 21d6674717..68f0e9e5a4 100644
--- a/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c
+++ b/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c
@@ -462,7 +462,7 @@ static ftdm_state_map_t isdn_state_map = {
 			ZSD_INBOUND,
 			ZSM_UNACCEPTABLE,
 			{FTDM_CHANNEL_STATE_RING, FTDM_END},
-			{FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_END}
+			{FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_END}
 		},
 		{
 			ZSD_INBOUND,
@@ -479,7 +479,7 @@ static ftdm_state_map_t isdn_state_map = {
 		{
 			ZSD_INBOUND,
 			ZSM_UNACCEPTABLE,
-			{FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END},
+			{FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END},
 			{FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, 
 			 FTDM_CHANNEL_STATE_CANCEL, FTDM_CHANNEL_STATE_UP, FTDM_END},
 		},
@@ -495,6 +495,7 @@ static ftdm_state_map_t isdn_state_map = {
 /**
  * \brief Handler for channel state change
  * \param ftdmchan Channel to handle
+ * \note This function MUST be called with the channel locked
  */
 static __inline__ void state_advance(ftdm_channel_t *chan)
 {
@@ -503,15 +504,9 @@ static __inline__ void state_advance(ftdm_channel_t *chan)
 	ftdm_status_t status;
 	ftdm_sigmsg_t sig;
 
-	ftdm_log(FTDM_LOG_DEBUG, "%d:%d STATE [%s]\n",
+	ftdm_log(FTDM_LOG_DEBUG, "-- %d:%d STATE [%s]\n",
 			ftdm_channel_get_span_id(chan), ftdm_channel_get_id(chan), ftdm_channel_get_state_str(chan));
 
-#if 0
-	if (!ftdm_test_flag(chan, FTDM_CHANNEL_OUTBOUND) && !call) {
-		ftdm_log(FTDM_LOG_WARNING, "NO CALL!!!!\n");
-	}
-#endif
-
 	memset(&sig, 0, sizeof(sig));
 	sig.chan_id = ftdm_channel_get_id(chan);
 	sig.span_id = ftdm_channel_get_span_id(chan);
@@ -522,10 +517,28 @@ static __inline__ void state_advance(ftdm_channel_t *chan)
 		{
 			chan->call_data = NULL;
 			ftdm_channel_done(chan);
+
+			/*
+			 * Close channel completely, BRI PTMP will thank us
+			 */
+			if (ftdm_test_flag(chan, FTDM_CHANNEL_OPEN)) {
+				ftdm_channel_t *chtmp = chan;
+				if (ftdm_channel_close(&chtmp) != FTDM_SUCCESS) {
+					ftdm_log(FTDM_LOG_WARNING, "-- Failed to close channel %d:%d\n",
+						ftdm_channel_get_span_id(chan),
+						ftdm_channel_get_id(chan));
+				} else {
+					ftdm_log(FTDM_LOG_DEBUG, "-- Closed channel %d:%d\n",
+						ftdm_channel_get_span_id(chan),
+						ftdm_channel_get_id(chan));
+				}
+			}
 		}
 		break;
 
 	case FTDM_CHANNEL_STATE_PROGRESS:
+	/* RINGING is an alias for PROGRESS state in inbound calls ATM */
+	case FTDM_CHANNEL_STATE_RINGING:
 		{
 			if (ftdm_test_flag(chan, FTDM_CHANNEL_OUTBOUND)) {
 				sig.event_id = FTDM_SIGEVENT_PROGRESS;
@@ -548,6 +561,10 @@ static __inline__ void state_advance(ftdm_channel_t *chan)
 					ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_HANGUP);
 				}
 			} else if (call) {
+				/* make sure channel is open in this state (outbound handled in on_proceeding()) */
+				if (!ftdm_test_flag(chan, FTDM_CHANNEL_OPEN)) {
+					ftdm_channel_open_chan(chan);
+				}
 				pri_proceeding(isdn_data->spri.pri, call, ftdm_channel_get_id(chan), 1);
 			} else {
 				ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_RESTART);
@@ -557,6 +574,10 @@ static __inline__ void state_advance(ftdm_channel_t *chan)
 
 	case FTDM_CHANNEL_STATE_RING:
 		{
+			/*
+			 * This needs more auditing for BRI PTMP:
+			 * does pri_acknowledge() steal the call from other devices?
+			 */
 			if (!ftdm_test_flag(chan, FTDM_CHANNEL_OUTBOUND)) {
 				if (call) {
 					pri_acknowledge(isdn_data->spri.pri, call, ftdm_channel_get_id(chan), 0);
@@ -588,6 +609,10 @@ static __inline__ void state_advance(ftdm_channel_t *chan)
 					ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_HANGUP);
 				}
 			} else if (call) {
+				/* make sure channel is open in this state (outbound handled in on_answer()) */
+				if (!ftdm_test_flag(chan, FTDM_CHANNEL_OPEN)) {
+					ftdm_channel_open_chan(chan);
+				}
 				pri_answer(isdn_data->spri.pri, call, 0, 1);
 			} else {
 				ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_RESTART);
@@ -705,15 +730,13 @@ static __inline__ void check_state(ftdm_span_t *span)
 		for (j = 1; j <= ftdm_span_get_chan_count(span); j++) {
 			ftdm_channel_t *chan = ftdm_span_get_channel(span, j);
 
-			if (ftdm_test_flag(chan, FTDM_CHANNEL_STATE_CHANGE)) {
-				ftdm_channel_lock(chan);
-
+			ftdm_channel_lock(chan);
+			while (ftdm_test_flag(chan, FTDM_CHANNEL_STATE_CHANGE)) {
 				ftdm_clear_flag(chan, FTDM_CHANNEL_STATE_CHANGE);
 				state_advance(chan);
 				ftdm_channel_complete_state(chan);
-
-				ftdm_channel_unlock(chan);
 			}
+			ftdm_channel_unlock(chan);
 		}
 	}
 }
@@ -795,34 +818,113 @@ static int on_answer(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_even
 	ftdm_channel_t *chan = ftdm_span_get_channel(span, pevent->answer.channel);
 
 	if (chan) {
+		if (!ftdm_test_flag(chan, FTDM_CHANNEL_OPEN)) {
+			ftdm_log(FTDM_LOG_DEBUG, "-- Call answered, opening B-Channel %d:%d\n",
+				ftdm_channel_get_span_id(chan),
+				ftdm_channel_get_id(chan));
+
+			if (ftdm_channel_open_chan(chan) != FTDM_SUCCESS) {
+				ftdm_caller_data_t *caller_data = ftdm_channel_get_caller_data(chan);
+
+				ftdm_log(FTDM_LOG_ERROR, "-- Error opening channel %d:%d\n",
+					ftdm_channel_get_span_id(chan),
+					ftdm_channel_get_id(chan));
+
+				caller_data->hangup_cause = FTDM_CAUSE_DESTINATION_OUT_OF_ORDER;
+				ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_TERMINATING);
+				goto out;
+			}
+		}
 		ftdm_log(FTDM_LOG_DEBUG, "-- Answer on channel %d:%d\n", ftdm_span_get_id(span), pevent->answer.channel);
 		ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_UP);
 	} else {
 		ftdm_log(FTDM_LOG_DEBUG, "-- Answer on channel %d:%d but it's not in the span?\n",
 			ftdm_span_get_id(span), pevent->answer.channel);
 	}
+out:
 	return 0;
 }
 
 /**
- * \brief Handler for libpri proceed event
+ * \brief Handler for libpri proceeding event
  * \param spri Pri wrapper structure (libpri, span, dchan)
  * \param event_type Event type (unused)
  * \param pevent Event
  * \return 0
  */
-static int on_proceed(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event *pevent)
+static int on_proceeding(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event *pevent)
 {
 	ftdm_span_t *span = spri->span;
-	ftdm_channel_t *chan = ftdm_span_get_channel(span, pevent->answer.channel);
+	ftdm_channel_t *chan = ftdm_span_get_channel(span, pevent->proceeding.channel);
 
 	if (chan) {
+		/* Open channel if inband information is available */
+		if ((pevent->proceeding.progressmask & PRI_PROG_INBAND_AVAILABLE) && !ftdm_test_flag(chan, FTDM_CHANNEL_OPEN)) {
+			ftdm_log(FTDM_LOG_DEBUG, "-- In-band information available, opening B-Channel %d:%d\n",
+				ftdm_channel_get_span_id(chan),
+				ftdm_channel_get_id(chan));
+
+			if (ftdm_channel_open_chan(chan) != FTDM_SUCCESS) {
+				ftdm_caller_data_t *caller_data = ftdm_channel_get_caller_data(chan);
+
+				ftdm_log(FTDM_LOG_ERROR, "-- Error opening channel %d:%d\n",
+					ftdm_channel_get_span_id(chan),
+					ftdm_channel_get_id(chan));
+
+				caller_data->hangup_cause = FTDM_CAUSE_DESTINATION_OUT_OF_ORDER;
+				ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_TERMINATING);
+				goto out;
+			}
+		}
 		ftdm_log(FTDM_LOG_DEBUG, "-- Proceeding on channel %d:%d\n", ftdm_span_get_id(span), pevent->proceeding.channel);
 		ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_PROGRESS_MEDIA);
 	} else {
 		ftdm_log(FTDM_LOG_DEBUG, "-- Proceeding on channel %d:%d but it's not in the span?\n",
 						ftdm_span_get_id(span), pevent->proceeding.channel);
 	}
+out:
+	return 0;
+}
+
+/**
+ * \brief Handler for libpri progress event
+ * \param spri Pri wrapper structure (libpri, span, dchan)
+ * \param event_type Event type (unused)
+ * \param pevent Event
+ * \return 0
+ * \note also uses pri_event->proceeding
+ */
+static int on_progress(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event *pevent)
+{
+	ftdm_span_t *span = spri->span;
+	ftdm_channel_t *chan = ftdm_span_get_channel(span, pevent->proceeding.channel);
+
+	if (chan) {
+		/* Open channel if inband information is available */
+		if ((pevent->proceeding.progressmask & PRI_PROG_INBAND_AVAILABLE) && !ftdm_test_flag(chan, FTDM_CHANNEL_OPEN)) {
+			ftdm_log(FTDM_LOG_DEBUG, "-- In-band information available, opening B-Channel %d:%d\n",
+				ftdm_channel_get_span_id(chan),
+				ftdm_channel_get_id(chan));
+
+			if (ftdm_channel_open_chan(chan) != FTDM_SUCCESS) {
+				ftdm_caller_data_t *caller_data = ftdm_channel_get_caller_data(chan);
+
+				ftdm_log(FTDM_LOG_ERROR, "-- Error opening channel %d:%d\n",
+					ftdm_channel_get_span_id(chan),
+					ftdm_channel_get_id(chan));
+
+				caller_data->hangup_cause = FTDM_CAUSE_DESTINATION_OUT_OF_ORDER;
+				ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_TERMINATING);
+				goto out;
+			}
+		}
+		ftdm_log(FTDM_LOG_DEBUG, "-- Progress on channel %d:%d\n", ftdm_span_get_id(span), pevent->proceeding.channel);
+		ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_PROGRESS_MEDIA);
+	} else {
+		ftdm_log(FTDM_LOG_DEBUG, "-- Progress on channel %d:%d but it's not in the span?\n",
+						ftdm_span_get_id(span), pevent->proceeding.channel);
+	}
+out:
 	return 0;
 }
 
@@ -840,17 +942,37 @@ static int on_ringing(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_eve
 
 	if (chan) {
 		ftdm_log(FTDM_LOG_DEBUG, "-- Ringing on channel %d:%d\n", ftdm_span_get_id(span), pevent->ringing.channel);
+
 		/* we may get on_ringing even when we're already in FTDM_CHANNEL_STATE_PROGRESS_MEDIA */
 		if (ftdm_channel_get_state(chan) == FTDM_CHANNEL_STATE_PROGRESS_MEDIA) {
 			/* dont try to move to STATE_PROGRESS to avoid annoying veto warning */
 			return 0;
 		}
+
+		/* Open channel if inband information is available */
+		if ((pevent->ringing.progressmask & PRI_PROG_INBAND_AVAILABLE) && !ftdm_test_flag(chan, FTDM_CHANNEL_OPEN)) {
+			ftdm_log(FTDM_LOG_DEBUG, "-- In-band information available, opening B-Channel %d:%d\n",
+				ftdm_channel_get_span_id(chan),
+				ftdm_channel_get_id(chan));
+
+			if (ftdm_channel_open_chan(chan) != FTDM_SUCCESS) {
+				ftdm_caller_data_t *caller_data = ftdm_channel_get_caller_data(chan);
+
+				ftdm_log(FTDM_LOG_ERROR, "-- Error opening channel %d:%d\n",
+					ftdm_channel_get_span_id(chan),
+					ftdm_channel_get_id(chan));
+
+				caller_data->hangup_cause = FTDM_CAUSE_DESTINATION_OUT_OF_ORDER;
+				ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_TERMINATING);
+				goto out;
+			}
+		}
 		ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_PROGRESS);
 	} else {
 		ftdm_log(FTDM_LOG_DEBUG, "-- Ringing on channel %d:%d but it's not in the span?\n",
 			ftdm_span_get_id(span), pevent->ringing.channel);
 	}
-
+out:
 	return 0;
 }
 
@@ -868,14 +990,49 @@ static int on_ring(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event
 	ftdm_caller_data_t *caller_data = NULL;
 	int ret = 0;
 
-	if (!chan || ftdm_channel_get_state(chan) != FTDM_CHANNEL_STATE_DOWN || ftdm_test_flag(chan, FTDM_CHANNEL_INUSE)) {
-		ftdm_log(FTDM_LOG_WARNING, "--Duplicate Ring on channel %d:%d (ignored)\n", ftdm_span_get_id(span), pevent->ring.channel);
+	if (!chan) {
+		ftdm_log(FTDM_LOG_ERROR, "-- Unable to get channel %d:%d\n", ftdm_span_get_id(span), pevent->ring.channel);
+		return ret;
+	}
+
+	ftdm_channel_lock(chan);
+
+	if (chan->call_data) {
+		/* we could drop the incoming call, but most likely the pointer is just a ghost of the past, 
+		 * this check is just to detect potentially unreleased pointers */
+		ftdm_log_chan(chan, FTDM_LOG_ERROR, "channel already has call %p!\n", chan->call_data);
+		chan->call_data = NULL;
+	}
+
+	if (ftdm_channel_get_state(chan) != FTDM_CHANNEL_STATE_DOWN || ftdm_test_flag(chan, FTDM_CHANNEL_INUSE)) {
+		ftdm_log(FTDM_LOG_WARNING, "-- Duplicate Ring on channel %d:%d (ignored)\n", ftdm_span_get_id(span), pevent->ring.channel);
 		goto done;
 	}
 
-	if (ftdm_channel_open_chan(chan) != FTDM_SUCCESS) {
-		ftdm_log(FTDM_LOG_WARNING, "--Failure opening channel %d:%d (ignored)\n", ftdm_span_get_id(span), pevent->ring.channel);
-		goto done;
+	if ((pevent->ring.progressmask & PRI_PROG_INBAND_AVAILABLE)) {
+		/* Open channel if inband information is available */
+		ftdm_log(FTDM_LOG_DEBUG, "-- In-band information available, opening B-Channel %d:%d\n",
+			ftdm_channel_get_span_id(chan),
+			ftdm_channel_get_id(chan));
+
+		if (!ftdm_test_flag(chan, FTDM_CHANNEL_OPEN) && ftdm_channel_open_chan(chan) != FTDM_SUCCESS) {
+//			ftdm_caller_data_t *caller_data = ftdm_channel_get_caller_data(chan);
+
+			ftdm_log(FTDM_LOG_WARNING, "-- Error opening channel %d:%d (ignored)\n",
+				ftdm_channel_get_span_id(chan),
+				ftdm_channel_get_id(chan));
+
+//			caller_data->hangup_cause = FTDM_CAUSE_DESTINATION_OUT_OF_ORDER;
+//			ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_TERMINATING);
+//			goto done;
+		}
+	} else {
+		/* Reserve channel, don't open it yet */
+		if (ftdm_channel_use(chan) != FTDM_SUCCESS) {
+			ftdm_log(FTDM_LOG_WARNING, "-- Error reserving channel %d:%d (ignored)\n",
+				ftdm_span_get_id(span), pevent->ring.channel);
+			goto done;
+		}
 	}
 
 	ftdm_log(FTDM_LOG_NOTICE, "-- Ring on channel %d:%d (from %s to %s)\n", ftdm_span_get_id(span), pevent->ring.channel,
@@ -901,12 +1058,13 @@ static int on_ring(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event
 	}
 
 	// scary to trust this pointer, you'd think they would give you a copy of the call data so you own it......
-	/* hurr, this valid as along as nobody releases the call */
+	/* hurr, this is valid as along as nobody releases the call */
 	chan->call_data = pevent->ring.call;
 
-	ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_RING);
+	ftdm_set_state(chan, FTDM_CHANNEL_STATE_RING);
 
 done:
+	ftdm_channel_unlock(chan);
 	return ret;
 }
 
@@ -1300,7 +1458,7 @@ static int on_dchan_down(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_
  */
 static int on_anything(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event *pevent)
 {
-	ftdm_log(FTDM_LOG_DEBUG, "Caught Event span %d %u (%s)\n", ftdm_span_get_id(spri->span), event_type, lpwrap_pri_event_str(event_type));
+	ftdm_log(FTDM_LOG_DEBUG, "-- Caught Event span %d %u (%s)\n", ftdm_span_get_id(spri->span), event_type, lpwrap_pri_event_str(event_type));
 	return 0;
 }
 
@@ -1313,7 +1471,7 @@ static int on_anything(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_ev
  */
 static int on_io_fail(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event *pevent)
 {
-	ftdm_log(FTDM_LOG_DEBUG, "Caught Event span %d %u (%s)\n", ftdm_span_get_id(spri->span), event_type, lpwrap_pri_event_str(event_type));
+	ftdm_log(FTDM_LOG_DEBUG, "-- Caught Event span %d %u (%s)\n", ftdm_span_get_id(spri->span), event_type, lpwrap_pri_event_str(event_type));
 	return 0;
 }
 
@@ -1401,8 +1559,8 @@ static void *ftdm_libpri_run(ftdm_thread_t *me, void *obj)
 			LPWRAP_MAP_PRI_EVENT(isdn_data->spri, LPWRAP_PRI_EVENT_ANY, on_anything);
 			LPWRAP_MAP_PRI_EVENT(isdn_data->spri, LPWRAP_PRI_EVENT_RING, on_ring);
 			LPWRAP_MAP_PRI_EVENT(isdn_data->spri, LPWRAP_PRI_EVENT_RINGING, on_ringing);
-			//LPWRAP_MAP_PRI_EVENT(isdn_data->spri, LPWRAP_PRI_EVENT_SETUP_ACK, on_proceed);
-			LPWRAP_MAP_PRI_EVENT(isdn_data->spri, LPWRAP_PRI_EVENT_PROCEEDING, on_proceed);
+			LPWRAP_MAP_PRI_EVENT(isdn_data->spri, LPWRAP_PRI_EVENT_PROCEEDING, on_proceeding);
+			LPWRAP_MAP_PRI_EVENT(isdn_data->spri, LPWRAP_PRI_EVENT_PROGRESS, on_progress);
 			LPWRAP_MAP_PRI_EVENT(isdn_data->spri, LPWRAP_PRI_EVENT_ANSWER, on_answer);
 			LPWRAP_MAP_PRI_EVENT(isdn_data->spri, LPWRAP_PRI_EVENT_DCHAN_UP, on_dchan_up);
 			LPWRAP_MAP_PRI_EVENT(isdn_data->spri, LPWRAP_PRI_EVENT_DCHAN_DOWN, on_dchan_down);
diff --git a/libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.c b/libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.c
index de4fa2b232..fbe6ca0822 100644
--- a/libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.c
+++ b/libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.c
@@ -134,17 +134,18 @@ static int __pri_lpwrap_read(struct pri *pri, void *buf, int buflen)
 	spri->errs = 0;
 	res = (int)len;
 
-	memset(&((unsigned char*)buf)[res], 0, 2);
-	res += 2;
-
+	if (res > 0) {
+		memset(&((unsigned char*)buf)[res], 0, 2);
+		res += 2;
 #ifdef IODEBUG
-	{
-		char bb[2048] = { 0 };
+		{
+			char bb[2048] = { 0 };
 
-		print_hex_bytes(buf, res - 2, bb, sizeof(bb));
-		ftdm_log(FTDM_LOG_DEBUG, "READ %d\n", res - 2);
-	}
+			print_hex_bytes(buf, res - 2, bb, sizeof(bb));
+			ftdm_log(FTDM_LOG_DEBUG, "READ %d\n", res - 2);
+		}
 #endif
+	}
 	return res;
 }
 
diff --git a/libs/freetdm/src/ftmod/ftmod_pika/ftmod_pika.2010.vcxproj b/libs/freetdm/src/ftmod/ftmod_pika/ftmod_pika.2010.vcxproj
new file mode 100644
index 0000000000..c4004bda21
--- /dev/null
+++ b/libs/freetdm/src/ftmod/ftmod_pika/ftmod_pika.2010.vcxproj
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>ftmod_pika</ProjectName>
+    <ProjectGuid>{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}</ProjectGuid>
+    <RootNamespace>ftmod_pika</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_PIKA_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>pikahmpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\pika\aoh\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_PIKA_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>pikahmpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\pika\aoh\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_PIKA_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>pikahmpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\pika\aoh\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_PIKA_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>pikahmpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\pika\aoh\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="ftmod_pika.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ftdm_pika.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\msvc\freetdm.2010.vcxproj">
+      <Project>{93b8812c-3ec4-4f78-8970-ffbfc99e167d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/src/ftmod/ftmod_pika/ftmod_pika.2010.vcxproj.filters b/libs/freetdm/src/ftmod/ftmod_pika/ftmod_pika.2010.vcxproj.filters
new file mode 100644
index 0000000000..4d4cec4668
--- /dev/null
+++ b/libs/freetdm/src/ftmod/ftmod_pika/ftmod_pika.2010.vcxproj.filters
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ftmod_pika.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ftdm_pika.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.2008.vcproj b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.2008.vcproj
index 9ea351ba6a..8942a8f5b6 100644
--- a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.2008.vcproj
+++ b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.2008.vcproj
@@ -60,9 +60,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="freetdm.lib openr2.lib"
+				AdditionalDependencies="freetdm.lib libopenr2.lib"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\openr2\lib&quot;;&quot;$(OutDir)&quot;"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;C:\Program Files\openr2\lib&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
diff --git a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.2010.vcxproj b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.2010.vcxproj
new file mode 100644
index 0000000000..9b893b3527
--- /dev/null
+++ b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.2010.vcxproj
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>ftmod_r2</ProjectName>
+    <ProjectGuid>{08C3EA27-A51D-47F8-B47D-B189C649CF30}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\include;c:\Program Files\openr2\include\openr2;C:\Program Files\openr2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_R2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>freetdm.lib;openr2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>C:\Program Files\openr2\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\include;c:\Program Files\openr2\include\openr2;C:\Program Files\openr2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_R2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>freetdm.lib;openr2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>C:\Program Files\openr2\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\include;C:\Program Files\openr2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_R2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\include;C:\Program Files\openr2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_R2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="ftmod_r2.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.2010.vcxproj.filters b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.2010.vcxproj.filters
new file mode 100644
index 0000000000..9c91228e09
--- /dev/null
+++ b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.2010.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ftmod_r2.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
index d5344814f0..654e68ad9e 100644
--- a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
+++ b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
@@ -29,6 +29,11 @@
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Contributors: 
+ *
+ * Arnaldo Pereira <arnaldo@sangoma.com>
+ *
  */
 
 #ifdef __linux__
@@ -56,26 +61,24 @@ typedef enum {
 	FTDM_R2_RUNNING = (1 << 0),
 } ftdm_r2_flag_t;
 
-typedef enum {
-	FTDM_R2_PROCESSING = (1 << 0),
-	FTDM_R2_WAITING_ACK = (1 << 1),
-} ftdm_r2_call_flag_t;
-
-/* private call information stored in ftdmchan->call_data void* ptr */
+/* private call information stored in ftdmchan->call_data void* ptr,
+ * remember that each time you add a new member to this structure
+ * most likely you want to clear it in ft_r2_clean_call function
+ * */
 #define R2CALL(ftdmchan) ((ftdm_r2_call_t*)((ftdmchan)->call_data))
 typedef struct ftdm_r2_call_t {
 	openr2_chan_t *r2chan;
-	ftdm_r2_call_flag_t flags;
 	int accepted:1;
 	int answer_pending:1;
-	int state_ack_pending:1;
 	int disconnect_rcvd:1;
-	int ftdm_started:1;
+	int ftdm_call_started:1;
+	int protocol_error:1;
 	ftdm_channel_state_t chanstate;
 	ftdm_size_t dnis_index;
 	ftdm_size_t ani_index;
+	char logname[255];
 	char name[10];
-	unsigned long txdrops;
+	ftdm_timer_id_t protocol_error_recovery_timer;
 } ftdm_r2_call_t;
 
 /* this is just used as place holder in the stack when configuring the span to avoid using bunch of locals */
@@ -94,13 +97,13 @@ typedef struct ft_r2_conf_s {
 	int32_t max_dnis;
 	int32_t mfback_timeout; 
 	int32_t metering_pulse_timeout;
+	ftdm_size_t mf_dump_size;
 
 	/* booleans */
 	int immediate_accept;
 	int skip_category;
 	int get_ani_first;
 	int call_files;
-	int mf_files;
 	int double_answer;
 	int charge_calls;
 	int forced_release;
@@ -123,12 +126,26 @@ typedef struct ftdm_r2_data_s {
 	int forced_release:1;
 	/* whether accept the call when offered, or wait until the user decides to accept */
 	int accept_on_offer:1;
+	/* Size of multi-frequency (or any media) dumps used during protocol errors */
+	ftdm_size_t mf_dump_size;
 	/* max time spent in ms doing real work in a single loop */
-	int jobmax;
-	/* total working loops */
-	unsigned long loops;
+	int32_t jobmax;
+	/* Total number of loops performed so far */
+	uint64_t total_loops;
+	/* number of loops per 10ms increment from 0-9ms, 10-19ms .. 100ms and above */
+	uint64_t loops[11];
+	/* Total number of sleeps performed so far */
+	uint64_t total_sleeps;
+	/* number of sleeps per 10ms increment from 0-9ms, 10-19ms .. 100ms and above */
+	uint64_t sleeps[11];
+	/* max time spent in ms sleeping in a single loop */
+	int32_t sleepmax;
 	/* LWP */
-	unsigned long monitor_thread_id;
+	uint32_t monitor_thread_id;
+	/* Logging directory */
+	char logdir[512];
+	/* scheduling context */
+	ftdm_sched_t *sched;
 } ftdm_r2_data_t;
 
 /* one element per span will be stored in g_mod_data_hash global var to keep track of them
@@ -136,6 +153,7 @@ typedef struct ftdm_r2_data_s {
 typedef struct ftdm_r2_span_pvt_s {
 	openr2_context_t *r2context; /* r2 context allocated for this span */
 	ftdm_hash_t *r2calls; /* hash table of allocated call data per channel for this span */
+	ftdm_sched_t *sched; /* schedule for the span */
 } ftdm_r2_span_pvt_t;
 
 /* span monitor thread */
@@ -151,7 +169,14 @@ static ftdm_hash_t *g_mod_data_hash;
 static ftdm_io_interface_t g_ftdm_r2_interface;
 
 static int ftdm_r2_state_advance(ftdm_channel_t *ftdmchan);
+static void ftdm_r2_state_advance_all(ftdm_channel_t *ftdmchan);
 
+/* whether R2 call accept process is pending */
+#define IS_ACCEPTING_PENDING(ftdmchan) \
+		( (!ftdm_test_flag((ftdmchan), FTDM_CHANNEL_OUTBOUND)) && !R2CALL((ftdmchan))->accepted && \
+				((ftdmchan)->state == FTDM_CHANNEL_STATE_PROGRESS || \
+				 (ftdmchan)->state == FTDM_CHANNEL_STATE_PROGRESS_MEDIA || \
+				 (ftdmchan)->state == FTDM_CHANNEL_STATE_UP) )
 
 /* functions not available on windows */
 #ifdef WIN32
@@ -220,6 +245,23 @@ static char *strsep(char **stringp, const char *delim)
 }
 #endif /* WIN32 */
 
+static void ftdm_r2_set_chan_sig_status(ftdm_channel_t *ftdmchan, ftdm_signaling_status_t status)
+{
+	ftdm_sigmsg_t sig;
+	ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Signalling link status changed to %s\n", ftdm_signaling_status2str(status));
+
+	memset(&sig, 0, sizeof(sig));
+	sig.chan_id = ftdmchan->chan_id;
+	sig.span_id = ftdmchan->span_id;
+	sig.channel = ftdmchan;
+	sig.event_id = FTDM_SIGEVENT_SIGSTATUS_CHANGED;
+	sig.sigstatus = status;
+	if (ftdm_span_send_signal(ftdmchan->span, &sig) != FTDM_SUCCESS) {
+		ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Failed to change channel status to %s\n", ftdm_signaling_status2str(status));
+	}
+	return;
+}
+
 static ftdm_call_cause_t ftdm_r2_cause_to_ftdm_cause(ftdm_channel_t *fchan, openr2_call_disconnect_cause_t cause)
 {
 	switch (cause) {
@@ -279,6 +321,7 @@ static openr2_call_disconnect_cause_t ftdm_r2_ftdm_cause_to_openr2_cause(ftdm_ch
 
 	case FTDM_CAUSE_NETWORK_OUT_OF_ORDER:
 	case FTDM_CAUSE_SERVICE_UNAVAILABLE:
+	case FTDM_CAUSE_PROTOCOL_ERROR:
 		return OR2_CAUSE_OUT_OF_ORDER;
 
 	case FTDM_CAUSE_NO_ANSWER:
@@ -296,9 +339,21 @@ static openr2_call_disconnect_cause_t ftdm_r2_ftdm_cause_to_openr2_cause(ftdm_ch
 
 static void ft_r2_clean_call(ftdm_r2_call_t *call)
 {
-    openr2_chan_t *r2chan = call->r2chan;
-    memset(call, 0, sizeof(*call));
-    call->r2chan = r2chan;
+	openr2_chan_t *r2chan = call->r2chan;
+
+	/* Do not memset call structure, that clears values we do not want to clear, 
+	 * like the log name set in on_call_log_created() */
+	call->r2chan = r2chan;
+	call->accepted = 0;
+	call->answer_pending = 0;
+	call->disconnect_rcvd = 0;
+	call->ftdm_call_started = 0;
+	call->protocol_error = 0;
+	call->chanstate = FTDM_CHANNEL_STATE_DOWN;
+	call->dnis_index = 0;
+	call->ani_index = 0;
+	call->name[0] = 0;
+	call->protocol_error_recovery_timer = 0;
 }
 
 static void ft_r2_accept_call(ftdm_channel_t *ftdmchan)
@@ -338,30 +393,32 @@ static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(r2_outgoing_call)
 	}
 
 	ft_r2_clean_call(ftdmchan->call_data);
-	R2CALL(ftdmchan)->ftdm_started = 1;
-	R2CALL(ftdmchan)->chanstate = FTDM_CHANNEL_STATE_DOWN;
-    ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_DIALING);
+
+	/* start io dump */
+	if (r2data->mf_dump_size) {
+		ftdm_channel_command(ftdmchan, FTDM_COMMAND_ENABLE_INPUT_DUMP, &r2data->mf_dump_size);
+		ftdm_channel_command(ftdmchan, FTDM_COMMAND_ENABLE_OUTPUT_DUMP, &r2data->mf_dump_size);
+	}
 
 	callstatus = openr2_chan_make_call(R2CALL(ftdmchan)->r2chan, 
 			ftdmchan->caller_data.cid_num.digits, 
 			ftdmchan->caller_data.dnis.digits, 
-			OR2_CALLING_PARTY_CATEGORY_NATIONAL_SUBSCRIBER);
+			r2data->category);
 
-    if (callstatus) {
-        ftdm_log_chan_msg(ftdmchan, FTDM_LOG_CRIT, "Failed to make call in R2 channel, openr2_chan_make_call failed\n");
-        return FTDM_FAIL;
-    }
-
-	if (ftdmchan->state !=  FTDM_CHANNEL_STATE_DIALING) {
-		ftdm_log_chan(ftdmchan, FTDM_LOG_WARNING, "Collision after call attempt, try another channel, new state = %s\n",
-				ftdm_channel_state2str(ftdmchan->state));
-		ftdm_clear_flag(R2CALL(ftdmchan), FTDM_R2_WAITING_ACK);
-		return FTDM_BREAK;
+	if (callstatus) {
+		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_CRIT, "Failed to make call in R2 channel, openr2_chan_make_call failed\n");
+		return FTDM_FAIL;
 	}
 
-    /* non-threaded implementation, we're done here */
-    ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "R2 call placed in non-threaded mode\n");
-    return FTDM_SUCCESS;
+	R2CALL(ftdmchan)->ftdm_call_started = 1;
+	R2CALL(ftdmchan)->chanstate = FTDM_CHANNEL_STATE_DOWN;
+	ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_DIALING);
+
+	ftdm_channel_set_feature(ftdmchan, FTDM_CHANNEL_FEATURE_IO_STATS);
+	ftdm_channel_command(ftdmchan, FTDM_COMMAND_FLUSH_TX_BUFFERS, NULL);
+	ftdm_channel_command(ftdmchan, FTDM_COMMAND_FLUSH_RX_BUFFERS, NULL);
+
+	return FTDM_SUCCESS;
 }
 
 static ftdm_status_t ftdm_r2_start(ftdm_span_t *span)
@@ -381,44 +438,50 @@ static ftdm_status_t ftdm_r2_stop(ftdm_span_t *span)
 	return FTDM_SUCCESS;
 }
 
-static ftdm_status_t ftdm_r2_sig_read(ftdm_channel_t *ftdmchan, void *data, ftdm_size_t size)
+static FIO_CHANNEL_GET_SIG_STATUS_FUNCTION(ftdm_r2_get_channel_sig_status)
 {
-	openr2_chan_t *r2chan = R2CALL(ftdmchan)->r2chan;
-	if (!openr2_chan_get_read_enabled(r2chan)) {
-		ftdm_mutex_lock(ftdmchan->mutex);
-		//openr2_chan_process_input(r2chan, data, size);
-		ftdm_mutex_unlock(ftdmchan->mutex);
+	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_SIG_UP)) {
+		*status = FTDM_SIG_STATE_UP;
+	} else {
+		*status = FTDM_SIG_STATE_DOWN;
 	}
+
 	return FTDM_SUCCESS;
 }
 
 /* always called from the monitor thread */
 static void ftdm_r2_on_call_init(openr2_chan_t *r2chan)
 {
-	//ftdm_status_t status;
 	ftdm_r2_call_t *r2call;
 	ftdm_channel_t *ftdmchan = openr2_chan_get_client_data(r2chan);
-	//ftdm_r2_data_t *r2data = ftdmchan->span->signal_data;
+	ftdm_r2_data_t *r2data = ftdmchan->span->signal_data;
 
 	ftdm_log_chan_msg(ftdmchan, FTDM_LOG_NOTICE, "Received request to start call\n");
 
-	ftdm_mutex_lock(ftdmchan->mutex);
+	if (ftdmchan->state == FTDM_CHANNEL_STATE_HANGUP) {
+		r2call = R2CALL(ftdmchan);
+		if (r2call->protocol_error) {
+			/* we had a protocol error and we were giving some recovery time, cancel the recovery timer now
+			 * that is obvious that the other side recovered */
+			ftdm_sched_cancel_timer(r2data->sched, r2call->protocol_error_recovery_timer);
+			ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Cancelled protocol error recovery timer\n");
+			ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
+			ftdm_r2_state_advance_all(ftdmchan);
+		}
+	}
 
 	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_INUSE)) {
 		ftdm_log_chan(ftdmchan, FTDM_LOG_CRIT, "Cannot start call when channel is in use (state = %s)\n", ftdm_channel_state2str(ftdmchan->state));
-		ftdm_mutex_unlock(ftdmchan->mutex);
 		return;
 	}
 
 	if (ftdmchan->state != FTDM_CHANNEL_STATE_DOWN) {
 		ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Cannot handle request to start call in state %s\n", ftdm_channel_state2str(ftdmchan->state));
-		ftdm_mutex_unlock(ftdmchan->mutex);
 		return;
 	}
 
 	if (ftdm_channel_open_chan(ftdmchan) != FTDM_SUCCESS) {
 		ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Failed to open channel during incoming call! [%s]\n", ftdmchan->last_error);
-		ftdm_mutex_unlock(ftdmchan->mutex);
 		return;
 	}
 
@@ -428,46 +491,123 @@ static void ftdm_r2_on_call_init(openr2_chan_t *r2chan)
 	memset(ftdmchan->caller_data.dnis.digits, 0, sizeof(ftdmchan->caller_data.collected));
 	memset(ftdmchan->caller_data.ani.digits, 0, sizeof(ftdmchan->caller_data.collected));
 
-	/* clean the call data structure but keep the R2 processing flag on! */
 	ft_r2_clean_call(ftdmchan->call_data);
 	r2call = R2CALL(ftdmchan);
-	ftdm_set_flag(r2call, FTDM_R2_PROCESSING);
 
-	if (ftdmchan->state == FTDM_CHANNEL_STATE_DOWN) {
-		R2CALL(ftdmchan)->chanstate = FTDM_CHANNEL_STATE_DOWN;
-	} else {
-		R2CALL(ftdmchan)->chanstate = FTDM_CHANNEL_STATE_DIALING;
+	/* start io dump */
+	if (r2data->mf_dump_size) {
+		ftdm_channel_command(ftdmchan, FTDM_COMMAND_ENABLE_INPUT_DUMP, &r2data->mf_dump_size);
+		ftdm_channel_command(ftdmchan, FTDM_COMMAND_ENABLE_OUTPUT_DUMP, &r2data->mf_dump_size);
 	}
 
+	R2CALL(ftdmchan)->chanstate = FTDM_CHANNEL_STATE_DOWN;
 	ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_COLLECT);
-	ftdm_mutex_unlock(ftdmchan->mutex);
+	ftdm_channel_set_feature(ftdmchan, FTDM_CHANNEL_FEATURE_IO_STATS);
+	ftdm_channel_command(ftdmchan, FTDM_COMMAND_FLUSH_TX_BUFFERS, NULL);
+	ftdm_channel_command(ftdmchan, FTDM_COMMAND_FLUSH_RX_BUFFERS, NULL);
 }
 
+static void dump_mf(openr2_chan_t *r2chan);
 /* only called for incoming calls when the ANI, DNIS etc is complete and the user has to decide either to accept or reject the call */
 static void ftdm_r2_on_call_offered(openr2_chan_t *r2chan, const char *ani, const char *dnis, openr2_calling_party_category_t category)
 {
 	ftdm_channel_t *ftdmchan = openr2_chan_get_client_data(r2chan);
+	ftdm_r2_data_t *r2data = ftdmchan->span->signal_data;
 
-	ftdm_log_chan(ftdmchan, FTDM_LOG_NOTICE, "Call offered with ANI = %s, DNIS = %s, Priority = (%d)\n", ani, dnis, category);
-	ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_RING);
+	ftdm_log_chan(ftdmchan, FTDM_LOG_NOTICE, "Call offered with ANI = %s, DNIS = %s, Category = (%d)\n", ani, dnis, category);
+
+	/* nothing went wrong during call setup, MF has ended, we can and must disable the MF dump */
+	if (r2data->mf_dump_size) {
+		ftdm_channel_command(ftdmchan, FTDM_COMMAND_DISABLE_INPUT_DUMP, NULL);
+		ftdm_channel_command(ftdmchan, FTDM_COMMAND_DISABLE_OUTPUT_DUMP, NULL);
+	}
+
+	/* check if this is a collect call and if we should accept it */
+	if (!r2data->allow_collect_calls && category == OR2_CALLING_PARTY_CATEGORY_COLLECT_CALL) {
+		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_NOTICE, "Rejecting collect call\n");
+		openr2_chan_disconnect_call(r2chan, OR2_CAUSE_COLLECT_CALL_REJECTED);
+	} else {
+		ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RING);
+	}
+}
+
+/*
+ * Accepting a call in R2 is a lengthy process due to MF tones,
+ * when the user sends PROGRESS indication (implicitly moving the
+ * ftdm channel to PROGRESS state) the R2 processing loop
+ * does not clear FTDM_CHANNEL_STATE_CHANGE immediately as it does
+ * for all the other states, instead has to wait for on_call_accepted
+ * callback from openr2, which means the MF has ended and the progress
+ * indication is done, in order to clear the flag. However, if
+ * a protocol error or call disconnection (which is indicated using CAS bits)
+ * occurrs while accepting, we must clear the pending flag, this function
+ * takes care of that
+ * */
+static void clear_accept_pending(ftdm_channel_t *fchan)
+{
+	if (IS_ACCEPTING_PENDING(fchan)) {
+		ftdm_clear_flag(fchan, FTDM_CHANNEL_STATE_CHANGE);
+		ftdm_channel_complete_state(fchan);
+	} else if (ftdm_test_flag(fchan, FTDM_CHANNEL_STATE_CHANGE)) {
+		ftdm_log_chan(fchan, FTDM_LOG_CRIT, "State change flag set in state %s, last state = %s\n", 
+				ftdm_channel_state2str(fchan->state), ftdm_channel_state2str(fchan->last_state));
+		ftdm_clear_flag(fchan, FTDM_CHANNEL_STATE_CHANGE);
+		ftdm_channel_complete_state(fchan);
+	}
+}
+
+static void dump_mf(openr2_chan_t *r2chan)
+{
+	char dfile[512];
+	FILE *f = NULL;
+	ftdm_channel_t *ftdmchan = openr2_chan_get_client_data(r2chan);
+	ftdm_r2_data_t *r2data = ftdmchan->span->signal_data;
+	if (r2data->mf_dump_size) {
+		char *logname = R2CALL(ftdmchan)->logname;
+		
+		ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Dumping IO output in prefix %s\n", logname);
+		snprintf(dfile, sizeof(dfile), logname ? "%s.s%dc%d.input.alaw" : "%s/s%dc%d.input.alaw", 
+				logname ? logname : r2data->logdir, ftdmchan->span_id, ftdmchan->chan_id);
+		f = fopen(dfile, "w");
+		ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Dumping IO input in file %s\n", dfile);
+		ftdm_channel_command(ftdmchan, FTDM_COMMAND_DUMP_INPUT, f);
+		fclose(f);
+
+		snprintf(dfile, sizeof(dfile), logname ? "%s.s%dc%d.output.alaw" : "%s/s%dc%d.output.alaw", 
+				logname ? logname : r2data->logdir, ftdmchan->span_id, ftdmchan->chan_id);
+		f = fopen(dfile, "w");
+		ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Dumping IO output in file %s\n", dfile);
+		ftdm_channel_command(ftdmchan, FTDM_COMMAND_DUMP_OUTPUT, f);
+		fclose(f);
+	}
 }
 
 static void ftdm_r2_on_call_accepted(openr2_chan_t *r2chan, openr2_call_mode_t mode)
 {
 	ftdm_channel_t *ftdmchan = openr2_chan_get_client_data(r2chan);
 	ftdm_log_chan_msg(ftdmchan, FTDM_LOG_NOTICE, "Call accepted\n");
+
+	clear_accept_pending(ftdmchan);
+
 	/* at this point the MF signaling has ended and there is no point on keep reading */
 	openr2_chan_disable_read(r2chan);
+
+	/* at this point we are no longer responsible for reading and writing, 
+	 * we are not interested in the stats anymore */
+	ftdm_channel_clear_feature(ftdmchan, FTDM_CHANNEL_FEATURE_IO_STATS);
+
+	
 	R2CALL(ftdmchan)->accepted = 1;
+
 	if (OR2_DIR_BACKWARD == openr2_chan_get_direction(r2chan)) {
-		R2CALL(ftdmchan)->state_ack_pending = 1;
 		if (R2CALL(ftdmchan)->answer_pending) {
 			ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Answer was pending, answering now.\n");
 			ft_r2_answer_call(ftdmchan);
+			R2CALL(ftdmchan)->answer_pending = 0;
 			return;
 		}
 	} else {
-		ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_PROGRESS_MEDIA);
+		ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_PROGRESS_MEDIA);
 	}
 }
 
@@ -477,47 +617,30 @@ static void ftdm_r2_on_call_answered(openr2_chan_t *r2chan)
 	ftdm_log_chan_msg(ftdmchan, FTDM_LOG_NOTICE, "Call answered\n");
 	/* notify the upper layer of progress in the outbound call */
 	if (OR2_DIR_FORWARD == openr2_chan_get_direction(r2chan)) {
-		ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_UP);
+		ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_UP);
 	}
 }
 
 /* may be called in the signaling or media thread depending on whether the hangup is product of MF or CAS signaling */
 static void ftdm_r2_on_call_disconnect(openr2_chan_t *r2chan, openr2_call_disconnect_cause_t cause)
 {
-	ftdm_sigmsg_t sigev;
-	ftdm_r2_data_t *r2data;
 	ftdm_channel_t *ftdmchan = openr2_chan_get_client_data(r2chan);
 
 	ftdm_log_chan_msg(ftdmchan, FTDM_LOG_NOTICE, "Call disconnected\n");
 
-	ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Got openr2 disconnection, clearing call\n");
+	clear_accept_pending(ftdmchan);
 
 	R2CALL(ftdmchan)->disconnect_rcvd = 1;
 
 	if (ftdmchan->state == FTDM_CHANNEL_STATE_HANGUP) {
 		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Call had been disconnected already by the user\n");
-		/* just ack the hangup to go down */
+		/* just ack the hangup to trigger the on_call_end callback and go down */
 		openr2_chan_disconnect_call(r2chan, OR2_CAUSE_NORMAL_CLEARING);
 		return;
 	}
 
-	/* if the call has not been started yet we must go to HANGUP right here */ 
-	if (!R2CALL(ftdmchan)->ftdm_started) {
-		ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
-		return;
-	}
-
 	ftdmchan->caller_data.hangup_cause  = ftdm_r2_cause_to_ftdm_cause(ftdmchan, cause);
-
-	/* notify the user of the call terminating */
-	memset(&sigev, 0, sizeof(sigev));
-	sigev.chan_id = ftdmchan->chan_id;
-	sigev.span_id = ftdmchan->span_id;
-	sigev.channel = ftdmchan;
-	sigev.event_id = FTDM_SIGEVENT_STOP;
-	r2data = ftdmchan->span->signal_data;
-
-	ftdm_span_send_signal(ftdmchan->span, &sigev);
+	ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING);
 }
 
 static void ftdm_r2_on_call_end(openr2_chan_t *r2chan)
@@ -526,10 +649,10 @@ static void ftdm_r2_on_call_end(openr2_chan_t *r2chan)
 	ftdm_log_chan_msg(ftdmchan, FTDM_LOG_NOTICE, "Call finished\n");
 
 	/* the call is done as far as the stack is concerned, lets move to down here */
-	ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
+	ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
 
 	/* in some circumstances openr2 can call on_call_init right after this, so let's advance the state right here */
-	ftdm_r2_state_advance(ftdmchan);
+	ftdm_r2_state_advance_all(ftdmchan);
 }
 
 static void ftdm_r2_on_call_read(openr2_chan_t *r2chan, const unsigned char *buf, int buflen)
@@ -551,59 +674,59 @@ static void ftdm_r2_on_os_error(openr2_chan_t *r2chan, int errorcode)
 	ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "OS error: %s\n", strerror(errorcode));
 }
 
+static void ftdm_r2_recover_from_protocol_error(void *data)
+{
+	openr2_chan_t *r2chan = data;
+	ftdm_channel_t *ftdmchan = openr2_chan_get_client_data(r2chan);
+	ftdm_channel_lock(ftdmchan);
+	if (ftdmchan->state != FTDM_CHANNEL_STATE_HANGUP) {
+		ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Recovering from protocol error but state is %s!\n", ftdm_channel_state2str(ftdmchan->state));
+		goto done;
+	}
+	ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
+	ftdm_r2_state_advance_all(ftdmchan);
+done:
+	ftdm_channel_unlock(ftdmchan);
+}
+
 static void ftdm_r2_on_protocol_error(openr2_chan_t *r2chan, openr2_protocol_error_t reason)
 {
-	ftdm_sigmsg_t sigev;
-	ftdm_r2_data_t *r2data;
 	ftdm_channel_t *ftdmchan = openr2_chan_get_client_data(r2chan);
 
-	ftdm_mutex_lock(ftdmchan->mutex);
-
 	if (ftdmchan->state == FTDM_CHANNEL_STATE_DOWN) {
 		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_ERROR, "Got protocol error when we're already down!\n");
-		ftdm_mutex_unlock(ftdmchan->mutex);
+		return;
 	}
 
-	ftdm_log_chan_msg(ftdmchan, FTDM_LOG_ERROR, "Protocol error\n");
+	dump_mf(r2chan);
+
+	clear_accept_pending(ftdmchan);
 
 	R2CALL(ftdmchan)->disconnect_rcvd = 1;
+	R2CALL(ftdmchan)->protocol_error = 1;
 
-	if (!R2CALL(ftdmchan)->ftdm_started) {
-		ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
-		ftdm_mutex_unlock(ftdmchan->mutex);
+	if (ftdmchan->state == FTDM_CHANNEL_STATE_HANGUP) {
+		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_ERROR, "The user already hung up, finishing call in protocol error\n");
+		ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
 		return;
 	}
 
 	ftdmchan->caller_data.hangup_cause  = FTDM_CAUSE_PROTOCOL_ERROR; 
-
-	/* FIXME: go to terminating and notify the user from the terminating handler instead of notifying here */
-	memset(&sigev, 0, sizeof(sigev));
-	sigev.chan_id = ftdmchan->chan_id;
-	sigev.span_id = ftdmchan->span_id;
-	sigev.channel = ftdmchan;
-	sigev.event_id = FTDM_SIGEVENT_STOP;
-	r2data = ftdmchan->span->signal_data;
-
-	ftdm_span_send_signal(ftdmchan->span, &sigev);
-
-	ftdm_mutex_unlock(ftdmchan->mutex);
+	ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING);
 }
 
 static void ftdm_r2_on_line_blocked(openr2_chan_t *r2chan)
 {
 	ftdm_channel_t *ftdmchan = openr2_chan_get_client_data(r2chan);
 	ftdm_log_chan(ftdmchan, FTDM_LOG_NOTICE, "Far end blocked in state %s\n", ftdm_channel_state2str(ftdmchan->state));
-	ftdm_set_flag(ftdmchan, FTDM_CHANNEL_SUSPENDED);
+	ftdm_r2_set_chan_sig_status(ftdmchan, FTDM_SIG_STATE_SUSPENDED);
 }
 
 static void ftdm_r2_on_line_idle(openr2_chan_t *r2chan)
 {
 	ftdm_channel_t *ftdmchan = openr2_chan_get_client_data(r2chan);
 	ftdm_log_chan(ftdmchan, FTDM_LOG_NOTICE, "Far end unblocked in state %s\n", ftdm_channel_state2str(ftdmchan->state));
-	ftdm_clear_flag(ftdmchan, FTDM_CHANNEL_SUSPENDED);
-
-	 /* XXX when should we set/unset this flag? XXX */
-	ftdm_set_flag(ftdmchan, FTDM_CHANNEL_SIG_UP);
+	ftdm_r2_set_chan_sig_status(ftdmchan, FTDM_SIG_STATE_UP);
 }
 
 static void ftdm_r2_write_log(openr2_log_level_t level, const char *file, const char *function, int line, const char *message)
@@ -648,14 +771,13 @@ static void ftdm_r2_on_chan_log(openr2_chan_t *r2chan, const char *file, const c
 	openr2_log_level_t level, const char *fmt, va_list ap)
 {
 	ftdm_channel_t *ftdmchan = openr2_chan_get_client_data(r2chan);
-#define CHAN_TAG "Chan "
-	char logmsg[512];
-	char completemsg[sizeof(logmsg) + sizeof(CHAN_TAG) - 1];
+	char logmsg[1024];
+	char completemsg[sizeof(logmsg)];
 	vsnprintf(logmsg, sizeof(logmsg), fmt, ap);
-	snprintf(completemsg, sizeof(completemsg), CHAN_TAG "%d:%d [%s] %s", 
-			ftdmchan->span_id, ftdmchan->chan_id, ftdm_channel_state2str(ftdmchan->state), logmsg);
+	snprintf(completemsg, sizeof(completemsg), "[s%dc%d] [%d:%d] [%s] %s", 
+			ftdmchan->span_id, ftdmchan->chan_id, ftdmchan->physical_span_id, ftdmchan->physical_chan_id,
+			ftdm_channel_state2str(ftdmchan->state), logmsg);
 	ftdm_r2_write_log(level, file, function, line, completemsg);
-#undef CHAN_TAG
 }
 
 static int ftdm_r2_on_dnis_digit_received(openr2_chan_t *r2chan, char digit)
@@ -713,6 +835,16 @@ static void ftdm_r2_on_ani_digit_received(openr2_chan_t *r2chan, char digit)
 	R2CALL(ftdmchan)->ani_index = collected_len;
 }
 
+static void ftdm_r2_on_billing_pulse(openr2_chan_t *r2chan) {}
+
+static void ftdm_r2_on_call_log_created(openr2_chan_t *r2chan, const char *logname)
+{
+	ftdm_channel_t *ftdmchan = openr2_chan_get_client_data(r2chan);
+	ftdm_r2_call_t *r2call = R2CALL(ftdmchan);
+	/* this is used when dumping I/O for debugging */
+	snprintf(r2call->logname, sizeof(r2call->logname), "%s", logname);
+}
+
 static openr2_event_interface_t ftdm_r2_event_iface = {
 	/* .on_call_init */ ftdm_r2_on_call_init,
 	/* .on_call_offered */ ftdm_r2_on_call_offered,
@@ -733,7 +865,8 @@ static openr2_event_interface_t ftdm_r2_event_iface = {
 	/* .on_ani_digit_received */ ftdm_r2_on_ani_digit_received,
 
 	/* so far we do nothing with billing pulses */
-	/* .on_billing_pulse_received */ NULL,
+	/* .on_billing_pulse_received */ ftdm_r2_on_billing_pulse,
+	/* .on_call_log_created */ ftdm_r2_on_call_log_created,
 };
 
 static int ftdm_r2_io_set_cas(openr2_chan_t *r2chan, int cas)
@@ -774,7 +907,7 @@ static int ftdm_r2_io_write(openr2_chan_t *r2chan, const void *buf, int size)
 	if (FTDM_FAIL == status) {
 		return -1;
 	}
-	return outsize;
+	return (int)outsize;
 }
 
 static int ftdm_r2_io_read(openr2_chan_t *r2chan, const void *buf, int size)
@@ -785,7 +918,7 @@ static int ftdm_r2_io_read(openr2_chan_t *r2chan, const void *buf, int size)
 	if (FTDM_FAIL == status) {
 		return -1;
 	}
-	return outsize;
+	return (int)outsize;
 }
 
 static int ftdm_r2_io_wait(openr2_chan_t *r2chan, int *flags, int block)
@@ -794,7 +927,7 @@ static int ftdm_r2_io_wait(openr2_chan_t *r2chan, int *flags, int block)
 	int32_t timeout;
 	ftdm_wait_flag_t ftdmflags = 0;
 
-	ftdm_channel_t *ftdm_chan = openr2_chan_get_fd(r2chan);
+	ftdm_channel_t *fchan = openr2_chan_get_fd(r2chan);
 	timeout = block ? -1 : 0;
 
 	if (*flags & OR2_IO_READ) {
@@ -807,9 +940,10 @@ static int ftdm_r2_io_wait(openr2_chan_t *r2chan, int *flags, int block)
 		ftdmflags |= FTDM_EVENTS;
 	}
 	
-	status = ftdm_channel_wait(ftdm_chan, &ftdmflags, timeout);
+	status = ftdm_channel_wait(fchan, &ftdmflags, timeout);
 
 	if (FTDM_SUCCESS != status && FTDM_TIMEOUT != status) {
+		ftdm_log_chan_msg(fchan, FTDM_LOG_ERROR, "Failed to wait for events on channel\n");
 		return -1;
 	}
 
@@ -853,8 +987,36 @@ static int ftdm_r2_io_setup(openr2_chan_t *r2chan)
 
 static int ftdm_r2_io_get_oob_event(openr2_chan_t *r2chan, openr2_oob_event_t *event)
 {
-	*event = 0;
-	ftdm_log(FTDM_LOG_ERROR, "I should not be called (I/O get oob event)!!\n");
+	ftdm_status_t status;
+	ftdm_event_t *fevent = NULL;
+	ftdm_channel_t *ftdmchan = openr2_chan_get_fd(r2chan);
+
+	*event = OR2_OOB_EVENT_NONE;
+
+	status = ftdm_channel_read_event(ftdmchan, &fevent);
+
+	if (status != FTDM_SUCCESS) {
+		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_ERROR, "failed to retrieve freetdm event!\n");
+		return -1;
+	}
+
+	switch (fevent->enum_id) {
+	case FTDM_OOB_CAS_BITS_CHANGE:
+		{
+			*event = OR2_OOB_EVENT_CAS_CHANGE;
+		}
+		break;
+	case FTDM_OOB_ALARM_TRAP:
+		{
+			*event = OR2_OOB_EVENT_ALARM_ON;
+		}
+		break;
+	case FTDM_OOB_ALARM_CLEAR:
+		{
+			*event = OR2_OOB_EVENT_ALARM_OFF;
+		}
+		break;
+	}
 	return 0;
 }
 
@@ -871,54 +1033,182 @@ static openr2_io_interface_t ftdm_r2_io_iface = {
 	/* .get_oob_event */ ftdm_r2_io_get_oob_event /* never called */
 };
 
-static FIO_SIG_CONFIGURE_FUNCTION(ftdm_r2_configure_span)
-	//ftdm_status_t (ftdm_span_t *span, fio_signal_cb_t sig_cb, va_list ap)
+/* resolve a loglevel string, such as "debug,notice,warning",  to an openr2 log level integer */
+static openr2_log_level_t ftdm_r2_loglevel_from_string(const char *level)
 {
-	int i = 0;
+	openr2_log_level_t tmplevel;
+	openr2_log_level_t newlevel = 0;
+	char *clevel = NULL;
+	char *logval = NULL;
+
+	logval = ftdm_malloc(strlen(level)+1); /* alloca man page scared me, so better to use good ol' malloc  */
+	if (!logval) {
+		ftdm_log(FTDM_LOG_WARNING, "Ignoring R2 logging parameter: '%s', failed to alloc memory\n", level);
+		return newlevel;
+	}
+	strcpy(logval, level);
+	while (logval) {
+		clevel = strsep(&logval, ",");
+		if (-1 == (tmplevel = openr2_log_get_level(clevel))) {
+			ftdm_log(FTDM_LOG_WARNING, "Ignoring invalid R2 logging level: '%s'\n", clevel);
+			continue;
+		}
+		newlevel |= tmplevel;
+	}
+	ftdm_safe_free(logval);
+	return newlevel;
+}
+
+static ftdm_state_map_t r2_state_map = {
+	{
+		{
+			ZSD_INBOUND,
+			ZSM_UNACCEPTABLE,
+			{FTDM_CHANNEL_STATE_DOWN, FTDM_END},
+			{FTDM_CHANNEL_STATE_COLLECT, FTDM_END}
+		},
+		{
+			ZSD_INBOUND,
+			ZSM_UNACCEPTABLE,
+			{FTDM_CHANNEL_STATE_COLLECT, FTDM_END},
+			{FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END}
+		},
+		{
+			ZSD_INBOUND,
+			ZSM_UNACCEPTABLE,
+			{FTDM_CHANNEL_STATE_RING, FTDM_END},
+			{FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_END}
+		},
+		{
+			ZSD_INBOUND,
+			ZSM_UNACCEPTABLE,
+			{FTDM_CHANNEL_STATE_HANGUP, FTDM_END},
+			{FTDM_CHANNEL_STATE_DOWN, FTDM_END},
+		},
+		{
+			ZSD_INBOUND,
+			ZSM_UNACCEPTABLE,
+			{FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
+			{FTDM_CHANNEL_STATE_HANGUP, FTDM_END},
+		},
+		{
+			ZSD_INBOUND,
+			ZSM_UNACCEPTABLE,
+			{FTDM_CHANNEL_STATE_PROGRESS, FTDM_END},
+			{FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_END},
+		},
+		{
+			ZSD_INBOUND,
+			ZSM_UNACCEPTABLE,
+			{FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END},
+			{FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_UP, FTDM_END},
+		},
+		{
+			ZSD_INBOUND,
+			ZSM_UNACCEPTABLE,
+			{FTDM_CHANNEL_STATE_UP, FTDM_END},
+			{FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
+		},
+		
+		/* Outbound states */
+		
+		{
+			ZSD_OUTBOUND,
+			ZSM_UNACCEPTABLE,
+			{FTDM_CHANNEL_STATE_DOWN, FTDM_END},
+			{FTDM_CHANNEL_STATE_DIALING, FTDM_END}
+		},
+
+		{
+			ZSD_OUTBOUND,
+			ZSM_UNACCEPTABLE,
+			{FTDM_CHANNEL_STATE_DIALING, FTDM_END},
+			{FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END}
+		},
+
+		{
+			ZSD_OUTBOUND,
+			ZSM_UNACCEPTABLE,
+			{FTDM_CHANNEL_STATE_HANGUP, FTDM_END},
+			{FTDM_CHANNEL_STATE_DOWN, FTDM_END}
+		},
+
+		{
+			ZSD_OUTBOUND,
+			ZSM_UNACCEPTABLE,
+			{FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
+			{FTDM_CHANNEL_STATE_HANGUP, FTDM_END}
+		},
+
+		{
+			ZSD_OUTBOUND,
+			ZSM_UNACCEPTABLE,
+			{FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END},
+			{FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_UP, FTDM_END}
+		},
+
+		{
+			ZSD_OUTBOUND,
+			ZSM_UNACCEPTABLE,
+			{FTDM_CHANNEL_STATE_UP, FTDM_END},
+			{FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END}
+		},
+	}
+};
+
+static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_r2_configure_span_signaling)
+{
+	unsigned int i = 0;
 	int conf_failure = 0;
-	char *var = NULL;
-	char *val = NULL;
+	int intval = 0;
+	char schedname[255];
+	const char *var = NULL, *val = NULL;
+	const char *log_level = "notice,warning,error"; /* default loglevel, if none is read from conf */
 	ftdm_r2_data_t *r2data = NULL;
 	ftdm_r2_span_pvt_t *spanpvt = NULL;
 	ftdm_r2_call_t *r2call = NULL;
 	openr2_chan_t *r2chan = NULL;
-	openr2_log_level_t tmplevel;
-	char *clevel = NULL;
-	char *logval = NULL;
+	unsigned paramindex = 0;
 
 	ft_r2_conf_t r2conf = 
 	{
 		/* .variant */ OR2_VAR_ITU,
 		/* .category */ OR2_CALLING_PARTY_CATEGORY_NATIONAL_SUBSCRIBER,
 		/* .loglevel */ OR2_LOG_ERROR | OR2_LOG_WARNING,
-		/* .logdir */ NULL,
+#ifdef WIN32
+		/* .logdir */ (char *)"c:\\", 
+#else
+		/* .logdir */ (char *)"/tmp", 
+#endif
 		/* .advanced_protocol_file */ NULL,
 		/* .max_ani */ 10,
 		/* .max_dnis */ 4,
 		/* .mfback_timeout */ -1,
 		/* .metering_pulse_timeout */ -1,
+		/* .mf_dump_size */ 0,
 		/* .immediate_accept */ -1,
 		/* .skip_category */ -1,
 		/* .get_ani_first */ -1,
 		/* .call_files */ 0,
-		/* .mf_files */ 0,
-		/* .double_answer */ 0,
+		/* .double_answer */ -1,
 		/* .charge_calls */ -1,
 		/* .forced_release */ -1,
 		/* .allow_collect_calls */ -1
 	};
 
-	assert(sig_cb != NULL);
+	ftdm_assert_return(sig_cb != NULL, FTDM_FAIL, "No signaling cb provided\n");
 
 	if (span->signal_type) {
 		snprintf(span->last_error, sizeof(span->last_error), "Span is already configured for signalling.");
 		return FTDM_FAIL;
 	}
 
-	while ((var = va_arg(ap, char *))) {
+	for (; ftdm_parameters[paramindex].var; paramindex++) {
+		var = ftdm_parameters[paramindex].var;
+		val = ftdm_parameters[paramindex].val;
 		ftdm_log(FTDM_LOG_DEBUG, "Reading R2 parameter %s for span %d\n", var, span->span_id);
 		if (!strcasecmp(var, "variant")) {
-			if (!(val = va_arg(ap, char *))) {
+			if (!val) {
 				break;
 			}
 			if (ftdm_strlen_zero_buf(val)) {
@@ -933,7 +1223,7 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_r2_configure_span)
 			}
 			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %d for variant %s\n", span->span_id, val);
 		} else if (!strcasecmp(var, "category")) {
-			if (!(val = va_arg(ap, char *))) {
+			if (!val) {
 				break;
 			}
 			if (ftdm_strlen_zero_buf(val)) {
@@ -948,88 +1238,80 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_r2_configure_span)
 			}
 			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %d with default category %s\n", span->span_id, val);
 		} else if (!strcasecmp(var, "logdir")) {
-			if (!(val = va_arg(ap, char *))) {
+			if (!val) {
 				break;
 			}
 			if (ftdm_strlen_zero_buf(val)) {
 				ftdm_log(FTDM_LOG_NOTICE, "Ignoring empty R2 logdir parameter\n");
 				continue;
 			}
-			r2conf.logdir = val;
+			r2conf.logdir = (char *)val;
 			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %d with logdir %s\n", span->span_id, val);
 		} else if (!strcasecmp(var, "logging")) {
-			if (!(val = va_arg(ap, char *))) {
+			if (!val) {
 				break;
 			}
 			if (ftdm_strlen_zero_buf(val)) {
 				ftdm_log(FTDM_LOG_NOTICE, "Ignoring empty R2 logging parameter\n");
 				continue;
 			}
-			logval = ftdm_malloc(strlen(val)+1); /* alloca man page scared me, so better to use good ol' malloc  */
-			if (!logval) {
-				ftdm_log(FTDM_LOG_WARNING, "Ignoring R2 logging parameter: '%s', failed to alloc memory\n", val);
-				continue;
-			}
-			strcpy(logval, val);
-			while (logval) {
-				clevel = strsep(&logval, ",");
-				if (-1 == (tmplevel = openr2_log_get_level(clevel))) {
-					ftdm_log(FTDM_LOG_WARNING, "Ignoring invalid R2 logging level: '%s'\n", clevel);
-					continue;
-				}
-				r2conf.loglevel |= tmplevel;
-				ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %d with loglevel %s\n", span->span_id, clevel);
-			}
-			ftdm_safe_free(logval);
+			log_level = val;
+			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %s with loglevel %s\n", span->name, val);
 		} else if (!strcasecmp(var, "advanced_protocol_file")) {
-			if (!(val = va_arg(ap, char *))) {
+			if (!val) {
 				break;
 			}
 			if (ftdm_strlen_zero_buf(val)) {
 				ftdm_log(FTDM_LOG_NOTICE, "Ignoring empty R2 advanced_protocol_file parameter\n");
 				continue;
 			}
-			r2conf.advanced_protocol_file = val;
-			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %d with advanced protocol file %s\n", span->span_id, val);
+			r2conf.advanced_protocol_file = (char *)val;
+			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %s with advanced protocol file %s\n", span->name, val);
+		} else if (!strcasecmp(var, "mf_dump_size")) {
+			intval = atoi(val);
+			if (intval < 0) {
+				r2conf.mf_dump_size = FTDM_IO_DUMP_DEFAULT_BUFF_SIZE;
+				ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %s with default mf_dump_size = %d bytes\n", span->name, r2conf.mf_dump_size);
+			} else {
+				r2conf.mf_dump_size = intval;
+				ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %s with mf_dump_size = %d bytes\n", span->name, r2conf.mf_dump_size);
+			}
 		} else if (!strcasecmp(var, "allow_collect_calls")) {
-			r2conf.allow_collect_calls = va_arg(ap, int);
-			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %d with allow collect calls max ani = %d\n", span->span_id, r2conf.allow_collect_calls);
+			r2conf.allow_collect_calls = ftdm_true(val);
+			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %s with allow collect calls max ani = %d\n", span->name, r2conf.allow_collect_calls);
 		} else if (!strcasecmp(var, "double_answer")) {
-			r2conf.double_answer = va_arg(ap, int);
-			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %d with double answer = %d\n", span->span_id, r2conf.double_answer);
+			r2conf.double_answer = ftdm_true(val);
+			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %s with double answer = %d\n", span->name, r2conf.double_answer);
 		} else if (!strcasecmp(var, "immediate_accept")) {
-			r2conf.immediate_accept = va_arg(ap, int);
-			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %d with immediate accept = %d\n", span->span_id, r2conf.immediate_accept);
+			r2conf.immediate_accept = ftdm_true(val);
+			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %s with immediate accept = %d\n", span->name, r2conf.immediate_accept);
 		} else if (!strcasecmp(var, "skip_category")) {
-			r2conf.skip_category = va_arg(ap, int);
-			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %d with skip category = %d\n", span->span_id, r2conf.skip_category);
+			r2conf.skip_category = ftdm_true(val);
+			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %s with skip category = %d\n", span->name, r2conf.skip_category);
 		} else if (!strcasecmp(var, "forced_release")) {
-			r2conf.forced_release = va_arg(ap, int);
-			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %d with forced release = %d\n", span->span_id, r2conf.forced_release);
+			r2conf.forced_release = ftdm_true(val);
+			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %s with forced release = %d\n", span->name, r2conf.forced_release);
 		} else if (!strcasecmp(var, "charge_calls")) {
-			r2conf.charge_calls = va_arg(ap, int);
-			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %d with charge calls = %d\n", span->span_id, r2conf.charge_calls);
+			r2conf.charge_calls = ftdm_true(val);
+			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %s with charge calls = %d\n", span->name, r2conf.charge_calls);
 		} else if (!strcasecmp(var, "get_ani_first")) {
-			r2conf.get_ani_first = va_arg(ap, int);
-			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %d with get ani first = %d\n", span->span_id, r2conf.get_ani_first);
+			r2conf.get_ani_first = ftdm_true(val);
+			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %s with get ani first = %d\n", span->name, r2conf.get_ani_first);
 		} else if (!strcasecmp(var, "call_files")) {
-			r2conf.call_files = va_arg(ap, int);
-			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %d with call files = %d\n", span->span_id, r2conf.call_files);
-		} else if (!strcasecmp(var, "mf_files")) {
-			r2conf.mf_files = va_arg(ap, int);
-			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %d with mf files = %d\n", span->span_id, r2conf.mf_files);
+			r2conf.call_files = ftdm_true(val);
+			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %s with call files = %d\n", span->name, r2conf.call_files);
 		} else if (!strcasecmp(var, "mfback_timeout")) {
-			r2conf.mfback_timeout = va_arg(ap, int);
-			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %d with MF backward timeout = %dms\n", span->span_id, r2conf.mfback_timeout);
+			r2conf.mfback_timeout = atoi(val);
+			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %s with MF backward timeout = %dms\n", span->name, r2conf.mfback_timeout);
 		} else if (!strcasecmp(var, "metering_pulse_timeout")) {
-			r2conf.metering_pulse_timeout = va_arg(ap, int);
-			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %d with metering pulse timeout = %dms\n", span->span_id, r2conf.metering_pulse_timeout);
+			r2conf.metering_pulse_timeout = atoi(val);
+			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %s with metering pulse timeout = %dms\n", span->name, r2conf.metering_pulse_timeout);
 		} else if (!strcasecmp(var, "max_ani")) {
-			r2conf.max_ani = va_arg(ap, int);
-			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %d with max ani = %d\n", span->span_id, r2conf.max_ani);
+			r2conf.max_ani = atoi(val);
+			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %s with max ani = %d\n", span->name, r2conf.max_ani);
 		} else if (!strcasecmp(var, "max_dnis")) {
-			r2conf.max_dnis = va_arg(ap, int);
-			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %d with max dnis = %d\n", span->span_id, r2conf.max_dnis);
+			r2conf.max_dnis = atoi(val);
+			ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %s with max dnis = %d\n", span->name, r2conf.max_dnis);
 		} else {
 			snprintf(span->last_error, sizeof(span->last_error), "Unknown R2 parameter [%s]", var);
 			return FTDM_FAIL;
@@ -1041,6 +1323,10 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_r2_configure_span)
 		return FTDM_FAIL;
 	}
 
+	/* set span log level */
+	r2conf.loglevel = ftdm_r2_loglevel_from_string(log_level);
+	ftdm_log(FTDM_LOG_DEBUG, "Configuring R2 span %d with loglevel %s\n", span->span_id, log_level);
+
 	r2data = ftdm_malloc(sizeof(*r2data));
 	if (!r2data) {
 		snprintf(span->last_error, sizeof(span->last_error), "Failed to allocate R2 data.");
@@ -1069,10 +1355,10 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_r2_configure_span)
 	openr2_context_set_double_answer(r2data->r2context, r2conf.double_answer);
 	openr2_context_set_immediate_accept(r2data->r2context, r2conf.immediate_accept);
 
-	if (r2conf.logdir && r2conf.logdir[0]) {
-		ftdm_log(FTDM_LOG_DEBUG, "Setting openr2 for span %s logdir to %s\n", span->name, r2conf.logdir);
-		openr2_context_set_log_directory(r2data->r2context, r2conf.logdir);
-	}
+	ftdm_log(FTDM_LOG_DEBUG, "Setting span %s logdir to %s\n", span->name, r2conf.logdir);
+	openr2_context_set_log_directory(r2data->r2context, r2conf.logdir);
+	snprintf(r2data->logdir, sizeof(r2data->logdir), "%s", r2conf.logdir);
+
 	if (r2conf.advanced_protocol_file) {
 		openr2_context_configure_from_advanced_file(r2data->r2context, r2conf.advanced_protocol_file);
 	}
@@ -1084,7 +1370,7 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_r2_configure_span)
 	}
 
 	for (i = 1; (i <= span->chan_count) && (i <= FTDM_MAX_CHANNELS_SPAN); i++) {
-		r2chan = openr2_chan_new_from_fd(r2data->r2context, span->channels[i], span->channels[i]->physical_chan_id);
+		r2chan = openr2_chan_new_from_fd(r2data->r2context, span->channels[i], span->channels[i]->chan_id);
 		if (!r2chan) {
 			snprintf(span->last_error, sizeof(span->last_error), "Cannot create all openr2 channels for span.");
 			goto fail;
@@ -1092,11 +1378,6 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_r2_configure_span)
 		openr2_chan_set_log_level(r2chan, r2conf.loglevel);
 		if (r2conf.call_files) {
 			openr2_chan_enable_call_files(r2chan);
-#if 0
-			if (r2conf.mf_files) {
-				openr2_chan_enable_mf_files(r2chan);
-			}
-#endif
 		}
 
 		r2call = ftdm_malloc(sizeof(*r2call));
@@ -1113,8 +1394,9 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_r2_configure_span)
 		/* value and key are the same so just free one of them */
 		snprintf(r2call->name, sizeof(r2call->name), "chancall%d", i);
 		hashtable_insert(spanpvt->r2calls, (void *)r2call->name, r2call, HASHTABLE_FLAG_FREE_VALUE);
-
 	}
+	r2data->mf_dump_size = r2conf.mf_dump_size;
+	r2data->category = r2conf.category;
 	r2data->flags = 0;
 	spanpvt->r2context = r2data->r2context;
 
@@ -1123,13 +1405,27 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_r2_configure_span)
 
 	span->start = ftdm_r2_start;
 	span->stop = ftdm_r2_stop;
-	span->sig_read = ftdm_r2_sig_read;
+	span->sig_read = NULL;
+	span->sig_write = NULL;
+
+	/* let the core set the states, we just read them */
+	span->get_channel_sig_status = ftdm_r2_get_channel_sig_status;
 
 	span->signal_cb = sig_cb;
 	span->signal_type = FTDM_SIGTYPE_R2;
 	span->signal_data = r2data;
 	span->outgoing_call = r2_outgoing_call;
 
+	span->state_map = &r2_state_map;
+
+	/* use signals queue */
+	ftdm_set_flag(span, FTDM_SPAN_USE_SIGNALS_QUEUE);
+
+	/* setup the scheduler */
+	snprintf(schedname, sizeof(schedname), "ftmod_r2_%s", span->name);
+	ftdm_assert(ftdm_sched_create(&r2data->sched, schedname) == FTDM_SUCCESS, "Failed to create schedule!\n");
+	spanpvt->sched = r2data->sched;
+
 	return FTDM_SUCCESS;
 
 fail:
@@ -1151,7 +1447,9 @@ static int ftdm_r2_state_advance(ftdm_channel_t *ftdmchan)
 {
 	ftdm_sigmsg_t sigev;
 	int ret;
-	openr2_chan_t *r2chan = R2CALL(ftdmchan)->r2chan;
+	ftdm_r2_call_t *r2call = R2CALL(ftdmchan);
+	openr2_chan_t *r2chan = r2call->r2chan;
+	ftdm_r2_data_t *r2data = ftdmchan->span->signal_data;
 
 	memset(&sigev, 0, sizeof(sigev));
 	sigev.chan_id = ftdmchan->chan_id;
@@ -1160,25 +1458,27 @@ static int ftdm_r2_state_advance(ftdm_channel_t *ftdmchan)
 
 	ret = 0;
 
-	if (R2CALL(ftdmchan)->state_ack_pending) {
-		ftdm_clear_flag(ftdmchan, FTDM_CHANNEL_STATE_CHANGE);
-		ftdm_channel_complete_state(ftdmchan);
-		R2CALL(ftdmchan)->state_ack_pending = 0;
-	}
-
-	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_STATE_CHANGE) && (R2CALL(ftdmchan)->chanstate != ftdmchan->state)) {
+	/* because we do not always acknowledge the state change (clearing the FTDM_CHANNEL_STATE_CHANGE flag) due to the accept
+	 * procedure described below, we need the chanstate member to NOT process some states twice, so is valid entering this 
+	 * function with the FTDM_CHANNEL_STATE_CHANGE flag set but with a state that was already processed and is just waiting
+	 * to complete (the processing is media-bound)
+	 * */
+	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_STATE_CHANGE) 
+			&& (r2call->chanstate != ftdmchan->state)) {
 
 		ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Executing state handler for %s\n", ftdm_channel_state2str(ftdmchan->state));
-		R2CALL(ftdmchan)->chanstate = ftdmchan->state;
+		r2call->chanstate = ftdmchan->state;
 
-		if (!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND) && !R2CALL(ftdmchan)->accepted &&
-				(ftdmchan->state == FTDM_CHANNEL_STATE_PROGRESS ||
-				 ftdmchan->state == FTDM_CHANNEL_STATE_PROGRESS_MEDIA ||
-				 ftdmchan->state == FTDM_CHANNEL_STATE_UP) ) {
-			/* if an accept ack will be required we should not acknowledge the state change just yet, 
-			   it will be done below after processing the MF signals, otherwise we have a race condition between freetdm calling
-			   openr2_chan_answer_call and openr2 accepting the call first, if freetdm calls openr2_chan_answer_call before the accept cycle
-			   completes, openr2 will fail to answer the call */
+		if (IS_ACCEPTING_PENDING(ftdmchan)) {
+			/* 
+			   Moving to PROGRESS, PROGRESS_MEDIA or UP means that we must accept the call first, and accepting
+			   the call in R2 means sending a tone, then waiting for the acknowledge from the other end,
+			   since all of that requires sending and detecting tones, it takes a few milliseconds (I'd say around 100)
+			   which means during that time the user should not try to perform any operations like answer, hangup or anything
+			   else, therefore we DO NOT clear the FTDM_CHANNEL_STATE_CHANGE flag here, we rely on ftdm_io.c to block
+			   the user thread until we're done with the accept (see on_call_accepted callback) and then we clear the state change flag,
+			   otherwise we have a race condition between freetdm calling openr2_chan_answer_call and openr2 accepting the call first, 
+			   if freetdm calls openr2_chan_answer_call before the accept cycle completes, openr2 will fail to answer the call */
 			ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "State ack for state %s will have to wait a bit\n", ftdm_channel_state2str(ftdmchan->state));
 		} else if (ftdmchan->state != FTDM_CHANNEL_STATE_DOWN){
 			ftdm_clear_flag(ftdmchan, FTDM_CHANNEL_STATE_CHANGE);
@@ -1194,6 +1494,7 @@ static int ftdm_r2_state_advance(ftdm_channel_t *ftdmchan)
 					ftdm_channel_command(ftdmchan, FTDM_COMMAND_GET_INTERVAL, &interval);
 					ftdm_assert(interval != 0, "Invalid interval!");
 					ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Starting processing of incoming call with interval %d\n", interval);
+					openr2_chan_enable_read(r2chan);
 				}
 				break;
 
@@ -1205,6 +1506,7 @@ static int ftdm_r2_state_advance(ftdm_channel_t *ftdmchan)
 					ftdm_assert(interval != 0, "Invalid interval!");
 					ftdm_log_chan(ftdmchan, 
 						FTDM_LOG_DEBUG, "Starting processing of outgoing call in channel with interval %d\n", interval);
+					openr2_chan_enable_read(r2chan);
 				}
 				break;
 
@@ -1214,13 +1516,8 @@ static int ftdm_r2_state_advance(ftdm_channel_t *ftdmchan)
 				/* notify the user about the new call */
 				sigev.event_id = FTDM_SIGEVENT_START;
 
-				if (ftdm_span_send_signal(ftdmchan->span, &sigev) != FTDM_SUCCESS) {
-					ftdm_log_chan_msg(ftdmchan, FTDM_LOG_NOTICE, "Failed to handle call offered\n");
-					openr2_chan_disconnect_call(r2chan, OR2_CAUSE_OUT_OF_ORDER);
-					ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_CANCEL);
-					break; 
-				}
-				R2CALL(ftdmchan)->ftdm_started = 1; 
+				ftdm_span_send_signal(ftdmchan->span, &sigev);
+				r2call->ftdm_call_started = 1; 
 
 				break;
 
@@ -1229,16 +1526,17 @@ static int ftdm_r2_state_advance(ftdm_channel_t *ftdmchan)
 			case FTDM_CHANNEL_STATE_PROGRESS_MEDIA:
 				{
 					if (!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
-						if (!R2CALL(ftdmchan)->accepted) {
+						if (!r2call->accepted) {
 							ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Accepting call\n");
 							ft_r2_accept_call(ftdmchan);
 						} 
 					} else {
 						ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Notifying progress\n");
+						sigev.event_id = FTDM_SIGEVENT_PROCEED;
+						ftdm_span_send_signal(ftdmchan->span, &sigev);
+
 						sigev.event_id = FTDM_SIGEVENT_PROGRESS_MEDIA;
-						if (ftdm_span_send_signal(ftdmchan->span, &sigev) != FTDM_SUCCESS) {
-							ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
-						}
+						ftdm_span_send_signal(ftdmchan->span, &sigev);
 					}
 				}
 				break;
@@ -1248,60 +1546,72 @@ static int ftdm_r2_state_advance(ftdm_channel_t *ftdmchan)
 				{
 					ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Call was answered\n");
 					if (!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
-						if (!R2CALL(ftdmchan)->accepted) {
+						if (!r2call->accepted) {
 							ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Call has not been accepted, need to accept first\n");
 							// the answering will be done in the on_call_accepted handler
 							ft_r2_accept_call(ftdmchan);
-							R2CALL(ftdmchan)->answer_pending = 1;
+							r2call->answer_pending = 1;
 						} else {
 							ft_r2_answer_call(ftdmchan);
 						}
 					} else {
 						ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Notifying of call answered\n");
 						sigev.event_id = FTDM_SIGEVENT_UP;
-						if (ftdm_span_send_signal(ftdmchan->span, &sigev) != FTDM_SUCCESS) {
-							ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
-						}
+						ftdm_span_send_signal(ftdmchan->span, &sigev);
 					}
 				}
 				break;
 
 				/* just got hangup */
-			case FTDM_CHANNEL_STATE_HANGUP: 
+			case FTDM_CHANNEL_STATE_HANGUP:
 				{
-					openr2_call_disconnect_cause_t disconnect_cause = ftdm_r2_ftdm_cause_to_openr2_cause(ftdmchan);
-					ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Clearing call, cause = %s\n", openr2_proto_get_disconnect_string(disconnect_cause));
-					openr2_chan_enable_read(r2chan);
-					if (!R2CALL(ftdmchan)->disconnect_rcvd) {
+					if (!r2call->disconnect_rcvd) {
+						openr2_call_disconnect_cause_t disconnect_cause = ftdm_r2_ftdm_cause_to_openr2_cause(ftdmchan);
+						ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Clearing call, cause = %s\n", openr2_proto_get_disconnect_string(disconnect_cause));
 						/* this will disconnect the call, but need to wait for the call end before moving to DOWN */
 						openr2_chan_disconnect_call(r2chan, disconnect_cause);
-					} else {
+					} else if (!r2call->protocol_error) {
 						/* just ack the hangup, on_call_end will be called by openr2 right after */
-						openr2_chan_disconnect_call(r2chan, disconnect_cause);
+						openr2_chan_disconnect_call(r2chan, OR2_CAUSE_NORMAL_CLEARING);
+					} else {
+						ftdm_log_chan_msg(ftdmchan, FTDM_LOG_ERROR, "Clearing call due to protocol error\n");
+						/* do not set to down yet, give some time for recovery */
+						ftdm_sched_timer(r2data->sched, "protocolerr_recover", 100, 
+								ftdm_r2_recover_from_protocol_error, r2chan, &r2call->protocol_error_recovery_timer);
 					}
 				}
 				break;
 
-				/* just got hangup from the freetdm side due to abnormal failure */
-			case FTDM_CHANNEL_STATE_CANCEL:
+			case FTDM_CHANNEL_STATE_TERMINATING:
 				{
-					ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Unable to receive call\n");
-					openr2_chan_enable_read(r2chan);
-					openr2_chan_disconnect_call(r2chan, OR2_CAUSE_OUT_OF_ORDER);
+					/* if the call has not been started yet we must go to HANGUP right here */ 
+					if (!r2call->ftdm_call_started) {
+						ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
+					} else {
+						openr2_call_disconnect_cause_t disconnect_cause = ftdm_r2_ftdm_cause_to_openr2_cause(ftdmchan);
+						ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Clearing call, cause = %s\n", openr2_proto_get_disconnect_string(disconnect_cause));
+						/* notify the user of the call terminating and we wait for the user to move us to hangup */
+						sigev.event_id = FTDM_SIGEVENT_STOP;
+						ftdm_span_send_signal(ftdmchan->span, &sigev);
+					}
 				}
 				break;
 
 				/* finished call for good */
 			case FTDM_CHANNEL_STATE_DOWN: 
 				{
-					ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Call is down\n");
-					if (R2CALL(ftdmchan)->txdrops) {
-						ftdm_log_chan(ftdmchan, FTDM_LOG_WARNING, "dropped %d tx packets\n", R2CALL(ftdmchan)->txdrops);
-					}
+					ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "R2 Call is down\n");
 					ret = 1;
 				}
 				break;
 
+				/* INDICATE_RINGING doesn't apply to MFC/R2. maybe we could generate a tone */
+			case FTDM_CHANNEL_STATE_RINGING: 
+				{
+					ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "RINGING indicated, ignoring it as it doesn't apply to MFC/R2\n");
+				}
+				break;
+
 			default:
 				{
 					ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Unhandled channel state change: %s\n", ftdm_channel_state2str(ftdmchan->state));
@@ -1320,19 +1630,37 @@ static int ftdm_r2_state_advance(ftdm_channel_t *ftdmchan)
 	return ret;
 }
 
+/* the channel must be locked when calling this function */
+static void ftdm_r2_state_advance_all(ftdm_channel_t *ftdmchan)
+{
+	/* because we do not always acknowledge the state change (clearing the FTDM_CHANNEL_STATE_CHANGE flag) due to the accept
+	 * procedure described below, we need the chanstate member to NOT process some states twice, so is valid entering this 
+	 * function with the FTDM_CHANNEL_STATE_CHANGE flag set but with a state that was already processed and is just waiting
+	 * to complete (the processing is media-bound)
+	 * */
+	while (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_STATE_CHANGE)
+		&& (R2CALL(ftdmchan)->chanstate != ftdmchan->state)) {
+		ftdm_r2_state_advance(ftdmchan);
+	}
+}
+
 static void *ftdm_r2_run(ftdm_thread_t *me, void *obj)
 {
-	openr2_chan_t *r2chan;
-	ftdm_r2_call_t *r2call = NULL;
+	openr2_chan_t *r2chan = NULL;
 	ftdm_channel_t *ftdmchan = NULL;
+	ftdm_r2_call_t *call = NULL;
 	ftdm_status_t status;
 	ftdm_span_t *span = (ftdm_span_t *) obj;
 	ftdm_r2_data_t *r2data = span->signal_data;
 	int waitms = 20;
-	int i, res;
-	int ms;
+	unsigned int i;
+	int res, ms;
+	int index = 0;
 	struct timeval start, end;
-    short *poll_events = ftdm_malloc(sizeof(short)*span->chan_count);
+	ftdm_iterator_t *chaniter = NULL;
+	ftdm_iterator_t *citer = NULL;
+	uint32_t txqueue_size = 4;
+	short *poll_events = ftdm_malloc(sizeof(short) * span->chan_count);
 
 #ifdef __linux__
 	r2data->monitor_thread_id = syscall(SYS_gettid);	
@@ -1340,33 +1668,63 @@ static void *ftdm_r2_run(ftdm_thread_t *me, void *obj)
 	
 	ftdm_log(FTDM_LOG_DEBUG, "OpenR2 monitor thread %lu started.\n", r2data->monitor_thread_id);
 	r2chan = NULL;
-	for (i = 1; i <= span->chan_count; i++) {
-		r2chan = R2CALL(span->channels[i])->r2chan;
+	chaniter = ftdm_span_get_chan_iterator(span, NULL);
+	if (!chaniter) {
+		ftdm_log(FTDM_LOG_CRIT, "Failed to allocate channel iterator for span %s!\n", span->name);
+		goto done;
+	}
+	for (i = 1, citer = chaniter; citer; citer = ftdm_iterator_next(citer), i++) {
+		ftdmchan = ftdm_iterator_current(citer);
+		r2chan = R2CALL(ftdmchan)->r2chan;
+		openr2_chan_set_span_id(r2chan, span->span_id);
 		openr2_chan_set_idle(r2chan);
 		openr2_chan_process_cas_signaling(r2chan);
+		ftdm_channel_command(ftdmchan, FTDM_COMMAND_SET_TX_QUEUE_SIZE, &txqueue_size);
 	}
 
 	memset(&start, 0, sizeof(start));
 	memset(&end, 0, sizeof(end));
 	while (ftdm_running() && ftdm_test_flag(r2data, FTDM_R2_RUNNING)) {
-		r2data->loops++;
 		res = gettimeofday(&end, NULL);
+		if (res) {
+			ftdm_log(FTDM_LOG_CRIT, "Failure gettimeofday [%s]\n", strerror(errno));
+		}
 		if (start.tv_sec) {
 			ms = ((end.tv_sec - start.tv_sec) * 1000) 
 			    + ((( 1000000 + end.tv_usec - start.tv_usec) / 1000) - 1000);
+			if (ms < 0) {
+				ms = 0;
+			}
 			if (ms > r2data->jobmax) {
 				r2data->jobmax = ms;
 			}
+			index = (ms / 10);
+			index = (index > 10) ? 10 : index;
+			r2data->loops[index]++;
+			r2data->total_loops++;
 		}
 
+		/* run any span timers */
+		ftdm_sched_run(r2data->sched);
+
+		/* deliver the actual channel events to the user now without any channel locking */
+		ftdm_span_trigger_signals(span);
 #ifndef WIN32
 		 /* figure out what event to poll each channel for. POLLPRI when the channel is down,
 		  * POLLPRI|POLLIN|POLLOUT otherwise */
 		memset(poll_events, 0, sizeof(short)*span->chan_count);
-		for (i = 0; i < span->chan_count; i++) {
-			r2chan = R2CALL(span->channels[(i+1)])->r2chan;
-			ftdmchan = openr2_chan_get_client_data(r2chan);
-			poll_events[i] = ftdmchan->state == FTDM_CHANNEL_STATE_DOWN ? POLLPRI : (POLLPRI | POLLIN | POLLOUT);
+		citer = ftdm_span_get_chan_iterator(span, chaniter);
+		if (!citer) {
+			ftdm_log(FTDM_LOG_CRIT, "Failed to allocate channel iterator for span %s!\n", span->name);
+			goto done;
+		}
+		for (i = 0; citer; citer = ftdm_iterator_next(citer), i++) {
+			ftdmchan = ftdm_iterator_current(citer);
+			r2chan = R2CALL(ftdmchan)->r2chan;
+			poll_events[i] = POLLPRI;
+			if (openr2_chan_get_read_enabled(r2chan)) {
+				poll_events[i] |= POLLIN;
+			}
 		}
 
 		status = ftdm_span_poll_event(span, waitms, poll_events);
@@ -1374,6 +1732,9 @@ static void *ftdm_r2_run(ftdm_thread_t *me, void *obj)
 		status = ftdm_span_poll_event(span, waitms, NULL);
 #endif
 
+		/* run any span timers */
+		ftdm_sched_run(r2data->sched);
+
 		res = gettimeofday(&start, NULL);
 		if (res) {
 			ftdm_log(FTDM_LOG_CRIT, "Failure gettimeofday [%s]\n", strerror(errno));
@@ -1384,69 +1745,62 @@ static void *ftdm_r2_run(ftdm_thread_t *me, void *obj)
 			continue;
 		}
 
-		 if (FTDM_SUCCESS == status) {
-			ftdm_event_t *event;
-			while (ftdm_span_next_event(span, &event) == FTDM_SUCCESS) {
-				if (event->enum_id == FTDM_OOB_CAS_BITS_CHANGE) {
-					r2call = R2CALL(event->channel);
-					r2chan = r2call->r2chan;
-
-					ftdm_log(FTDM_LOG_DEBUG, "Handling CAS on channel %d.\n", openr2_chan_get_number(r2chan));
-					// we only expect CAS and other OOB events on this thread/loop, once a call is started
-					// the MF events (in-band signaling) are handled in the call thread
-					openr2_chan_process_cas_signaling(r2chan);
-				} else {
-					ftdm_log(FTDM_LOG_DEBUG, "Ignoring event %d on channel %d.\n", event->enum_id, openr2_chan_get_number(r2chan));
-					// XXX TODO: handle alarms here XXX
-				}
-			}
-
-			/* XXX
-			* when ftdm_span_poll_event() returns FTDM_SUCCESS, means there are events pending on the span.
-			* is it possible to know on which channels those events are pending, without traversing the span?
-			* XXX */
-			for (i = 1; i <= span->chan_count; i++) {
-				r2chan = R2CALL(span->channels[i])->r2chan;
-				ftdmchan = openr2_chan_get_client_data(r2chan);
-				r2call = R2CALL(ftdmchan);
-
-				ftdm_mutex_lock(ftdmchan->mutex);
-				ftdm_set_flag(r2call, FTDM_R2_PROCESSING);
-
-				if (ftdm_r2_state_advance(ftdmchan)) {
-					ftdm_clear_flag(r2call, FTDM_R2_PROCESSING);
-					ftdm_mutex_unlock(ftdmchan->mutex);
-					continue;
-				}
-
-				/* handle timeout events first if any */
-				openr2_chan_run_schedule(r2chan);
-
-				/* process mf tones, if any */
-				if (openr2_chan_get_read_enabled(r2chan)) {
-					openr2_chan_process_mf_signaling(r2chan);
-				}
-
-				if (ftdm_r2_state_advance(ftdmchan)) {
-					ftdm_clear_flag(r2call, FTDM_R2_PROCESSING);
-					ftdm_mutex_unlock(ftdmchan->mutex);
-					continue;
-				}
-
-				ftdm_clear_flag(r2call, FTDM_R2_PROCESSING);
-				ftdm_mutex_unlock(ftdmchan->mutex);
-			}
-		} else if (status != FTDM_TIMEOUT) {
-			ftdm_log(FTDM_LOG_ERROR, "ftdm_span_poll_event returned %d.\n", status);
+		ms = ((start.tv_sec - end.tv_sec) * 1000) 
+		    + ((( 1000000 + start.tv_usec - end.tv_usec) / 1000) - 1000);
+		if (ms < 0) {
+			ms = 0;
+		}
+		if (ms > r2data->sleepmax) {
+			r2data->sleepmax = ms;
+		}
+		index = (ms / 15);
+		index = (index > 10) ? 10 : index;
+		r2data->sleeps[index]++;
+		r2data->total_sleeps++;
+
+		/* this main loop takes care of MF and CAS signaling during call setup and tear down
+		 * for every single channel in the span, do not perform blocking operations here! */
+		citer = ftdm_span_get_chan_iterator(span, chaniter);
+		for ( ; citer; citer = ftdm_iterator_next(citer)) {
+			ftdmchan = ftdm_iterator_current(citer);
+
+			ftdm_mutex_lock(ftdmchan->mutex);
+
+			call = R2CALL(ftdmchan);
+
+			/* This let knows the core and io signaling hooks know that 
+			 * read/writes come from us and should be allowed */
+			ftdm_clear_flag(ftdmchan, FTDM_CHANNEL_RX_DISABLED);
+			ftdm_clear_flag(ftdmchan, FTDM_CHANNEL_TX_DISABLED);
+
+			ftdm_r2_state_advance_all(ftdmchan);
+
+			r2chan = call->r2chan;
+			openr2_chan_process_signaling(r2chan);
+
+			ftdm_r2_state_advance_all(ftdmchan);
+
+			if (!call->accepted) {
+				/* if the call is not accepted we do not want users reading */
+				ftdm_set_flag(ftdmchan, FTDM_CHANNEL_RX_DISABLED);
+				ftdm_set_flag(ftdmchan, FTDM_CHANNEL_TX_DISABLED);
+			}
+
+			ftdm_mutex_unlock(ftdmchan->mutex);
 		}
-		ftdm_sleep(20);
 	}
 
-	for (i = 1; i <= span->chan_count; i++) {
-		r2chan = R2CALL(span->channels[i])->r2chan;
+done:	
+	citer = ftdm_span_get_chan_iterator(span, chaniter);
+	for ( ; citer; citer = ftdm_iterator_next(citer)) {
+		ftdmchan = ftdm_iterator_current(citer);
+		r2chan = R2CALL(ftdmchan)->r2chan;
 		openr2_chan_set_blocked(r2chan);
 	}
 
+	ftdm_iterator_free(chaniter);
+	ftdm_safe_free(poll_events);
+
 	ftdm_clear_flag(r2data, FTDM_R2_RUNNING);
 	ftdm_log(FTDM_LOG_DEBUG, "R2 thread ending.\n");
 
@@ -1502,8 +1856,8 @@ static FIO_API_FUNCTION(ftdm_r2_api)
 	char *mycmd = NULL, *argv[10] = { 0 };
 	int argc = 0;
 	int span_id = 0;
-	int chan_id = 0;
-	int i = 0;
+	unsigned int chan_id = 0;
+	unsigned int i = 0;
 	ftdm_r2_data_t *r2data = NULL;
 	openr2_chan_t *r2chan = NULL;
 	openr2_context_t *r2context = NULL;
@@ -1586,7 +1940,7 @@ static FIO_API_FUNCTION(ftdm_r2_api)
 					goto done;
 				}
 				if (!(r2data =  span->signal_data)) {
-					stream->write_function(stream, "-ERR invalid span. No R2 singal data in span.\n");
+					stream->write_function(stream, "-ERR invalid span. No R2 signal data in span.\n");
 					goto done;
 				}
 				r2context = r2data->r2context;
@@ -1597,19 +1951,17 @@ static FIO_API_FUNCTION(ftdm_r2_api)
 						"Max DNIS: %d\n"
 						"ANI First: %s\n"
 						"Immediate Accept: %s\n"
-						"Side: %s\n"
+						"Job Thread: %lu\n"
 						"Job Max ms: %d\n"
-						"Job Loops: %lu\n"
-						"Monitor Thread: %lu\n",
+						"Job Loops: %lu\n",
 						openr2_proto_get_variant_string(r2variant),
 						openr2_context_get_max_ani(r2context),
 						openr2_context_get_max_dnis(r2context),
 						openr2_context_get_ani_first(r2context) ? "Yes" : "No",
 						openr2_context_get_immediate_accept(r2context) ? "Yes" : "No",
-                                                "no side",
+						r2data->monitor_thread_id,
 						r2data->jobmax, 
-						r2data->loops,
-						r2data->monitor_thread_id);
+						r2data->total_loops);
 				stream->write_function(stream, "\n");
 				stream->write_function(stream, "%4s %-12.12s %-12.12s\n", "Channel", "Tx CAS", "Rx CAS");
 				for (i = 1; i <= span->chan_count; i++) {
@@ -1628,6 +1980,56 @@ static FIO_API_FUNCTION(ftdm_r2_api)
 			}
 		}
 
+		if (!strcasecmp(argv[0], "loopstats")) {
+			int range;
+			float pct;
+			span_id = atoi(argv[1]);
+
+			if (ftdm_span_find_by_name(argv[1], &span) == FTDM_SUCCESS || ftdm_span_find(span_id, &span) == FTDM_SUCCESS) {
+				if (span->start != ftdm_r2_start) {
+					stream->write_function(stream, "-ERR not an R2 span.\n");
+					goto done;
+				}
+				if (!(r2data =  span->signal_data)) {
+					stream->write_function(stream, "-ERR invalid span. No R2 signal data in span.\n");
+					goto done;
+				}
+				stream->write_function(stream, "-- Working --\n");
+				stream->write_function(stream, "Total loops: %llu\n", r2data->total_loops);
+				range = 0;
+				for (i = 0; i < ftdm_array_len(r2data->loops); i++) {
+					pct = 100*(float)r2data->loops[i]/r2data->total_loops;
+					if ((i + 1) == ftdm_array_len(r2data->loops)) {
+						stream->write_function(stream, ">= %dms: %llu - %.03lf%%\n", range, r2data->loops[i], pct);
+					} else {
+						stream->write_function(stream, "%d-%dms: %llu - %.03lf%%\n", range, range + 9, r2data->loops[i], pct);
+					}
+					range += 10;
+				}
+				stream->write_function(stream, "\n");
+
+				stream->write_function(stream, "-- Sleeping --\n");
+				stream->write_function(stream, "Total sleeps: %llu\n", r2data->total_sleeps);
+				range = 0;
+				for (i = 0; i < ftdm_array_len(r2data->sleeps); i++) {
+					pct = 100*(float)r2data->sleeps[i]/r2data->total_sleeps;
+					if ((i + 1) == ftdm_array_len(r2data->sleeps)) {
+						stream->write_function(stream, ">= %dms: %llu - %.03lf%%\n", range, r2data->sleeps[i], pct);
+					} else {
+						stream->write_function(stream, "%d-%dms: %llu - %.03lf%%\n", range, range + 14, r2data->sleeps[i], pct);
+					}
+					range += 15;
+				}
+				stream->write_function(stream, "\n");
+				
+				stream->write_function(stream, "+OK.\n");
+				goto done;
+			} else {
+				stream->write_function(stream, "-ERR invalid span.\n");
+				goto done;
+			}
+		}
+
 	}
 
 	if (argc == 1) {
@@ -1709,6 +2111,7 @@ static FIO_SIG_UNLOAD_FUNCTION(ftdm_r2_destroy)
 			spanpvt = val;
 			openr2_context_delete(spanpvt->r2context);
 			hashtable_destroy(spanpvt->r2calls);
+			ftdm_sched_destroy(&spanpvt->sched);
 		}
 	}
 	hashtable_destroy(g_mod_data_hash);
@@ -1717,12 +2120,13 @@ static FIO_SIG_UNLOAD_FUNCTION(ftdm_r2_destroy)
 }
 
 EX_DECLARE_DATA ftdm_module_t ftdm_module = { 
-	"r2",
-	ftdm_r2_io_init,
-	NULL,
-	ftdm_r2_init,
-	ftdm_r2_configure_span,
-	ftdm_r2_destroy
+	/* .name */ "r2",
+	/* .io_load */ ftdm_r2_io_init,
+	/* .io_unload */ NULL,
+	/* .sig_load */ ftdm_r2_init,
+	/* .sig_configure */ NULL,
+	/* .sig_unload */ ftdm_r2_destroy,
+	/* .configure_span_signaling */ ftdm_r2_configure_span_signaling
 };
 	
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftdm_sangoma_boost.h b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftdm_sangoma_boost.h
index 5a3ca76c56..6fbf272d07 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftdm_sangoma_boost.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftdm_sangoma_boost.h
@@ -58,7 +58,7 @@ typedef struct ftdm_sangoma_boost_trunkgroup {
 	ftdm_size_t size;			/* Number of b-channels in group */	
 	unsigned int last_used_index; /* index of last b-channel used */
 	ftdm_channel_t* ftdmchans[MAX_CHANS_PER_TRUNKGROUP];
-	//DAVIDY need to merge congestion timeouts to this struct
+	//TODO need to merge congestion timeouts to this struct
 } ftdm_sangoma_boost_trunkgroup_t;
 #endif
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.2008.vcproj b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.2008.vcproj
index e7fc1d6549..73e421818f 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.2008.vcproj
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.2008.vcproj
@@ -95,83 +95,6 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
@@ -249,6 +172,83 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				WarnAsError="true"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4100"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
@@ -283,7 +283,7 @@
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				WarnAsError="true"
+				WarnAsError="false"
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4100"
 			/>
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.2010.vcxproj b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.2010.vcxproj
new file mode 100644
index 0000000000..78689c36db
--- /dev/null
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.2010.vcxproj
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>ftmod_sangoma_boost</ProjectName>
+    <ProjectGuid>{D021EF2A-460D-4827-A0F7-41FDECF46F1B}</ProjectGuid>
+    <RootNamespace>ftmod_sangoma_boost</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\include;..\..\isdn\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>freetdm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\include;..\..\isdn\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>freetdm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="ftmod_sangoma_boost.c" />
+    <ClCompile Include="sangoma_boost_client.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ftdm_sangoma_boost.h" />
+    <ClInclude Include="sangoma_boost_client.h" />
+    <ClInclude Include="sangoma_boost_interface.h" />
+    <ClInclude Include="sigboost.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\msvc\freetdm.2010.vcxproj">
+      <Project>{93b8812c-3ec4-4f78-8970-ffbfc99e167d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.2010.vcxproj.filters b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.2010.vcxproj.filters
new file mode 100644
index 0000000000..2aeed155cd
--- /dev/null
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.2010.vcxproj.filters
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ftmod_sangoma_boost.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sangoma_boost_client.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ftdm_sangoma_boost.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="sangoma_boost_client.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="sangoma_boost_interface.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="sigboost.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
index a975204b62..50a01cc0ec 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
@@ -55,7 +55,7 @@ ftdm_mutex_t *g_boost_modules_mutex = NULL;
 ftdm_hash_t *g_boost_modules_hash = NULL;
 
 #define MAX_TRUNK_GROUPS 64
-//DAVIDY need to merge congestion_timeouts with ftdm_sangoma_boost_trunkgroups
+//TODO need to merge congestion_timeouts with ftdm_sangoma_boost_trunkgroups
 static time_t congestion_timeouts[MAX_TRUNK_GROUPS];
 
 static ftdm_sangoma_boost_trunkgroup_t *g_trunkgroups[MAX_TRUNK_GROUPS];
@@ -1557,11 +1557,11 @@ static __inline__ ftdm_status_t state_advance(ftdm_channel_t *ftdmchan)
 			ftdm_set_string(event.calling_name, ftdmchan->caller_data.cid_name);
 			ftdm_set_string(event.rdnis.digits, ftdmchan->caller_data.rdnis.digits);
 			if (strlen(ftdmchan->caller_data.rdnis.digits)) {
-					event.rdnis.digits_count = (uint8_t)strlen(ftdmchan->caller_data.rdnis.digits)+1;
-					event.rdnis.ton = ftdmchan->caller_data.rdnis.type;
-					event.rdnis.npi = ftdmchan->caller_data.rdnis.plan;
+				event.rdnis.digits_count = (uint8_t)strlen(ftdmchan->caller_data.rdnis.digits)+1;
+				event.rdnis.ton = ftdmchan->caller_data.rdnis.type;
+				event.rdnis.npi = ftdmchan->caller_data.rdnis.plan;
 			}
-		    
+
 			event.calling.screening_ind = ftdmchan->caller_data.screen;
 			event.calling.presentation_ind = ftdmchan->caller_data.pres;
 
@@ -2582,17 +2582,17 @@ static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_sangoma_boost_configure_span)
 		} else if (!strcasecmp(var, "remote_port")) {
 			remote_port = atoi(val);
 		} else if (!strcasecmp(var, "outbound-called-ton")) {
-			ftdm_span_set_ton(val, &span->default_caller_data.dnis.type);
+			ftdm_set_ton(val, &span->default_caller_data.dnis.type);
 		} else if (!strcasecmp(var, "outbound-called-npi")) {
-			ftdm_span_set_npi(val, &span->default_caller_data.dnis.plan);
+			ftdm_set_npi(val, &span->default_caller_data.dnis.plan);
 		} else if (!strcasecmp(var, "outbound-calling-ton")) {
-			ftdm_span_set_ton(val, &span->default_caller_data.cid_num.type);
+			ftdm_set_ton(val, &span->default_caller_data.cid_num.type);
 		} else if (!strcasecmp(var, "outbound-calling-npi")) {
-			ftdm_span_set_npi(val, &span->default_caller_data.cid_num.plan);
+			ftdm_set_npi(val, &span->default_caller_data.cid_num.plan);
 		} else if (!strcasecmp(var, "outbound-rdnis-ton")) {
-			ftdm_span_set_ton(val, &span->default_caller_data.rdnis.type);
+			ftdm_set_ton(val, &span->default_caller_data.rdnis.type);
 		} else if (!strcasecmp(var, "outbound-rdnis-npi")) {
-			ftdm_span_set_npi(val, &span->default_caller_data.rdnis.plan);
+			ftdm_set_npi(val, &span->default_caller_data.rdnis.plan);
 		} else if (!sigmod) {
 			snprintf(span->last_error, sizeof(span->last_error), "Unknown parameter [%s]", var);
 			FAIL_CONFIG_RETURN(FTDM_FAIL);
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2010.vcxproj b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2010.vcxproj
new file mode 100644
index 0000000000..b0a51786f5
--- /dev/null
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2010.vcxproj
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>ftmod_sangoma_isdn</ProjectName>
+    <ProjectGuid>{B2AF4EA6-0CD7-4529-9EB5-5AF43DB90395}</ProjectGuid>
+    <RootNamespace>ftmod_sangoma_isdn</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>C:\Program Files\libsng_isdn\include;C:\Program Files\libsng_isdn\include\sng_isdn;../../include;C:\Program Files\Sangoma\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>freetdm.lib;libsng_isdn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir);C:\Program Files\libsng_isdn\lib;C:\Program Files\Sangoma\api\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>C:\Program Files\libsng_isdn\include;C:\Program Files\libsng_isdn\include\sng_isdn;../../include;C:\Program Files\Sangoma\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>freetdm.lib;libsng_isdn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir);C:\Program Files\libsng_isdn\lib;C:\Program Files\Sangoma\api\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="ftmod_sangoma_isdn.h" />
+    <ClInclude Include="ftmod_sangoma_isdn_trace.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ftmod_sangoma_isdn.c" />
+    <ClCompile Include="ftmod_sangoma_isdn_cfg.c" />
+    <ClCompile Include="ftmod_sangoma_isdn_cntrl.c" />
+    <ClCompile Include="ftmod_sangoma_isdn_stack_cfg.c" />
+    <ClCompile Include="ftmod_sangoma_isdn_stack_cntrl.c" />
+    <ClCompile Include="ftmod_sangoma_isdn_stack_hndl.c" />
+    <ClCompile Include="ftmod_sangoma_isdn_stack_out.c" />
+    <ClCompile Include="ftmod_sangoma_isdn_stack_rcv.c" />
+    <ClCompile Include="ftmod_sangoma_isdn_support.c" />
+    <ClCompile Include="ftmod_sangoma_isdn_trace.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\msvc\freetdm.2010.vcxproj">
+      <Project>{93b8812c-3ec4-4f78-8970-ffbfc99e167d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2010.vcxproj.filters b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2010.vcxproj.filters
new file mode 100644
index 0000000000..5f592fa9ef
--- /dev/null
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.2010.vcxproj.filters
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ftmod_sangoma_isdn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ftmod_sangoma_isdn_trace.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ftmod_sangoma_isdn.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ftmod_sangoma_isdn_cfg.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ftmod_sangoma_isdn_cntrl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ftmod_sangoma_isdn_stack_cfg.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ftmod_sangoma_isdn_stack_cntrl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ftmod_sangoma_isdn_stack_hndl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ftmod_sangoma_isdn_stack_out.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ftmod_sangoma_isdn_stack_rcv.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ftmod_sangoma_isdn_support.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ftmod_sangoma_isdn_trace.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
index 583d5c1729..e20d3ae7e0 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
@@ -40,22 +40,24 @@
 #include <sys/mman.h>
 #endif
 
-static void *ftdm_sangoma_isdn_run(ftdm_thread_t *me, void *obj);
 
+static void *ftdm_sangoma_isdn_run(ftdm_thread_t *me, void *obj);
 static ftdm_status_t ftdm_sangoma_isdn_stop(ftdm_span_t *span);
 static ftdm_status_t ftdm_sangoma_isdn_start(ftdm_span_t *span);
 
 ftdm_channel_t* ftdm_sangoma_isdn_process_event_states(ftdm_span_t *span, sngisdn_event_data_t *sngisdn_event);
 static void ftdm_sangoma_isdn_advance_chan_states(ftdm_channel_t *ftdmchan);
 static void ftdm_sangoma_isdn_poll_events(ftdm_span_t *span);
-
+static void ftdm_sangoma_isdn_process_phy_events(ftdm_span_t *span, ftdm_oob_event_t event);
 static void ftdm_sangoma_isdn_process_state_change(ftdm_channel_t *ftdmchan);
 static void ftdm_sangoma_isdn_process_stack_event (ftdm_span_t *span, sngisdn_event_data_t *sngisdn_event);
+static void ftdm_sangoma_isdn_wakeup_phy(ftdm_channel_t *dchan);
+static void ftdm_sangoma_isdn_dchan_set_queue_size(ftdm_channel_t *ftdmchan);
 
-static ftdm_io_interface_t		    	g_sngisdn_io_interface;
-static sng_isdn_event_interface_t		g_sngisdn_event_interface;
+static ftdm_io_interface_t	    	g_sngisdn_io_interface;
+static sng_isdn_event_interface_t	g_sngisdn_event_interface;
 
-ftdm_sngisdn_data_t				g_sngisdn_data;
+ftdm_sngisdn_data_t 			g_sngisdn_data;
 
 ftdm_state_map_t sangoma_isdn_state_map = {
 	{
@@ -113,7 +115,20 @@ ftdm_state_map_t sangoma_isdn_state_map = {
 		ZSD_INBOUND,
 		ZSM_UNACCEPTABLE,
 		{FTDM_CHANNEL_STATE_RING, FTDM_END},
-		{FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROGRESS, FTDM_END}
+		{FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROCEED, FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_END}
+	},
+	{
+		ZSD_INBOUND,
+		ZSM_UNACCEPTABLE,
+		{FTDM_CHANNEL_STATE_PROCEED, FTDM_END},
+		{FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA,
+		 FTDM_CHANNEL_STATE_UP, FTDM_END}
+	},
+	{
+		ZSD_INBOUND,
+		ZSM_UNACCEPTABLE,
+		{FTDM_CHANNEL_STATE_RINGING, FTDM_END},
+		{FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_END},
 	},
 	{
 		ZSD_INBOUND,
@@ -187,9 +202,17 @@ ftdm_state_map_t sangoma_isdn_state_map = {
 		ZSD_OUTBOUND,
 		ZSM_UNACCEPTABLE,
 		{FTDM_CHANNEL_STATE_DIALING, FTDM_END},
-		{FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROGRESS,
-		 FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_DOWN, FTDM_END}
+		{FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP,
+		 FTDM_CHANNEL_STATE_PROCEED, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP,
+		 FTDM_CHANNEL_STATE_DOWN, FTDM_END}
 	},
+	{
+		ZSD_OUTBOUND,
+		ZSM_UNACCEPTABLE,
+		{FTDM_CHANNEL_STATE_PROCEED, FTDM_END},
+		{FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP,
+		 FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_END},
+		},
 	{
 		ZSD_OUTBOUND,
 		ZSM_UNACCEPTABLE,
@@ -236,39 +259,51 @@ static __inline__ void ftdm_sangoma_isdn_advance_chan_states(ftdm_channel_t *ftd
 	}
 }
 
+static void ftdm_sangoma_isdn_process_phy_events(ftdm_span_t *span, ftdm_oob_event_t event)
+{
+	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) span->signal_data;
+	sngisdn_snd_event(signal_data->dchan, event);
+	
+	switch (event) {
+		/* Check if the span woke up from power-saving mode */
+		case FTDM_OOB_ALARM_CLEAR:
+			if (FTDM_SPAN_IS_BRI(span)) {
+				ftdm_channel_t *ftdmchan;
+				sngisdn_chan_data_t *sngisdn_info;
+				ftdm_iterator_t *chaniter = NULL;
+				ftdm_iterator_t *curr = NULL;
+								
+				chaniter = ftdm_span_get_chan_iterator(span, NULL);
+				for (curr = chaniter; curr; curr = ftdm_iterator_next(curr)) {
+					ftdmchan = (ftdm_channel_t*)ftdm_iterator_current(curr);
+					sngisdn_info = (sngisdn_chan_data_t*)ftdmchan->call_data;
+
+					if (ftdm_test_flag(sngisdn_info, FLAG_ACTIVATING)) {
+						ftdm_clear_flag(sngisdn_info, FLAG_ACTIVATING);
+
+						ftdm_sched_timer(signal_data->sched, "delayed_setup", 1000, sngisdn_delayed_setup, (void*) ftdmchan->call_data, NULL);
+					}
+				}
+				ftdm_iterator_free(chaniter);
+			}
+			break;
+		default:
+			/* Ignore other events for now */
+			break;
+	}
+}
+
 static void ftdm_sangoma_isdn_poll_events(ftdm_span_t *span)
 {
-	ftdm_status_t		ret_status;
-	ftdm_channel_t *ftdmchan;
-	ftdm_iterator_t *chaniter = NULL;
-	ftdm_iterator_t *curr = NULL;
-	
+	ftdm_status_t 	ret_status;
+		
 	ret_status = ftdm_span_poll_event(span, 0, NULL);
 	switch(ret_status) {
 		case FTDM_SUCCESS:
 			{
 				ftdm_event_t *event;
 				while (ftdm_span_next_event(span, &event) == FTDM_SUCCESS) {
-					
-					if (FTDM_SPAN_IS_BRI(span)) {
-						switch (event->enum_id) {
-							/* Check if the span woke up from power-saving mode */
-							case FTDM_OOB_ALARM_CLEAR:
-							{
-								chaniter = ftdm_span_get_chan_iterator(span, NULL);
-								for (curr = chaniter; curr; curr = ftdm_iterator_next(curr)) {
-									ftdmchan = (ftdm_channel_t*)ftdm_iterator_current(curr);
-									sngisdn_chan_data_t *sngisdn_info = ftdmchan->call_data;
-									
-									if (ftdm_test_flag(sngisdn_info, FLAG_ACTIVATING)) {
-										ftdm_clear_flag(sngisdn_info, FLAG_ACTIVATING);
-										sngisdn_snd_setup((ftdm_channel_t*)ftdmchan);
-									}
-								}
-								ftdm_iterator_free(chaniter);
-							}
-						}
-					}
+					ftdm_sangoma_isdn_process_phy_events(span, event->enum_id);
 				}
 			}
 			break;
@@ -280,9 +315,83 @@ static void ftdm_sangoma_isdn_poll_events(ftdm_span_t *span)
 	}
 }
 
+static void ftdm_sangoma_isdn_dchan_set_queue_size(ftdm_channel_t *dchan)
+{
+	ftdm_status_t 	ret_status;
+	uint32_t queue_size;
+	
+	queue_size = SNGISDN_DCHAN_QUEUE_LEN;
+	ret_status = ftdm_channel_command(dchan, FTDM_COMMAND_SET_RX_QUEUE_SIZE, &queue_size);
+	ftdm_assert(ret_status == FTDM_SUCCESS, "Failed to set Rx Queue size");
+
+	queue_size = SNGISDN_DCHAN_QUEUE_LEN;
+	ret_status = ftdm_channel_command(dchan, FTDM_COMMAND_SET_TX_QUEUE_SIZE, &queue_size);
+	ftdm_assert(ret_status == FTDM_SUCCESS, "Failed to set Tx Queue size");
+
+	RETVOID;
+}
+
+static void ftdm_sangoma_isdn_wakeup_phy(ftdm_channel_t *dchan)
+{
+	ftdm_status_t 	ret_status;
+	ftdm_channel_hw_link_status_t status = FTDM_HW_LINK_CONNECTED;
+	ret_status = ftdm_channel_command(dchan, FTDM_COMMAND_SET_LINK_STATUS, &status);
+	if (ret_status != FTDM_SUCCESS) {
+		ftdm_log_chan_msg(dchan, FTDM_LOG_WARNING, "Failed to wake-up link\n");
+	}
+	return;
+}
+
+static void *ftdm_sangoma_isdn_dchan_run(ftdm_thread_t *me, void *obj)
+{
+	uint8_t data[1000];
+	ftdm_status_t status = FTDM_SUCCESS;
+	ftdm_wait_flag_t wflags = FTDM_READ;
+	ftdm_span_t *span = (ftdm_span_t*) obj;
+	ftdm_channel_t *dchan = ((sngisdn_span_data_t*)span->signal_data)->dchan;
+	ftdm_size_t len = 0;
+	
+	ftdm_channel_set_feature(dchan, FTDM_CHANNEL_FEATURE_IO_STATS);
+	ftdm_sangoma_isdn_dchan_set_queue_size(dchan);
+
+	ftdm_assert(dchan, "Span does not have a dchannel");
+	ftdm_channel_open_chan(dchan);
+	
+	while (ftdm_running() && !(ftdm_test_flag(span, FTDM_SPAN_STOP_THREAD))) {
+		wflags = FTDM_READ;
+		status = ftdm_channel_wait(dchan, &wflags, 10000);
+		switch(status) {
+			case FTDM_FAIL:
+				ftdm_log_chan_msg(dchan, FTDM_LOG_CRIT, "Failed to wait for d-channel\n");
+				break;
+			case FTDM_TIMEOUT:
+				break;
+			case FTDM_SUCCESS:
+				if ((wflags & FTDM_READ)) {
+					len = 1000;
+					status = ftdm_channel_read(dchan, data, &len);
+					if (status == FTDM_SUCCESS) {
+						sngisdn_snd_data(dchan, data, len);
+					} else {
+						ftdm_log_chan_msg(dchan, FTDM_LOG_WARNING, "Failed to read from channel \n");
+					}
+#ifndef WIN32 /* It is valid on WIN32 for poll to return without errors, but no flags set */
+				} else {
+					ftdm_log_chan_msg(dchan, FTDM_LOG_CRIT, "Failed to poll for d-channel\n");
+#endif
+				}
+				break;
+			default:
+				ftdm_log_chan_msg(dchan, FTDM_LOG_CRIT, "Unhandled IO event\n");
+		}
+	}
+	ftdm_channel_close(&dchan);
+	return NULL;
+}
+
 static void *ftdm_sangoma_isdn_run(ftdm_thread_t *me, void *obj)
 {
-	ftdm_interrupt_t	*ftdm_sangoma_isdn_int[2];
+	ftdm_interrupt_t	*ftdm_sangoma_isdn_int[3];
 	ftdm_status_t		ret_status;
 	ftdm_span_t		*span	= (ftdm_span_t *) obj;
 	ftdm_channel_t	*ftdmchan = NULL;
@@ -300,8 +409,13 @@ static void *ftdm_sangoma_isdn_run(ftdm_thread_t *me, void *obj)
  		ftdm_log(FTDM_LOG_CRIT, "%s:Failed to get a ftdm_interrupt for span = %s!\n", span->name);
 		goto ftdm_sangoma_isdn_run_exit;
 	}
+	
+	if (ftdm_queue_get_interrupt(span->pendingsignals, &ftdm_sangoma_isdn_int[1]) != FTDM_SUCCESS) {
+		ftdm_log(FTDM_LOG_CRIT, "%s:Failed to get a signal interrupt for span = %s!\n", span->name);
+		goto ftdm_sangoma_isdn_run_exit;
+	}
 
-	if (ftdm_queue_get_interrupt(signal_data->event_queue, &ftdm_sangoma_isdn_int[1]) != FTDM_SUCCESS) {
+	if (ftdm_queue_get_interrupt(signal_data->event_queue, &ftdm_sangoma_isdn_int[2]) != FTDM_SUCCESS) {
 		ftdm_log(FTDM_LOG_CRIT, "%s:Failed to get a event interrupt for span = %s!\n", span->name);
 		goto ftdm_sangoma_isdn_run_exit;
 	}
@@ -310,8 +424,14 @@ static void *ftdm_sangoma_isdn_run(ftdm_thread_t *me, void *obj)
 
 		/* Check if there are any timers to process */
 		ftdm_sched_run(signal_data->sched);
+		ftdm_span_trigger_signals(span);
 		
-		ret_status = ftdm_interrupt_multiple_wait(ftdm_sangoma_isdn_int, 2, sleep);
+		if (ftdm_sched_get_time_to_next_timer(signal_data->sched, &sleep) == FTDM_SUCCESS) {
+			if (sleep < 0 || sleep > SNGISDN_EVENT_POLL_RATE) {
+				sleep = SNGISDN_EVENT_POLL_RATE;
+			}
+		}
+		ret_status = ftdm_interrupt_multiple_wait(ftdm_sangoma_isdn_int, 3, sleep);
 		/* find out why we returned from the interrupt queue */
 		switch (ret_status) {
 			case FTDM_SUCCESS:  /* there was a state change on the span */
@@ -327,7 +447,6 @@ static void *ftdm_sangoma_isdn_run(ftdm_thread_t *me, void *obj)
 					ftdm_sangoma_isdn_process_stack_event(span, sngisdn_event);
 					ftdm_safe_free(sngisdn_event);
 				}
-				ftdm_span_trigger_signals(span);
 				break;
 			case FTDM_TIMEOUT:
 				/* twiddle */
@@ -343,12 +462,6 @@ static void *ftdm_sangoma_isdn_run(ftdm_thread_t *me, void *obj)
 
 		/* Poll for events, e.g HW DTMF */
 		ftdm_sangoma_isdn_poll_events(span);
-		
-		if (ftdm_sched_get_time_to_next_timer(signal_data->sched, &sleep) == FTDM_SUCCESS) {
-			if (sleep < 0 || sleep > SNGISDN_EVENT_POLL_RATE) {
-				sleep = SNGISDN_EVENT_POLL_RATE;
-			}
-		}
 	}
 	
 	/* clear the IN_THREAD flag so that we know the thread is done */
@@ -512,13 +625,18 @@ static void ftdm_sangoma_isdn_process_state_change(ftdm_channel_t *ftdmchan)
 		break;
 	case FTDM_CHANNEL_STATE_GET_CALLERID:
 		{
-			sngisdn_set_flag(sngisdn_info, FLAG_SENT_PROCEED);
-			sngisdn_snd_proceed(ftdmchan);
+			if (!sngisdn_test_flag(sngisdn_info, FLAG_SENT_PROCEED)) {
+				/* By default, we do not send a progress indicator in the proceed */
+				ftdm_sngisdn_progind_t prog_ind = {SNGISDN_PROGIND_LOC_USER, SNGISDN_PROGIND_DESCR_INVALID};
+				
+				sngisdn_set_flag(sngisdn_info, FLAG_SENT_PROCEED);
+				sngisdn_snd_proceed(ftdmchan, prog_ind);
+			}
 			/* Wait in this state until we get FACILITY msg */			
 		}
 		break;
 	case FTDM_CHANNEL_STATE_RING: /* incoming call request */
-		{
+		{			
 			ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Sending incoming call from %s to %s to FTDM core\n", ftdmchan->caller_data.ani.digits, ftdmchan->caller_data.dnis.digits);
 
 			/* we have enough information to inform FTDM of the call*/
@@ -535,14 +653,37 @@ static void ftdm_sangoma_isdn_process_state_change(ftdm_channel_t *ftdmchan)
 				sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) ftdmchan->span->signal_data;
 				
 				ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Requesting Line activation\n");
-				sngisdn_set_flag(sngisdn_info, FLAG_ACTIVATING);
-				sng_isdn_wake_up_phy(ftdmchan->span);
+				sngisdn_set_flag(sngisdn_info, FLAG_ACTIVATING);				
+				ftdm_sangoma_isdn_wakeup_phy(ftdmchan);
 				ftdm_sched_timer(signal_data->sched, "timer_t3", signal_data->timer_t3*1000, sngisdn_t3_timeout, (void*) sngisdn_info, NULL);
 			} else {
 				sngisdn_snd_setup(ftdmchan);
 			}
 		}
 		break;
+	case FTDM_CHANNEL_STATE_PROCEED:
+		{
+			if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
+				/*OUTBOUND...so we were told by the line of this so noifiy the user*/
+				sigev.event_id = FTDM_SIGEVENT_PROCEED;
+				ftdm_span_send_signal(ftdmchan->span, &sigev);
+			} else {
+				if (!sngisdn_test_flag(sngisdn_info, FLAG_SENT_PROCEED)) {
+					/* By default, we do not send a progress indicator in the proceed */
+					ftdm_sngisdn_progind_t prog_ind = {SNGISDN_PROGIND_LOC_USER, SNGISDN_PROGIND_DESCR_INVALID};
+					
+					sngisdn_set_flag(sngisdn_info, FLAG_SENT_PROCEED);
+					sngisdn_snd_proceed(ftdmchan, prog_ind);
+				}
+			}
+		}
+		break;
+	case FTDM_CHANNEL_STATE_RINGING:
+		{
+			ftdm_sngisdn_progind_t prog_ind = {SNGISDN_PROGIND_LOC_USER, SNGISDN_PROGIND_DESCR_NETE_ISDN};
+			sngisdn_snd_alert(ftdmchan, prog_ind);
+		}
+		break;
 	case FTDM_CHANNEL_STATE_PROGRESS:
 		{
 			/*check if the channel is inbound or outbound*/
@@ -550,9 +691,13 @@ static void ftdm_sangoma_isdn_process_state_change(ftdm_channel_t *ftdmchan)
 				/*OUTBOUND...so we were told by the line of this so noifiy the user*/
 				sigev.event_id = FTDM_SIGEVENT_PROGRESS;
 				ftdm_span_send_signal(ftdmchan->span, &sigev);
-			} else if (!sngisdn_test_flag(sngisdn_info, FLAG_SENT_PROCEED)) {
-				sngisdn_set_flag(sngisdn_info, FLAG_SENT_PROCEED);
-				sngisdn_snd_proceed(ftdmchan);
+			} else {
+				/* If we already sent a PROCEED before, do not send a PROGRESS as there is nothing to indicate to the remote switch */
+				if (ftdmchan->last_state != FTDM_CHANNEL_STATE_PROCEED) {
+					/* Send a progress message, indicating: Call is not end-to-end ISDN, further call progress may be available */
+					ftdm_sngisdn_progind_t prog_ind = {SNGISDN_PROGIND_LOC_USER, SNGISDN_PROGIND_DESCR_NETE_ISDN};
+					sngisdn_snd_progress(ftdmchan, prog_ind);
+				}
 			}
 		}
 		break;
@@ -562,7 +707,9 @@ static void ftdm_sangoma_isdn_process_state_change(ftdm_channel_t *ftdmchan)
 				sigev.event_id = FTDM_SIGEVENT_PROGRESS_MEDIA;
 				ftdm_span_send_signal(ftdmchan->span, &sigev);
 			} else {
-				sngisdn_snd_progress(ftdmchan);
+				/* Send a progress message, indicating: In-band information/pattern available */
+				ftdm_sngisdn_progind_t prog_ind = {SNGISDN_PROGIND_LOC_USER, SNGISDN_PROGIND_DESCR_IB_AVAIL};
+				sngisdn_snd_progress(ftdmchan, prog_ind);
 			}
 		}
 		break; 
@@ -633,7 +780,7 @@ static void ftdm_sangoma_isdn_process_state_change(ftdm_channel_t *ftdmchan)
 					sngisdn_snd_release(ftdmchan, 0);
 
 					if (!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_SIG_UP)) {
-						sng_isdn_set_avail_rate(ftdmchan->span, SNGISDN_AVAIL_DOWN);
+						sngisdn_set_avail_rate(ftdmchan->span, SNGISDN_AVAIL_DOWN);
 					}
 				} else {
 					sngisdn_snd_disconnect(ftdmchan);
@@ -658,9 +805,7 @@ static void ftdm_sangoma_isdn_process_state_change(ftdm_channel_t *ftdmchan)
 		break;
 	case FTDM_CHANNEL_STATE_DOWN: /* the call is finished and removed */
 		{
-			uint8_t glare = 0;
-
-			glare = sngisdn_test_flag(sngisdn_info, FLAG_GLARE);
+			uint8_t glare = sngisdn_test_flag(sngisdn_info, FLAG_GLARE);
 			/* clear all of the call specific data store in the channel structure */
 			clear_call_data(sngisdn_info);
 
@@ -712,6 +857,26 @@ static void ftdm_sangoma_isdn_process_state_change(ftdm_channel_t *ftdmchan)
 	return;
 }
 
+static FIO_CHANNEL_SEND_MSG_FUNCTION(ftdm_sangoma_isdn_send_msg)
+{
+	ftdm_status_t status = FTDM_FAIL;
+
+	switch (sigmsg->event_id) {
+		case FTDM_SIGEVENT_RESTART:
+			/* TODO: Send a channel restart here */
+			/* Implement me */
+			break;
+		case FTDM_SIGEVENT_FACILITY:
+			sngisdn_snd_fac_req(ftdmchan);
+			break;
+		default:
+			ftdm_log_chan_msg(ftdmchan, FTDM_LOG_WARNING, "Unsupported signalling msg requested\n");
+			status = FTDM_BREAK;
+	}
+	ftdm_call_clear_data(&ftdmchan->caller_data);
+	return status;
+}
+
 static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(ftdm_sangoma_isdn_outgoing_call)
 {
 	sngisdn_chan_data_t  *sngisdn_info = ftdmchan->call_data;
@@ -788,7 +953,7 @@ static FIO_SPAN_SET_SIG_STATUS_FUNCTION(ftdm_sangoma_isdn_set_span_sig_status)
 static ftdm_status_t ftdm_sangoma_isdn_start(ftdm_span_t *span)
 {	
 	ftdm_log(FTDM_LOG_INFO,"Starting span %s:%u.\n",span->name,span->span_id);
-	if (sng_isdn_stack_start(span) != FTDM_SUCCESS) {
+	if (sngisdn_stack_start(span) != FTDM_SUCCESS) {
 		ftdm_log(FTDM_LOG_CRIT, "Failed to start span %s\n", span->name);
 		return FTDM_FAIL;
 	}
@@ -802,6 +967,12 @@ static ftdm_status_t ftdm_sangoma_isdn_start(ftdm_span_t *span)
 		return FTDM_FAIL;
 	}
 
+	/*start the dchan monitor thread*/
+	if (ftdm_thread_create_detached(ftdm_sangoma_isdn_dchan_run, span) != FTDM_SUCCESS) {
+		ftdm_log(FTDM_LOG_CRIT,"Failed to start Sangoma ISDN d-channel Monitor Thread!\n");
+		return FTDM_FAIL;
+	}
+
 	ftdm_log(FTDM_LOG_DEBUG,"Finished starting span %s\n", span->name);
 	return FTDM_SUCCESS;
 }
@@ -823,7 +994,7 @@ static ftdm_status_t ftdm_sangoma_isdn_stop(ftdm_span_t *span)
 		ftdm_sleep(10);
 	}
 
-	if (sng_isdn_stack_stop(span) != FTDM_SUCCESS) {
+	if (sngisdn_stack_stop(span) != FTDM_SUCCESS) {
 		ftdm_log(FTDM_LOG_CRIT, "Failed to stop span %s\n", span->name);
 	}
 	
@@ -875,7 +1046,7 @@ static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_sangoma_isdn_span_config)
 		return FTDM_FAIL;
 	}
 
-	if (sng_isdn_stack_cfg(span) != FTDM_SUCCESS) {
+	if (sngisdn_stack_cfg(span) != FTDM_SUCCESS) {
 		ftdm_log(FTDM_LOG_CRIT, "Sangoma ISDN Stack configuration failed\n");
 		return FTDM_FAIL;
 	}
@@ -885,6 +1056,7 @@ static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_sangoma_isdn_span_config)
 	span->stop = ftdm_sangoma_isdn_stop;
 	span->signal_type = FTDM_SIGTYPE_ISDN;
 	span->outgoing_call = ftdm_sangoma_isdn_outgoing_call;
+	span->send_msg = ftdm_sangoma_isdn_send_msg;
 	span->channel_request = NULL;
 	span->signal_cb	= sig_cb;
 	span->get_channel_sig_status = ftdm_sangoma_isdn_get_chan_sig_status;
@@ -894,11 +1066,13 @@ static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_sangoma_isdn_span_config)
 	span->state_map	= &sangoma_isdn_state_map;
 	ftdm_set_flag(span, FTDM_SPAN_USE_CHAN_QUEUE);
 	ftdm_set_flag(span, FTDM_SPAN_USE_SIGNALS_QUEUE);
+	ftdm_set_flag(span, FTDM_SPAN_USE_PROCEED_STATE);
+	ftdm_set_flag(span, FTDM_SPAN_USE_SKIP_STATES);
 
 	if (span->trunk_type == FTDM_TRUNK_BRI_PTMP ||
 		span->trunk_type == FTDM_TRUNK_BRI) {
 		
-		sng_isdn_set_avail_rate(span, SNGISDN_AVAIL_PWR_SAVING);
+		sngisdn_set_avail_rate(span, SNGISDN_AVAIL_PWR_SAVING);
 	}
 
 	/* Initialize scheduling context */
@@ -917,7 +1091,7 @@ static FIO_SIG_LOAD_FUNCTION(ftdm_sangoma_isdn_init)
 	ftdm_log(FTDM_LOG_INFO, "Loading ftmod_sangoma_isdn...\n");
 
 	memset(&g_sngisdn_data, 0, sizeof(g_sngisdn_data));
-
+	memset(&g_sngisdn_event_interface, 0, sizeof(g_sngisdn_event_interface));
 	/* set callbacks */
 	g_sngisdn_event_interface.cc.sng_con_ind 	= sngisdn_rcv_con_ind;
 	g_sngisdn_event_interface.cc.sng_con_cfm 	= sngisdn_rcv_con_cfm;
@@ -946,8 +1120,11 @@ static FIO_SIG_LOAD_FUNCTION(ftdm_sangoma_isdn_init)
 	g_sngisdn_event_interface.sta.sng_q921_trc_ind	= sngisdn_rcv_q921_trace;
 	g_sngisdn_event_interface.sta.sng_q931_sta_ind	= sngisdn_rcv_q931_ind;
 	g_sngisdn_event_interface.sta.sng_q931_trc_ind	= sngisdn_rcv_q931_trace;
-	g_sngisdn_event_interface.sta.sng_cc_sta_ind	= sngisdn_rcv_cc_ind;	
+	g_sngisdn_event_interface.sta.sng_cc_sta_ind	= sngisdn_rcv_cc_ind;
 
+	g_sngisdn_event_interface.io.sng_l1_data_req	= sngisdn_rcv_l1_data_req;
+	g_sngisdn_event_interface.io.sng_l1_cmd_req		= sngisdn_rcv_l1_cmd_req;
+	
 	for(i=1;i<=MAX_VARIANTS;i++) {		
 		ftdm_mutex_create(&g_sngisdn_data.ccs[i].mutex);
 	}
@@ -1008,11 +1185,11 @@ static FIO_API_FUNCTION(ftdm_sangoma_isdn_api)
 			goto done;
 		}
 		if (!strcasecmp(trace_opt, "q921")) {
-			sng_isdn_activate_trace(span, SNGISDN_TRACE_Q921);
+			sngisdn_activate_trace(span, SNGISDN_TRACE_Q921);
 		} else if (!strcasecmp(trace_opt, "q931")) {
-			sng_isdn_activate_trace(span, SNGISDN_TRACE_Q931);
+			sngisdn_activate_trace(span, SNGISDN_TRACE_Q931);
 		} else if (!strcasecmp(trace_opt, "disable")) {
-			sng_isdn_activate_trace(span, SNGISDN_TRACE_DISABLE);
+			sngisdn_activate_trace(span, SNGISDN_TRACE_DISABLE);
 		} else {
 			stream->write_function(stream, "-ERR invalid trace option <q921|q931> <span name>\n");
 		}	
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
index 2a65a82985..f15eff9200 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
@@ -60,9 +60,37 @@
 #define SNGISDN_EVENT_QUEUE_SIZE	100
 #define SNGISDN_EVENT_POLL_RATE		100
 #define SNGISDN_NUM_LOCAL_NUMBERS	8
+#define SNGISDN_DCHAN_QUEUE_LEN		200
 
 /* TODO: rename all *_cc_* to *_an_*  */
 
+#define SNGISDN_ENUM_NAMES(_NAME, _STRINGS) static const char * _NAME [] = { _STRINGS , NULL };
+#define SNGISDN_STR2ENUM_P(_FUNC1, _FUNC2, _TYPE) _TYPE _FUNC1 (const char *name); const char * _FUNC2 (_TYPE type);
+#define SNGISDN_STR2ENUM(_FUNC1, _FUNC2, _TYPE, _STRINGS, _MAX)    \
+        _TYPE _FUNC1 (const char *name)                                                         \
+{                                                                                                               \
+                int i;                                                                                          \
+                _TYPE t = _MAX ;                                                                        \
+                                                                                                                        \
+                for (i = 0; i < _MAX ; i++) {                                           \
+                        if (!strcasecmp(name, _STRINGS[i])) {                   \
+                                t = (_TYPE) i;                                                          \
+                                break;                                                                          \
+}                                                                                               \
+}                                                                                                       \
+                                                                                                                        \
+                return t;                                                                                       \
+}                                                                                                               \
+        const char * _FUNC2 (_TYPE type)                                                \
+{                                                                                                               \
+                if (type > _MAX) {                                                                      \
+                        type = _MAX;                                                                    \
+}                                                                                                       \
+                return _STRINGS[(int)type];                                                     \
+}                                                                                                               \
+
+
+
 typedef enum {
 	FLAG_RESET_RX           = (1 << 0),
 	FLAG_RESET_TX           = (1 << 1),
@@ -74,7 +102,8 @@ typedef enum {
 	FLAG_DELAYED_REL        = (1 << 7),
 	FLAG_SENT_PROCEED       = (1 << 8),
 	FLAG_SEND_DISC  		= (1 << 9),
-	FLAG_ACTIVATING			= (1 << 10), /* Used for BRI only, flag is set after we request line CONNECTED */
+	/* Used for BRI only, flag is set after we request line CONNECTED */
+	FLAG_ACTIVATING			= (1 << 10), 
 } sngisdn_flag_t;
 
 
@@ -134,6 +163,51 @@ typedef enum {
 	SNGISDN_EVENT_RST_IND,
 } ftdm_sngisdn_event_id_t;
 
+typedef enum {
+	/* Call is not end-to-end ISDN */
+	SNGISDN_PROGIND_DESCR_NETE_ISDN,
+	/* Destination address is non-ISDN */
+	SNGISDN_PROGIND_DESCR_DEST_NISDN,
+	/* Origination address is non-ISDN */
+	SNGISDN_PROGIND_DESCR_ORIG_NISDN,
+	/* Call has returned to the ISDN */
+	SNGISDN_PROGIND_DESCR_RET_ISDN,
+	/* Interworking as occured and has resulted in a telecommunication service change */
+	SNGISDN_PROGIND_DESCR_SERV_CHANGE,
+	/* In-band information or an appropriate pattern is now available */
+	SNGISDN_PROGIND_DESCR_IB_AVAIL,
+	/* Invalid */
+	SNGISDN_PROGIND_DESCR_INVALID,
+} ftdm_sngisdn_progind_descr_t;
+#define SNGISDN_PROGIND_DESCR_STRINGS "not-end-to-end-isdn", "destination-is-non-isdn", "origination-is-non-isdn", "call-returned-to-isdn", "service-change", "inband-info-available", "invalid"
+SNGISDN_STR2ENUM_P(ftdm_str2ftdm_sngisdn_progind_descr, ftdm_sngisdn_progind_descr2str, ftdm_sngisdn_progind_descr_t);
+
+typedef enum {
+	/* User */
+	SNGISDN_PROGIND_LOC_USER,
+	/* Private network serving the local user */
+	SNGISDN_PROGIND_LOC_PRIV_NET_LOCAL_USR,
+	/* Public network serving the local user */
+	SNGISDN_PROGIND_LOC_PUB_NET_LOCAL_USR,
+	/* Transit network */
+	SNGISDN_PROGIND_LOC_TRANSIT_NET,
+	/* Public network serving remote user */
+	SNGISDN_PROGIND_LOC_PUB_NET_REMOTE_USR,
+	/* Private network serving remote user */
+	SNGISDN_PROGIND_LOC_PRIV_NET_REMOTE_USR,
+	/* Network beyond the interworking point */
+	SNGISDN_PROGIND_LOC_NET_BEYOND_INTRW,
+	/* Invalid */
+	SNGISDN_PROGIND_LOC_INVALID,
+} ftdm_sngisdn_progind_loc_t;
+#define SNGISDN_PROGIND_LOC_STRINGS "user", "private-net-local-user", "public-net-local-user", "transit-network", "public-net-remote-user", "private-net-remote-user", "beyond-interworking", "invalid"
+SNGISDN_STR2ENUM_P(ftdm_str2ftdm_sngisdn_progind_loc, ftdm_sngisdn_progind_loc2str, ftdm_sngisdn_progind_loc_t);
+
+typedef struct ftdm_sngisdn_prog_ind {
+	ftdm_sngisdn_progind_loc_t loc;		/* location */
+	ftdm_sngisdn_progind_descr_t descr;	/* description */
+} ftdm_sngisdn_progind_t;
+
 /* Only timers that can be cancelled are listed here */
 #define SNGISDN_NUM_TIMERS 1
 /* Increase NUM_TIMERS as number of ftdm_sngisdn_timer_t increases */
@@ -168,6 +242,7 @@ typedef struct sngisdn_chan_data {
 /* Span specific data */
 typedef struct sngisdn_span_data {
 	ftdm_span_t		*ftdm_span;
+	ftdm_channel_t	*dchan;
 	uint8_t			link_id;
 	uint8_t 		switchtype;
 	uint8_t			signalling;			/* SNGISDN_SIGNALING_CPE or SNGISDN_SIGNALING_NET */
@@ -179,10 +254,13 @@ typedef struct sngisdn_span_data {
 	uint8_t			trace_flags;		/* TODO: change to flags, so we can use ftdm_test_flag etc.. */
 	uint8_t			overlap_dial;
 	uint8_t			setup_arb;
+	uint8_t			facility_ie_decode;
 	uint8_t			facility;
 	int8_t			facility_timeout;
 	uint8_t			num_local_numbers;
+	uint8_t 		ignore_cause_value;
 	uint8_t			timer_t3;
+	uint8_t			restart_opt;
 	char*			local_numbers[SNGISDN_NUM_LOCAL_NUMBERS];
 	ftdm_sched_t 	*sched;
 	ftdm_queue_t 	*event_queue;
@@ -268,60 +346,58 @@ extern ftdm_sngisdn_data_t	g_sngisdn_data;
 ftdm_status_t ftmod_isdn_parse_cfg(ftdm_conf_parameter_t *ftdm_parameters, ftdm_span_t *span);
 
 /* Support functions */
-FT_DECLARE(uint32_t) get_unique_suInstId(int16_t cc_id);
-FT_DECLARE(void) clear_call_data(sngisdn_chan_data_t *sngisdn_info);
-FT_DECLARE(void) clear_call_glare_data(sngisdn_chan_data_t *sngisdn_info);
+uint32_t get_unique_suInstId(int16_t cc_id);
+void clear_call_data(sngisdn_chan_data_t *sngisdn_info);
+void clear_call_glare_data(sngisdn_chan_data_t *sngisdn_info);
+ftdm_status_t get_ftdmchan_by_suInstId(int16_t cc_id, uint32_t suInstId, sngisdn_chan_data_t **sngisdn_data);
+ftdm_status_t get_ftdmchan_by_spInstId(int16_t cc_id, uint32_t spInstId, sngisdn_chan_data_t **sngisdn_data);
+
+
+ftdm_status_t sngisdn_set_avail_rate(ftdm_span_t *span, sngisdn_avail_t avail);
+ftdm_status_t sngisdn_activate_trace(ftdm_span_t *span, sngisdn_tracetype_t trace_opt);
 
 
 void stack_hdr_init(Header *hdr);
 void stack_pst_init(Pst *pst);
 
-FT_DECLARE(ftdm_status_t) get_ftdmchan_by_spInstId(int16_t cc_id, uint32_t spInstId, sngisdn_chan_data_t **sngisdn_data);
-FT_DECLARE(ftdm_status_t) get_ftdmchan_by_suInstId(int16_t cc_id, uint32_t suInstId, sngisdn_chan_data_t **sngisdn_data);
-FT_DECLARE(ftdm_status_t) sng_isdn_set_avail_rate(ftdm_span_t *ftdmspan, sngisdn_avail_t avail);
-
-FT_DECLARE(ftdm_status_t) cpy_calling_num_from_stack(ftdm_caller_data_t *ftdm, CgPtyNmb *cgPtyNmb);
-FT_DECLARE(ftdm_status_t) cpy_called_num_from_stack(ftdm_caller_data_t *ftdm, CdPtyNmb *cdPtyNmb);
-FT_DECLARE(ftdm_status_t) cpy_redir_num_from_stack(ftdm_caller_data_t *ftdm, RedirNmb *redirNmb);
-FT_DECLARE(ftdm_status_t) cpy_calling_name_from_stack(ftdm_caller_data_t *ftdm, Display *display);
-
-FT_DECLARE(ftdm_status_t) cpy_calling_num_from_user(CgPtyNmb *cgPtyNmb, ftdm_caller_data_t *ftdm);
-FT_DECLARE(ftdm_status_t) cpy_called_num_from_user(CdPtyNmb *cdPtyNmb, ftdm_caller_data_t *ftdm);
-FT_DECLARE(ftdm_status_t) cpy_redir_num_from_user(RedirNmb *redirNmb, ftdm_caller_data_t *ftdm);
-FT_DECLARE(ftdm_status_t) cpy_calling_name_from_user(ConEvnt *conEvnt, ftdm_channel_t *ftdmchan);
-
 /* Outbound Call Control functions */
 void sngisdn_snd_setup(ftdm_channel_t *ftdmchan);
 void sngisdn_snd_setup_ack(ftdm_channel_t *ftdmchan);
-void sngisdn_snd_proceed(ftdm_channel_t *ftdmchan);
-void sngisdn_snd_progress(ftdm_channel_t *ftdmchan);
-void sngisdn_snd_alert(ftdm_channel_t *ftdmchan);
+void sngisdn_snd_proceed(ftdm_channel_t *ftdmchan, ftdm_sngisdn_progind_t prog_ind);
+void sngisdn_snd_progress(ftdm_channel_t *ftdmchan, ftdm_sngisdn_progind_t prog_ind);
+void sngisdn_snd_alert(ftdm_channel_t *ftdmchan, ftdm_sngisdn_progind_t prog_ind);
 void sngisdn_snd_connect(ftdm_channel_t *ftdmchan);
 void sngisdn_snd_disconnect(ftdm_channel_t *ftdmchan);
 void sngisdn_snd_release(ftdm_channel_t *ftdmchan, uint8_t glare);
 void sngisdn_snd_reset(ftdm_channel_t *ftdmchan);
 void sngisdn_snd_con_complete(ftdm_channel_t *ftdmchan);
+void sngisdn_snd_fac_req(ftdm_channel_t *ftdmchan);
 void sngisdn_snd_info_req(ftdm_channel_t *ftdmchan);
 void sngisdn_snd_status_enq(ftdm_channel_t *ftdmchan);
+void sngisdn_snd_data(ftdm_channel_t *dchan, uint8_t *data, ftdm_size_t len);
+void sngisdn_snd_event(ftdm_channel_t *dchan, ftdm_oob_event_t event);
 
 /* Inbound Call Control functions */
-void sngisdn_rcv_con_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, ConEvnt *conEvnt, int16_t dChan, uint8_t ces);
-void sngisdn_rcv_con_cfm (int16_t suId, uint32_t suInstId, uint32_t spInstId, CnStEvnt *cnStEvnt, int16_t dChan, uint8_t ces);
-void sngisdn_rcv_cnst_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, CnStEvnt *cnStEvnt, uint8_t evntType, int16_t dChan, uint8_t ces);
-void sngisdn_rcv_disc_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, DiscEvnt *discEvnt);
-void sngisdn_rcv_rel_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, RelEvnt *relEvnt);
-void sngisdn_rcv_dat_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, InfoEvnt *infoEvnt);
-void sngisdn_rcv_sshl_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, SsHlEvnt *ssHlEvnt, uint8_t action);
-void sngisdn_rcv_sshl_cfm (int16_t suId, uint32_t suInstId, uint32_t spInstId, SsHlEvnt *ssHlEvnt, uint8_t action);
-void sngisdn_rcv_rmrt_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, RmRtEvnt *rmRtEvnt, uint8_t action);
-void sngisdn_rcv_rmrt_cfm (int16_t suId, uint32_t suInstId, uint32_t spInstId, RmRtEvnt *rmRtEvnt, uint8_t action);
-void sngisdn_rcv_flc_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, StaEvnt *staEvnt);
-void sngisdn_rcv_fac_ind (int16_t suId, uint32_t suInstId, uint32_t spInstId, FacEvnt *facEvnt, uint8_t evntType, int16_t dChan, uint8_t ces);
-void sngisdn_rcv_sta_cfm ( int16_t suId, uint32_t suInstId, uint32_t spInstId, StaEvnt *staEvnt);
-void sngisdn_rcv_srv_ind ( int16_t suId, Srv *srvEvnt, int16_t dChan, uint8_t ces);
-void sngisdn_rcv_srv_cfm ( int16_t suId, Srv *srvEvnt, int16_t dChan, uint8_t ces);
-void sngisdn_rcv_rst_cfm ( int16_t suId, Rst *rstEvnt, int16_t dChan, uint8_t ces, uint8_t evntType);
-void sngisdn_rcv_rst_ind ( int16_t suId, Rst *rstEvnt, int16_t dChan, uint8_t ces, uint8_t evntType);
+void sngisdn_rcv_con_ind(int16_t suId, uint32_t suInstId, uint32_t spInstId, ConEvnt *conEvnt, int16_t dChan, uint8_t ces);
+void sngisdn_rcv_con_cfm(int16_t suId, uint32_t suInstId, uint32_t spInstId, CnStEvnt *cnStEvnt, int16_t dChan, uint8_t ces);
+void sngisdn_rcv_cnst_ind(int16_t suId, uint32_t suInstId, uint32_t spInstId, CnStEvnt *cnStEvnt, uint8_t evntType, int16_t dChan, uint8_t ces);
+void sngisdn_rcv_disc_ind(int16_t suId, uint32_t suInstId, uint32_t spInstId, DiscEvnt *discEvnt);
+void sngisdn_rcv_rel_ind(int16_t suId, uint32_t suInstId, uint32_t spInstId, RelEvnt *relEvnt);
+void sngisdn_rcv_dat_ind(int16_t suId, uint32_t suInstId, uint32_t spInstId, InfoEvnt *infoEvnt);
+void sngisdn_rcv_sshl_ind(int16_t suId, uint32_t suInstId, uint32_t spInstId, SsHlEvnt *ssHlEvnt, uint8_t action);
+void sngisdn_rcv_sshl_cfm(int16_t suId, uint32_t suInstId, uint32_t spInstId, SsHlEvnt *ssHlEvnt, uint8_t action);
+void sngisdn_rcv_rmrt_ind(int16_t suId, uint32_t suInstId, uint32_t spInstId, RmRtEvnt *rmRtEvnt, uint8_t action);
+void sngisdn_rcv_rmrt_cfm(int16_t suId, uint32_t suInstId, uint32_t spInstId, RmRtEvnt *rmRtEvnt, uint8_t action);
+void sngisdn_rcv_flc_ind(int16_t suId, uint32_t suInstId, uint32_t spInstId, StaEvnt *staEvnt);
+void sngisdn_rcv_fac_ind(int16_t suId, uint32_t suInstId, uint32_t spInstId, FacEvnt *facEvnt, uint8_t evntType, int16_t dChan, uint8_t ces);
+void sngisdn_rcv_sta_cfm(int16_t suId, uint32_t suInstId, uint32_t spInstId, StaEvnt *staEvnt);
+void sngisdn_rcv_srv_ind(int16_t suId, Srv *srvEvnt, int16_t dChan, uint8_t ces);
+void sngisdn_rcv_srv_cfm(int16_t suId, Srv *srvEvnt, int16_t dChan, uint8_t ces);
+void sngisdn_rcv_rst_cfm(int16_t suId, Rst *rstEvnt, int16_t dChan, uint8_t ces, uint8_t evntType);
+void sngisdn_rcv_rst_ind(int16_t suId, Rst *rstEvnt, int16_t dChan, uint8_t ces, uint8_t evntType);
+int16_t sngisdn_rcv_l1_data_req(uint16_t spId, sng_l1_frame_t *l1_frame);
+int16_t sngisdn_rcv_l1_cmd_req(uint16_t spId, sng_l1_cmd_t *l1_cmd);
+
 
 void sngisdn_process_con_ind (sngisdn_event_data_t *sngisdn_event);
 void sngisdn_process_con_cfm (sngisdn_event_data_t *sngisdn_event);
@@ -359,6 +435,28 @@ void sngisdn_rcv_cc_ind(CcMngmt *status);
 void sngisdn_rcv_sng_log(uint8_t level, char *fmt,...);
 void sngisdn_rcv_sng_assert(char *message);
 
+ftdm_status_t get_calling_num(ftdm_channel_t *ftdmchan, CgPtyNmb *cgPtyNmb);
+ftdm_status_t get_calling_num2(ftdm_channel_t *ftdmchan, CgPtyNmb *cgPtyNmb);
+ftdm_status_t get_called_num(ftdm_channel_t *ftdmchan, CdPtyNmb *cdPtyNmb);
+ftdm_status_t get_redir_num(ftdm_channel_t *ftdmchan, RedirNmb *redirNmb);
+ftdm_status_t get_calling_name_from_display(ftdm_channel_t *ftdmchan, Display *display);
+ftdm_status_t get_calling_name_from_usr_usr(ftdm_channel_t *ftdmchan, UsrUsr *usrUsr);
+ftdm_status_t get_calling_subaddr(ftdm_channel_t *ftdmchan, CgPtySad *cgPtySad);
+ftdm_status_t get_prog_ind_ie(ftdm_channel_t *ftdmchan, ProgInd *progInd);
+ftdm_status_t get_facility_ie(ftdm_channel_t *ftdmchan, FacilityStr *facilityStr);
+ftdm_status_t get_facility_ie_str(ftdm_channel_t *ftdmchan, uint8_t *data, uint8_t data_len);
+
+ftdm_status_t set_calling_num(ftdm_channel_t *ftdmchan, CgPtyNmb *cgPtyNmb);
+ftdm_status_t set_calling_num2(ftdm_channel_t *ftdmchan, CgPtyNmb *cgPtyNmb);
+ftdm_status_t set_called_num(ftdm_channel_t *ftdmchan, CdPtyNmb *cdPtyNmb);
+ftdm_status_t set_redir_num(ftdm_channel_t *ftdmchan, RedirNmb *redirNmb);
+ftdm_status_t set_calling_name(ftdm_channel_t *ftdmchan, ConEvnt *conEvnt);
+ftdm_status_t set_calling_subaddr(ftdm_channel_t *ftdmchan, CgPtySad *cgPtySad);
+ftdm_status_t set_prog_ind_ie(ftdm_channel_t *ftdmchan, ProgInd *progInd, ftdm_sngisdn_progind_t prog_ind);
+ftdm_status_t set_facility_ie(ftdm_channel_t *ftdmchan, FacilityStr *facilityStr);
+ftdm_status_t set_facility_ie_str(ftdm_channel_t *ftdmchan, uint8_t *data, uint8_t *data_len);
+
+		
 uint8_t sngisdn_get_infoTranCap_from_stack(ftdm_bearer_cap_t bearer_capability);
 uint8_t sngisdn_get_usrInfoLyr1Prot_from_stack(ftdm_user_layer1_prot_t layer1_prot);
 ftdm_bearer_cap_t sngisdn_get_infoTranCap_from_user(uint8_t bearer_capability);
@@ -385,6 +483,7 @@ static __inline__ void sngisdn_set_flag(sngisdn_chan_data_t *sngisdn_info, sngis
 
 void handle_sng_log(uint8_t level, char *fmt,...);
 void sngisdn_set_span_sig_status(ftdm_span_t *ftdmspan, ftdm_signaling_status_t status);
+void sngisdn_delayed_setup(void* p_sngisdn_info);
 void sngisdn_delayed_release(void* p_sngisdn_info);
 void sngisdn_delayed_connect(void* p_sngisdn_info);
 void sngisdn_delayed_disconnect(void* p_sngisdn_info);
@@ -392,10 +491,10 @@ void sngisdn_facility_timeout(void* p_sngisdn_info);
 void sngisdn_t3_timeout(void* p_sngisdn_info);
 
 /* Stack management functions */
-ftdm_status_t sng_isdn_stack_cfg(ftdm_span_t *span);
-ftdm_status_t sng_isdn_stack_start(ftdm_span_t *span);
-ftdm_status_t sng_isdn_stack_stop(ftdm_span_t *span);
-ftdm_status_t sng_isdn_wake_up_phy(ftdm_span_t *span);
+ftdm_status_t sngisdn_stack_cfg(ftdm_span_t *span);
+ftdm_status_t sngisdn_stack_start(ftdm_span_t *span);
+ftdm_status_t sngisdn_stack_stop(ftdm_span_t *span);
+ftdm_status_t sngisdn_wake_up_phy(ftdm_span_t *span);
 
 void sngisdn_print_phy_stats(ftdm_stream_handle_t *stream, ftdm_span_t *span);
 void sngisdn_print_spans(ftdm_stream_handle_t *stream);
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c
index 18ca9c38dd..cce10cc1dd 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c
@@ -34,13 +34,24 @@
 
 #include "ftmod_sangoma_isdn.h"
 
-ftdm_status_t parse_switchtype(const char* switch_name, ftdm_span_t *span);
-ftdm_status_t parse_signalling(const char* signalling, ftdm_span_t *span);
-ftdm_status_t add_local_number(const char* val, ftdm_span_t *span);
+static ftdm_status_t parse_switchtype(const char* switch_name, ftdm_span_t *span);
+static ftdm_status_t parse_signalling(const char* signalling, ftdm_span_t *span);
+static ftdm_status_t add_local_number(const char* val, ftdm_span_t *span);
+static ftdm_status_t parse_yesno(const char* var, const char* val, uint8_t *target);
 
 extern ftdm_sngisdn_data_t	g_sngisdn_data;
 
-ftdm_status_t add_local_number(const char* val, ftdm_span_t *span)
+static ftdm_status_t parse_yesno(const char* var, const char* val, uint8_t *target)
+{
+	if (ftdm_true(val)) {
+		*target = SNGISDN_OPT_TRUE; 
+	} else {
+		*target = SNGISDN_OPT_FALSE;
+	}
+	return FTDM_SUCCESS;
+}
+
+static ftdm_status_t add_local_number(const char* val, ftdm_span_t *span)
 {
 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) span->signal_data;
 
@@ -53,12 +64,14 @@ ftdm_status_t add_local_number(const char* val, ftdm_span_t *span)
 	return FTDM_SUCCESS;
 }
 
-ftdm_status_t parse_switchtype(const char* switch_name, ftdm_span_t *span)
+static ftdm_status_t parse_switchtype(const char* switch_name, ftdm_span_t *span)
 {
 	unsigned i;
-
+	ftdm_iterator_t *chaniter = NULL;
+	ftdm_iterator_t *curr = NULL;	
 	sngisdn_dchan_data_t *dchan_data;
 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) span->signal_data;
+	
 	switch(span->trunk_type) {
 		case FTDM_TRUNK_T1:
 			if (!strcasecmp(switch_name, "ni2") ||
@@ -124,9 +137,9 @@ ftdm_status_t parse_switchtype(const char* switch_name, ftdm_span_t *span)
 	/* add this span to its ent_cc */
 	signal_data->cc_id = i;
 
-	/* create a new dchan */ /* for NFAS - no-dchan on b-channels only links */
+	/* create a new dchan */ /* for NFAS - no-dchan on b-channels-only links */
 	g_sngisdn_data.num_dchan++;
-	signal_data->dchan_id =  g_sngisdn_data.num_dchan;
+	signal_data->dchan_id = g_sngisdn_data.num_dchan;
 
 	dchan_data = &g_sngisdn_data.dchans[signal_data->dchan_id];
 	dchan_data->num_spans++;
@@ -138,20 +151,27 @@ ftdm_status_t parse_switchtype(const char* switch_name, ftdm_span_t *span)
 	
 	ftdm_log(FTDM_LOG_DEBUG, "%s: cc_id:%d dchan_id:%d span_id:%d\n", span->name, signal_data->cc_id, signal_data->dchan_id, signal_data->span_id);
 
-	/* Add the channels to the span */
-	for (i=1;i<=span->chan_count;i++) {
-		unsigned chan_id;
-		ftdm_channel_t *ftdmchan = span->channels[i];
-		/* NFAS is not supported on E1, so span_id will always be 1 for E1 so this will work for E1 as well */
-		chan_id = ((signal_data->span_id-1)*NUM_T1_CHANNELS_PER_SPAN)+ftdmchan->physical_chan_id;
-		dchan_data->channels[chan_id] = (sngisdn_chan_data_t*)ftdmchan->call_data;
-		dchan_data->num_chans++;
+	
+	chaniter = ftdm_span_get_chan_iterator(span, NULL);
+	for (curr = chaniter; curr; curr = ftdm_iterator_next(curr)) {
+		int32_t chan_id;
+		ftdm_channel_t *ftdmchan = (ftdm_channel_t*)ftdm_iterator_current(curr);
+		if (ftdmchan->type == FTDM_CHAN_TYPE_DQ921) {
+			/* set the d-channel */
+			signal_data->dchan = ftdmchan;
+		} else {
+			/* Add the channels to the span */
+			/* NFAS is not supported on E1, so span_id will always be 1 for E1 so this will work for E1 as well */
+			chan_id = ((signal_data->span_id-1)*NUM_T1_CHANNELS_PER_SPAN)+ftdmchan->physical_chan_id;
+			dchan_data->channels[chan_id] = (sngisdn_chan_data_t*)ftdmchan->call_data;
+			dchan_data->num_chans++;
+		}
 	}
-
+	ftdm_iterator_free(chaniter);
 	return FTDM_SUCCESS;
 }
 
-ftdm_status_t parse_signalling(const char* signalling, ftdm_span_t *span)
+static ftdm_status_t parse_signalling(const char* signalling, ftdm_span_t *span)
 {
 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) span->signal_data;
 	if (!strcasecmp(signalling, "net") ||
@@ -181,7 +201,10 @@ ftdm_status_t ftmod_isdn_parse_cfg(ftdm_conf_parameter_t *ftdm_parameters, ftdm_
 	signal_data->min_digits = 8;
 	signal_data->overlap_dial = SNGISDN_OPT_DEFAULT;
 	signal_data->setup_arb = SNGISDN_OPT_DEFAULT;
+	signal_data->facility_ie_decode = SNGISDN_OPT_DEFAULT;
+	signal_data->ignore_cause_value = SNGISDN_OPT_DEFAULT;
 	signal_data->timer_t3 = 8;
+	signal_data->restart_opt = SNGISDN_OPT_DEFAULT;
 
 	signal_data->link_id = span->span_id;
 	span->default_caller_data.bearer_capability = IN_ITC_SPEECH;
@@ -192,20 +215,19 @@ ftdm_status_t ftmod_isdn_parse_cfg(ftdm_conf_parameter_t *ftdm_parameters, ftdm_
 	if (span->trunk_type == FTDM_TRUNK_BRI ||
 		span->trunk_type == FTDM_TRUNK_BRI_PTMP) {
 
-		
-		ftdm_span_set_npi("unknown", &span->default_caller_data.dnis.plan);
-		ftdm_span_set_ton("unknown", &span->default_caller_data.dnis.type);
-		ftdm_span_set_npi("unknown", &span->default_caller_data.cid_num.plan);
-		ftdm_span_set_ton("unknown", &span->default_caller_data.cid_num.type);
-		ftdm_span_set_npi("unknown", &span->default_caller_data.rdnis.plan);
-		ftdm_span_set_ton("unknown", &span->default_caller_data.rdnis.type);
+		ftdm_set_npi("unknown", &span->default_caller_data.dnis.plan);
+		ftdm_set_ton("unknown", &span->default_caller_data.dnis.type);
+		ftdm_set_npi("unknown", &span->default_caller_data.cid_num.plan);
+		ftdm_set_ton("unknown", &span->default_caller_data.cid_num.type);
+		ftdm_set_npi("unknown", &span->default_caller_data.rdnis.plan);
+		ftdm_set_ton("unknown", &span->default_caller_data.rdnis.type);
 	} else {
-		ftdm_span_set_npi("e164", &span->default_caller_data.dnis.plan);
-		ftdm_span_set_ton("national", &span->default_caller_data.dnis.type);
-		ftdm_span_set_npi("e164", &span->default_caller_data.cid_num.plan);
-		ftdm_span_set_ton("national", &span->default_caller_data.cid_num.type);
-		ftdm_span_set_npi("e164", &span->default_caller_data.rdnis.plan);
-		ftdm_span_set_ton("national", &span->default_caller_data.rdnis.type);
+		ftdm_set_npi("isdn", &span->default_caller_data.dnis.plan);
+		ftdm_set_ton("national", &span->default_caller_data.dnis.type);
+		ftdm_set_npi("isdn", &span->default_caller_data.cid_num.plan);
+		ftdm_set_ton("national", &span->default_caller_data.cid_num.type);
+		ftdm_set_npi("isdn", &span->default_caller_data.rdnis.plan);
+		ftdm_set_ton("national", &span->default_caller_data.rdnis.type);
 	}
 
 	for (paramindex = 0; ftdm_parameters[paramindex].var; paramindex++) {
@@ -237,40 +259,30 @@ ftdm_status_t ftmod_isdn_parse_cfg(ftdm_conf_parameter_t *ftdm_parameters, ftdm_
 			} else {
 				ftdm_log(FTDM_LOG_ERROR, "Invalid value for parameter:%s:%s\n", var, val);
 			}
-		} else if (!strcasecmp(var, "setup arbitration")) {
-			if (!strcasecmp(val, "yes")) {
-				signal_data->setup_arb = SNGISDN_OPT_TRUE;
-			} else if (!strcasecmp(val, "no")) {
-				signal_data->setup_arb = SNGISDN_OPT_FALSE;
-			} else {
-				ftdm_log(FTDM_LOG_ERROR, "Invalid value for parameter:%s:%s\n", var, val);
-			}
+		} else if (!strcasecmp(var, "setup-arbitration")) {
+			parse_yesno(var, val, &signal_data->setup_arb);
 		} else if (!strcasecmp(var, "facility")) {
-			if (!strcasecmp(val, "yes")) {
-				signal_data->facility = SNGISDN_OPT_TRUE;
-			} else if (!strcasecmp(val, "no")) {
-				signal_data->facility = SNGISDN_OPT_FALSE;
-			} else {
-				ftdm_log(FTDM_LOG_ERROR, "Invalid value for parameter:%s:%s\n", var, val);
-			}
+			parse_yesno(var, val, &signal_data->facility);
 		} else if (!strcasecmp(var, "min_digits")) {
 			signal_data->min_digits = atoi(val);
 		} else if (!strcasecmp(var, "outbound-called-ton")) {
-			ftdm_span_set_ton(val, &span->default_caller_data.dnis.type);
+			ftdm_set_ton(val, &span->default_caller_data.dnis.type);
 		} else if (!strcasecmp(var, "outbound-called-npi")) {
-			ftdm_span_set_npi(val, &span->default_caller_data.dnis.plan);
+			ftdm_set_npi(val, &span->default_caller_data.dnis.plan);
 		} else if (!strcasecmp(var, "outbound-calling-ton")) {
-			ftdm_span_set_ton(val, &span->default_caller_data.cid_num.type);
+			ftdm_set_ton(val, &span->default_caller_data.cid_num.type);
 		} else if (!strcasecmp(var, "outbound-calling-npi")) {
-			ftdm_span_set_npi(val, &span->default_caller_data.cid_num.plan);
+			ftdm_set_npi(val, &span->default_caller_data.cid_num.plan);
 		} else if (!strcasecmp(var, "outbound-rdnis-ton")) {
-			ftdm_span_set_ton(val, &span->default_caller_data.rdnis.type);
+			ftdm_set_ton(val, &span->default_caller_data.rdnis.type);
 		} else if (!strcasecmp(var, "outbound-rdnis-npi")) {
-			ftdm_span_set_npi(val, &span->default_caller_data.rdnis.plan);
+			ftdm_set_npi(val, &span->default_caller_data.rdnis.plan);
 		} else if (!strcasecmp(var, "outbound-bearer_cap")) {
-			ftdm_span_set_bearer_capability(val, &span->default_caller_data.bearer_capability);
+			ftdm_set_bearer_capability(val, (uint8_t*)&span->default_caller_data.bearer_capability);
 		} else if (!strcasecmp(var, "outbound-bearer_layer1")) {
-			ftdm_span_set_bearer_layer1(val, &span->default_caller_data.bearer_layer1);
+			ftdm_set_bearer_layer1(val, (uint8_t*)&span->default_caller_data.bearer_layer1);
+		} else if (!strcasecmp(var, "channel-restart-on-link-up")) {
+			parse_yesno(var, val, &signal_data->restart_opt);
 		} else if (!strcasecmp(var, "local-number")) {			
 			if (add_local_number(val, span) != FTDM_SUCCESS) {
 				return FTDM_FAIL;
@@ -280,6 +292,10 @@ ftdm_status_t ftmod_isdn_parse_cfg(ftdm_conf_parameter_t *ftdm_parameters, ftdm_
 			if (signal_data->facility_timeout < 0) {
 				signal_data->facility_timeout = 0;
 			}
+		} else if (!strcasecmp(var, "facility-ie-decode")) {
+			parse_yesno(var, val, &signal_data->facility_ie_decode);
+		} else if (!strcasecmp(var, "ignore-cause-value")) {
+			parse_yesno(var, val, &signal_data->ignore_cause_value);
 		} else {
 			ftdm_log(FTDM_LOG_WARNING, "Ignoring unknown parameter %s\n", ftdm_parameters[paramindex].var);
 		}
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c
index bb46fb7fba..de10a9fac0 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c
@@ -38,52 +38,52 @@ extern ftdm_sngisdn_data_t	g_sngisdn_data;
 
 uint8_t sng_isdn_stack_switchtype(sngisdn_switchtype_t switchtype);
 
-ftdm_status_t sng_isdn_cfg_phy(ftdm_span_t *span);
-ftdm_status_t sng_isdn_cfg_q921(ftdm_span_t *span);
-ftdm_status_t sng_isdn_cfg_q931(ftdm_span_t *span);
-ftdm_status_t sng_isdn_cfg_cc(ftdm_span_t *span);
+ftdm_status_t sngisdn_cfg_phy(ftdm_span_t *span);
+ftdm_status_t sngisdn_cfg_q921(ftdm_span_t *span);
+ftdm_status_t sngisdn_cfg_q931(ftdm_span_t *span);
+ftdm_status_t sngisdn_cfg_cc(ftdm_span_t *span);
 
-ftdm_status_t sng_isdn_stack_cfg_phy_gen(void);
-ftdm_status_t sng_isdn_stack_cfg_q921_gen(void);
-ftdm_status_t sng_isdn_stack_cfg_q931_gen(void);
-ftdm_status_t sng_isdn_stack_cfg_cc_gen(void);
+ftdm_status_t sngisdn_stack_cfg_phy_gen(void);
+ftdm_status_t sngisdn_stack_cfg_q921_gen(void);
+ftdm_status_t sngisdn_stack_cfg_q931_gen(void);
+ftdm_status_t sngisdn_stack_cfg_cc_gen(void);
 
 
-ftdm_status_t sng_isdn_stack_cfg_phy_psap(ftdm_span_t *span);
-ftdm_status_t sng_isdn_stack_cfg_q921_msap(ftdm_span_t *span);
-ftdm_status_t sng_isdn_stack_cfg_q921_dlsap(ftdm_span_t *span, uint8_t management);
-ftdm_status_t sng_isdn_stack_cfg_q931_tsap(ftdm_span_t *span);
-ftdm_status_t sng_isdn_stack_cfg_q931_dlsap(ftdm_span_t *span);
-ftdm_status_t sng_isdn_stack_cfg_q931_lce(ftdm_span_t *span);
+ftdm_status_t sngisdn_stack_cfg_phy_psap(ftdm_span_t *span);
+ftdm_status_t sngisdn_stack_cfg_q921_msap(ftdm_span_t *span);
+ftdm_status_t sngisdn_stack_cfg_q921_dlsap(ftdm_span_t *span, uint8_t management);
+ftdm_status_t sngisdn_stack_cfg_q931_tsap(ftdm_span_t *span);
+ftdm_status_t sngisdn_stack_cfg_q931_dlsap(ftdm_span_t *span);
+ftdm_status_t sngisdn_stack_cfg_q931_lce(ftdm_span_t *span);
 
-ftdm_status_t sng_isdn_stack_cfg_cc_sap(ftdm_span_t *span);
+ftdm_status_t sngisdn_stack_cfg_cc_sap(ftdm_span_t *span);
 
-ftdm_status_t sng_isdn_stack_cfg(ftdm_span_t *span)
+ftdm_status_t sngisdn_stack_cfg(ftdm_span_t *span)
 {
 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*)span->signal_data;
 
 	if (!g_sngisdn_data.gen_config_done) {
 		g_sngisdn_data.gen_config_done = 1;
 		ftdm_log(FTDM_LOG_DEBUG, "Starting general stack configuration\n");
-		if(sng_isdn_stack_cfg_phy_gen()!= FTDM_SUCCESS) {
+		if(sngisdn_stack_cfg_phy_gen()!= FTDM_SUCCESS) {
 			ftdm_log(FTDM_LOG_CRIT, "Failed general physical configuration\n");
 			return FTDM_FAIL;
 		}
 		ftdm_log(FTDM_LOG_DEBUG, "General stack physical done\n");
 	
-		if(sng_isdn_stack_cfg_q921_gen()!= FTDM_SUCCESS) {
+		if(sngisdn_stack_cfg_q921_gen()!= FTDM_SUCCESS) {
 			ftdm_log(FTDM_LOG_CRIT, "Failed general q921 configuration\n");
 			return FTDM_FAIL;
 		}
 		ftdm_log(FTDM_LOG_DEBUG, "General stack q921 done\n");
 
-		if(sng_isdn_stack_cfg_q931_gen()!= FTDM_SUCCESS) {
+		if(sngisdn_stack_cfg_q931_gen()!= FTDM_SUCCESS) {
 			ftdm_log(FTDM_LOG_CRIT, "Failed general q921 configuration\n");
 			return FTDM_FAIL;
 		}
 		ftdm_log(FTDM_LOG_DEBUG, "General stack q931 done\n");
 
-		if(sng_isdn_stack_cfg_cc_gen()!= FTDM_SUCCESS) {
+		if(sngisdn_stack_cfg_cc_gen()!= FTDM_SUCCESS) {
 			ftdm_log(FTDM_LOG_CRIT, "Failed general CC configuration\n");
 			return FTDM_FAIL;
 		}
@@ -92,26 +92,26 @@ ftdm_status_t sng_isdn_stack_cfg(ftdm_span_t *span)
 	}
 
 	/* TODO: for NFAS, should only call these function for spans with d-chans */
-	if (sng_isdn_stack_cfg_phy_psap(span) != FTDM_SUCCESS) {
+	if (sngisdn_stack_cfg_phy_psap(span) != FTDM_SUCCESS) {
 		ftdm_log(FTDM_LOG_ERROR, "%s:phy_psap configuration failed\n", span->name);
 		return FTDM_FAIL;
 	}
 	ftdm_log(FTDM_LOG_DEBUG, "%s:phy_psap configuration done\n", span->name);
 
-	if (sng_isdn_stack_cfg_q921_msap(span) != FTDM_SUCCESS) {
+	if (sngisdn_stack_cfg_q921_msap(span) != FTDM_SUCCESS) {
 		ftdm_log(FTDM_LOG_ERROR, "%s:q921_msap configuration failed\n", span->name);
 		return FTDM_FAIL;
 	}
 	ftdm_log(FTDM_LOG_DEBUG, "%s:q921_msap configuration done\n", span->name);
 
-	if (sng_isdn_stack_cfg_q921_dlsap(span, 0) != FTDM_SUCCESS) {
+	if (sngisdn_stack_cfg_q921_dlsap(span, 0) != FTDM_SUCCESS) {
 		ftdm_log(FTDM_LOG_ERROR, "%s:q921_dlsap configuration failed\n", span->name);
 		return FTDM_FAIL;
 	}
 	ftdm_log(FTDM_LOG_DEBUG, "%s:q921_dlsap configuration done\n", span->name);
 
 	if (span->trunk_type == FTDM_TRUNK_BRI_PTMP) {
-		if (sng_isdn_stack_cfg_q921_dlsap(span, 1) != FTDM_SUCCESS) {
+		if (sngisdn_stack_cfg_q921_dlsap(span, 1) != FTDM_SUCCESS) {
 			ftdm_log(FTDM_LOG_ERROR, "%s:q921_dlsap management configuration failed\n", span->name);
 			return FTDM_FAIL;
 		}
@@ -119,13 +119,13 @@ ftdm_status_t sng_isdn_stack_cfg(ftdm_span_t *span)
 	}
 	
 
-	if (sng_isdn_stack_cfg_q931_dlsap(span) != FTDM_SUCCESS) {
+	if (sngisdn_stack_cfg_q931_dlsap(span) != FTDM_SUCCESS) {
 		ftdm_log(FTDM_LOG_ERROR, "%s:q931_dlsap configuration failed\n", span->name);
 		return FTDM_FAIL;
 	}
 	ftdm_log(FTDM_LOG_DEBUG, "%s:q931_dlsap configuration done\n", span->name);
 
-	if (sng_isdn_stack_cfg_q931_lce(span) != FTDM_SUCCESS) {
+	if (sngisdn_stack_cfg_q931_lce(span) != FTDM_SUCCESS) {
 		ftdm_log(FTDM_LOG_ERROR, "%s:q931_lce configuration failed\n", span->name);
 		return FTDM_FAIL;
 	}
@@ -134,13 +134,13 @@ ftdm_status_t sng_isdn_stack_cfg(ftdm_span_t *span)
 	if (!g_sngisdn_data.ccs[signal_data->cc_id].config_done) {
 		g_sngisdn_data.ccs[signal_data->cc_id].config_done = 1;
 		/* if BRI, need to configure dlsap_mgmt */
-		if (sng_isdn_stack_cfg_q931_tsap(span) != FTDM_SUCCESS) {
+		if (sngisdn_stack_cfg_q931_tsap(span) != FTDM_SUCCESS) {
 			ftdm_log(FTDM_LOG_ERROR, "%s:q931_tsap configuration failed\n", span->name);
 			return FTDM_FAIL;
 		}
 		ftdm_log(FTDM_LOG_DEBUG, "%s:q931_tsap configuration done\n", span->name);
 
-		if (sng_isdn_stack_cfg_cc_sap(span) != FTDM_SUCCESS) {
+		if (sngisdn_stack_cfg_cc_sap(span) != FTDM_SUCCESS) {
 			ftdm_log(FTDM_LOG_ERROR, "%s:cc_sap configuration failed\n", span->name);
 			return FTDM_FAIL;
 		}
@@ -153,37 +153,37 @@ ftdm_status_t sng_isdn_stack_cfg(ftdm_span_t *span)
 
 
 
-ftdm_status_t sng_isdn_stack_cfg_phy_gen(void)
+ftdm_status_t sngisdn_stack_cfg_phy_gen(void)
 {
 	/*local variables*/
-    L1Mngmt     cfg;    /*configuration structure*/
-    Pst         pst;    /*post structure*/
+	L1Mngmt     cfg;    /*configuration structure*/
+	Pst         pst;    /*post structure*/
 
-    /* initalize the post structure */
-    stack_pst_init(&pst);
+	/* initalize the post structure */
+	stack_pst_init(&pst);
 
-    /* insert the destination Entity */
-    pst.dstEnt = ENTL1;
+	/* insert the destination Entity */
+	pst.dstEnt = ENTL1;
 
-    /*clear the configuration structure*/
+	/*clear the configuration structure*/
 	memset(&cfg, 0, sizeof(cfg));
 
-    /*fill in some general sections of the header*/
-    stack_hdr_init(&cfg.hdr);
+	/*fill in some general sections of the header*/
+	stack_hdr_init(&cfg.hdr);
 
-    /*fill in the specific fields of the header*/
-    cfg.hdr.msgType     = TCFG;
-    cfg.hdr.entId.ent   = ENTL1;
-    cfg.hdr.entId.inst  = S_INST;
-    cfg.hdr.elmId.elmnt = STGEN;
+	/*fill in the specific fields of the header*/
+	cfg.hdr.msgType     = TCFG;
+	cfg.hdr.entId.ent   = ENTL1;
+	cfg.hdr.entId.inst  = S_INST;
+	cfg.hdr.elmId.elmnt = STGEN;
 
-    stack_pst_init(&cfg.t.cfg.s.l1Gen.sm );
-    cfg.t.cfg.s.l1Gen.sm.srcEnt     = ENTL1;
-    cfg.t.cfg.s.l1Gen.sm.dstEnt     = ENTSM;
+	stack_pst_init(&cfg.t.cfg.s.l1Gen.sm );
+	cfg.t.cfg.s.l1Gen.sm.srcEnt     = ENTL1;
+	cfg.t.cfg.s.l1Gen.sm.dstEnt     = ENTSM;
 
-    cfg.t.cfg.s.l1Gen.nmbLnks       = MAX_L1_LINKS+1;
-    cfg.t.cfg.s.l1Gen.poolTrUpper   = POOL_UP_TR;        /* upper pool threshold */
-    cfg.t.cfg.s.l1Gen.poolTrLower   = POOL_LW_TR;        /* lower pool threshold */
+	cfg.t.cfg.s.l1Gen.nmbLnks       = MAX_L1_LINKS;
+	cfg.t.cfg.s.l1Gen.poolTrUpper   = POOL_UP_TR;        /* upper pool threshold */
+	cfg.t.cfg.s.l1Gen.poolTrLower   = POOL_LW_TR;        /* lower pool threshold */
 
 	if (sng_isdn_phy_config(&pst, &cfg)) {
 		return FTDM_FAIL;
@@ -191,55 +191,40 @@ ftdm_status_t sng_isdn_stack_cfg_phy_gen(void)
 	return FTDM_SUCCESS;
 }
 
-ftdm_status_t sng_isdn_stack_cfg_phy_psap(ftdm_span_t *span)
-{
-	ftdm_iterator_t 	*chaniter;
-	ftdm_iterator_t 	*curr;	
-    L1Mngmt				cfg;
-    Pst					pst;
+ftdm_status_t sngisdn_stack_cfg_phy_psap(ftdm_span_t *span)
+{	
+	L1Mngmt				cfg;
+	Pst					pst;
 
-	int32_t d_channel_fd = -1;
 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*)span->signal_data;
 
-    /* initalize the post structure */
-    stack_pst_init(&pst);
+	/* initalize the post structure */
+	stack_pst_init(&pst);
 
-    /* insert the destination Entity */
-    pst.dstEnt = ENTL1;
+	/* insert the destination Entity */
+	pst.dstEnt = ENTL1;
 
-    /*clear the configuration structure*/
+	/*clear the configuration structure*/
 	memset(&cfg, 0, sizeof(cfg));
 
-    /*fill in some general sections of the header*/
-    stack_hdr_init(&cfg.hdr);
+	/*fill in some general sections of the header*/
+	stack_hdr_init(&cfg.hdr);
 
-    /*fill in the specific fields of the header*/
-    cfg.hdr.msgType     = TCFG;
-    cfg.hdr.entId.ent   = ENTL1;
-    cfg.hdr.entId.inst  = S_INST;
-    cfg.hdr.elmId.elmnt = STPSAP;
+	/*fill in the specific fields of the header*/
+	cfg.hdr.msgType     = TCFG;
+	cfg.hdr.entId.ent   = ENTL1;
+	cfg.hdr.entId.inst  = S_INST;
+	cfg.hdr.elmId.elmnt = STPSAP;
 
 	cfg.hdr.elmId.elmntInst1    = signal_data->link_id;
 
-
-	/* Find the d-channel */
-	chaniter = ftdm_span_get_chan_iterator(span, NULL);
-	for (curr = chaniter; curr; curr = ftdm_iterator_next(curr)) {
-		ftdm_channel_t *ftdmchan = (ftdm_channel_t*)ftdm_iterator_current(curr);
-		if (ftdmchan->type == FTDM_CHAN_TYPE_DQ921) {
-			d_channel_fd = (int32_t)ftdmchan->sockfd;
-			break;
-		}
-	}
-	ftdm_iterator_free(chaniter);
-
-	if(d_channel_fd < 0) {
+	if (!signal_data->dchan) {
 		ftdm_log(FTDM_LOG_ERROR, "%s:No d-channels specified\n", span->name);
 		return FTDM_FAIL;
 	}
-	
-	cfg.t.cfg.s.l1PSAP.sockfd = d_channel_fd;
-	
+
+	cfg.t.cfg.s.l1PSAP.sockfd = (int32_t)signal_data->dchan->sockfd;
+
 	switch(span->trunk_type) {
 		case FTDM_TRUNK_E1:
 			cfg.t.cfg.s.l1PSAP.type = SNG_L1_TYPE_PRI;
@@ -255,8 +240,8 @@ ftdm_status_t sng_isdn_stack_cfg_phy_psap(ftdm_span_t *span)
 		default:
 			ftdm_log(FTDM_LOG_ERROR, "%s:Unsupported trunk type %d\n", span->name, span->trunk_type);
 			return FTDM_FAIL;
-	}	
-    cfg.t.cfg.s.l1PSAP.spId		= signal_data->link_id;
+	}
+	cfg.t.cfg.s.l1PSAP.spId		= signal_data->link_id;
 
 	if (sng_isdn_phy_config(&pst, &cfg)) {
 		return FTDM_FAIL;
@@ -265,28 +250,28 @@ ftdm_status_t sng_isdn_stack_cfg_phy_psap(ftdm_span_t *span)
 }
 
 
-ftdm_status_t sng_isdn_stack_cfg_q921_gen(void)
+ftdm_status_t sngisdn_stack_cfg_q921_gen(void)
 {
 	BdMngmt cfg;
-    Pst     pst;
+	Pst     pst;
 
-    /* initalize the post structure */
-    stack_pst_init(&pst);
+	/* initalize the post structure */
+	stack_pst_init(&pst);
 	/* insert the destination Entity */
-    pst.dstEnt = ENTLD;
+	pst.dstEnt = ENTLD;
 
-    /*clear the configuration structure*/
-    memset(&cfg, 0, sizeof(cfg));
+	/*clear the configuration structure*/
+	memset(&cfg, 0, sizeof(cfg));
 	/*fill in some general sections of the header*/
-    stack_hdr_init(&cfg.hdr);
-		
-    cfg.hdr.msgType     = TCFG;
-    cfg.hdr.entId.ent   = ENTLD;
-    cfg.hdr.entId.inst  = S_INST;
-    cfg.hdr.elmId.elmnt = STGEN;
-    /* fill in the Gen Conf structures internal pst struct */
+	stack_hdr_init(&cfg.hdr);
 
-    stack_pst_init(&cfg.t.cfg.s.bdGen.sm);
+	cfg.hdr.msgType     = TCFG;
+	cfg.hdr.entId.ent   = ENTLD;
+	cfg.hdr.entId.inst  = S_INST;
+	cfg.hdr.elmId.elmnt = STGEN;
+	/* fill in the Gen Conf structures internal pst struct */
+
+	stack_pst_init(&cfg.t.cfg.s.bdGen.sm);
 
 	cfg.t.cfg.s.bdGen.sm.dstEnt    = ENTSM;         /* entity */
 	
@@ -299,8 +284,8 @@ ftdm_status_t sng_isdn_stack_cfg_q921_gen(void)
 #ifdef LAPD_3_4
 	cfg.t.cfg.s.bdGen.timeRes     = 100;      /* timer resolution = 1 sec */
 #endif
-    cfg.t.cfg.s.bdGen.poolTrUpper   = 2;        /* upper pool threshold */
-    cfg.t.cfg.s.bdGen.poolTrLower   = 1;        /* lower pool threshold */
+	cfg.t.cfg.s.bdGen.poolTrUpper   = 2;        /* upper pool threshold */
+	cfg.t.cfg.s.bdGen.poolTrLower   = 1;        /* lower pool threshold */
 
 	if (sng_isdn_q921_config(&pst, &cfg)) {
 		return FTDM_FAIL;
@@ -308,30 +293,30 @@ ftdm_status_t sng_isdn_stack_cfg_q921_gen(void)
 	return FTDM_SUCCESS;
 }
 
-ftdm_status_t sng_isdn_stack_cfg_q921_msap(ftdm_span_t *span)
+ftdm_status_t sngisdn_stack_cfg_q921_msap(ftdm_span_t *span)
 {
 	BdMngmt cfg;
-    Pst     pst;
+	Pst     pst;
 
 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*)span->signal_data;
 
-    /* initalize the post structure */
-    stack_pst_init(&pst);
+	/* initalize the post structure */
+	stack_pst_init(&pst);
 	/* insert the destination Entity */
-    pst.dstEnt = ENTLD;
+	pst.dstEnt = ENTLD;
 
-    /*clear the configuration structure*/
-    memset(&cfg, 0, sizeof(cfg));
+	/*clear the configuration structure*/
+	memset(&cfg, 0, sizeof(cfg));
 	/*fill in some general sections of the header*/
-    stack_hdr_init(&cfg.hdr);
+	stack_hdr_init(&cfg.hdr);
 
 	cfg.hdr.msgType     = TCFG;
-    cfg.hdr.entId.ent   = ENTLD;
-    cfg.hdr.entId.inst  = S_INST;
-    cfg.hdr.elmId.elmnt = STMSAP;
+	cfg.hdr.entId.ent   = ENTLD;
+	cfg.hdr.entId.inst  = S_INST;
+	cfg.hdr.elmId.elmnt = STMSAP;
 
 	cfg.t.cfg.s.bdMSAP.lnkNmb      = signal_data->link_id;
-	
+
 	cfg.t.cfg.s.bdMSAP.maxOutsFrms = 24;            /* MAC window */
 	cfg.t.cfg.s.bdMSAP.tQUpperTrs  = 32;           /* Tx Queue Upper Threshold */
 	cfg.t.cfg.s.bdMSAP.tQLowerTrs  = 24;            /* Tx Queue Lower Threshold */
@@ -343,7 +328,7 @@ ftdm_status_t sng_isdn_stack_cfg_q921_msap(ftdm_span_t *span)
 	cfg.t.cfg.s.bdMSAP.route       = RTESPEC;            /* Route */
 	cfg.t.cfg.s.bdMSAP.dstProcId   = SFndProcId(); /* destination proc id */
 	cfg.t.cfg.s.bdMSAP.dstEnt      = ENTL1;        /* entity */
-	cfg.t.cfg.s.bdMSAP.dstInst     = S_INST;      /* instance */	
+	cfg.t.cfg.s.bdMSAP.dstInst     = S_INST;      /* instance */
 	cfg.t.cfg.s.bdMSAP.t201Tmr     = 1;            /* T201 - should be equal to t200Tmr */
 	cfg.t.cfg.s.bdMSAP.t202Tmr     = 2;          /* T202 */
 	cfg.t.cfg.s.bdMSAP.bndRetryCnt = 2;            /* bind retry counter */
@@ -392,7 +377,7 @@ ftdm_status_t sng_isdn_stack_cfg_q921_msap(ftdm_span_t *span)
 	if (signal_data->setup_arb == SNGISDN_OPT_TRUE) {
 		cfg.t.cfg.s.bdMSAP.setUpArb    = ACTIVE;
 	} else if (signal_data->setup_arb == SNGISDN_OPT_FALSE) {
- 		cfg.t.cfg.s.bdMSAP.setUpArb    = PASSIVE;
+		cfg.t.cfg.s.bdMSAP.setUpArb    = PASSIVE;
 	}
 
 	if (sng_isdn_q921_config(&pst, &cfg)) {
@@ -401,27 +386,27 @@ ftdm_status_t sng_isdn_stack_cfg_q921_msap(ftdm_span_t *span)
 	return FTDM_SUCCESS;
 }
 
-ftdm_status_t sng_isdn_stack_cfg_q921_dlsap(ftdm_span_t *span, uint8_t management)
+ftdm_status_t sngisdn_stack_cfg_q921_dlsap(ftdm_span_t *span, uint8_t management)
 {
 	BdMngmt cfg;
-    Pst     pst;
+	Pst     pst;
 
 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*)span->signal_data;
-    /* initalize the post structure */
-    stack_pst_init(&pst);
+	/* initalize the post structure */
+	stack_pst_init(&pst);
 	/* insert the destination Entity */
-    pst.dstEnt = ENTLD;
+	pst.dstEnt = ENTLD;
 
-    /*clear the configuration structure*/
-    memset(&cfg, 0, sizeof(cfg));
+	/*clear the configuration structure*/
+	memset(&cfg, 0, sizeof(cfg));
 	/*fill in some general sections of the header*/
-    stack_hdr_init(&cfg.hdr);
+	stack_hdr_init(&cfg.hdr);
 
 	/*fill in the specific fields of the header*/
-    cfg.hdr.msgType     = TCFG;
-    cfg.hdr.entId.ent   = ENTLD;
-    cfg.hdr.entId.inst  = S_INST;
-    cfg.hdr.elmId.elmnt = STDLSAP;
+	cfg.hdr.msgType     = TCFG;
+	cfg.hdr.entId.ent   = ENTLD;
+	cfg.hdr.entId.inst  = S_INST;
+	cfg.hdr.elmId.elmnt = STDLSAP;
 
 	cfg.t.cfg.s.bdDLSAP.lnkNmb		= signal_data->link_id;
 
@@ -433,10 +418,10 @@ ftdm_status_t sng_isdn_stack_cfg_q921_dlsap(ftdm_span_t *span, uint8_t managemen
 	} else {
 		cfg.t.cfg.s.bdDLSAP.k			= 7;             	/* k */
 	}
-	
+
 	cfg.t.cfg.s.bdDLSAP.n200		= 3;             	/* n200 */
 	cfg.t.cfg.s.bdDLSAP.congTmr		= 300;           	/* congestion timer */
-	cfg.t.cfg.s.bdDLSAP.t200Tmr		= 1;				/* t1 changed from 25 */ 
+	cfg.t.cfg.s.bdDLSAP.t200Tmr		= 1;				/* t1 changed from 25 */
 	cfg.t.cfg.s.bdDLSAP.t203Tmr		= 10;				/* t3 changed from 50 */
 	cfg.t.cfg.s.bdDLSAP.mod			= 128;           	/* modulo */
 	cfg.t.cfg.s.bdDLSAP.selector	= 0;				/* Selector 0 */
@@ -483,31 +468,31 @@ ftdm_status_t sng_isdn_stack_cfg_q921_dlsap(ftdm_span_t *span, uint8_t managemen
 	return FTDM_SUCCESS;
 }
 
-ftdm_status_t sng_isdn_stack_cfg_q931_gen(void)
+ftdm_status_t sngisdn_stack_cfg_q931_gen(void)
 {
 	InMngmt cfg;
-    Pst     pst;
+	Pst     pst;
 
-    /* initalize the post structure */
-    stack_pst_init(&pst);
+	/* initalize the post structure */
+	stack_pst_init(&pst);
 
-    /* insert the destination Entity */
-    pst.dstEnt = ENTIN;
+	/* insert the destination Entity */
+	pst.dstEnt = ENTIN;
 
-    /*clear the configuration structure*/
+	/*clear the configuration structure*/
 	memset(&cfg, 0, sizeof(cfg));
 
-    /*fill in some general sections of the header*/
-    stack_hdr_init(&cfg.hdr);
+	/*fill in some general sections of the header*/
+	stack_hdr_init(&cfg.hdr);
 
-    /*fill in the specific fields of the header*/
-    cfg.hdr.msgType     = TCFG;
-    cfg.hdr.entId.ent   = ENTIN;
-    cfg.hdr.entId.inst  = S_INST;
-    cfg.hdr.elmId.elmnt = STGEN;
+	/*fill in the specific fields of the header*/
+	cfg.hdr.msgType     = TCFG;
+	cfg.hdr.entId.ent   = ENTIN;
+	cfg.hdr.entId.inst  = S_INST;
+	cfg.hdr.elmId.elmnt = STGEN;
 
-    /* fill in the Gen Conf structures internal pst struct */
-    stack_pst_init(&cfg.t.cfg.s.inGen.sm);
+	/* fill in the Gen Conf structures internal pst struct */
+	stack_pst_init(&cfg.t.cfg.s.inGen.sm);
 
 	cfg.t.cfg.s.inGen.nmbSaps = MAX_VARIANTS+1;			/* Total number of variants supported */
 
@@ -538,29 +523,29 @@ ftdm_status_t sng_isdn_stack_cfg_q931_gen(void)
 }
 
 /* Link between CC and q931 */
-ftdm_status_t sng_isdn_stack_cfg_q931_tsap(ftdm_span_t *span)
+ftdm_status_t sngisdn_stack_cfg_q931_tsap(ftdm_span_t *span)
 {
 	InMngmt cfg;
-    Pst     pst;
+	Pst     pst;
 	unsigned i;
 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*)span->signal_data;
-    /* initalize the post structure */
-    stack_pst_init(&pst);
+	/* initalize the post structure */
+	stack_pst_init(&pst);
 
-    /* insert the destination Entity */
-    pst.dstEnt = ENTIN;
+	/* insert the destination Entity */
+	pst.dstEnt = ENTIN;
 
-    /*clear the configuration structure*/
+	/*clear the configuration structure*/
 	memset(&cfg, 0, sizeof(cfg));
 
-    /*fill in some general sections of the header*/
-    stack_hdr_init(&cfg.hdr);
+	/*fill in some general sections of the header*/
+	stack_hdr_init(&cfg.hdr);
 
-    /*fill in the specific fields of the header*/
-    cfg.hdr.msgType     = TCFG;
-    cfg.hdr.entId.ent   = ENTIN;
-    cfg.hdr.entId.inst  = S_INST;
-    cfg.hdr.elmId.elmnt = STTSAP;
+	/*fill in the specific fields of the header*/
+	cfg.hdr.msgType     = TCFG;
+	cfg.hdr.entId.ent   = ENTIN;
+	cfg.hdr.entId.inst  = S_INST;
+	cfg.hdr.elmId.elmnt = STTSAP;
 
 	cfg.t.cfg.s.inTSAP.sapId = signal_data->cc_id;
 
@@ -601,34 +586,34 @@ ftdm_status_t sng_isdn_stack_cfg_q931_tsap(ftdm_span_t *span)
 	return FTDM_SUCCESS;
 }
 
-ftdm_status_t sng_isdn_stack_cfg_q931_dlsap(ftdm_span_t *span)
+ftdm_status_t sngisdn_stack_cfg_q931_dlsap(ftdm_span_t *span)
 {
 	InMngmt cfg;
-    Pst     pst;
+	Pst     pst;
 
 	unsigned i;
 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*)span->signal_data;
-    /* initalize the post structure */
-    stack_pst_init(&pst);
+	/* initalize the post structure */
+	stack_pst_init(&pst);
 
-    /* insert the destination Entity */
-    pst.dstEnt = ENTIN;
+	/* insert the destination Entity */
+	pst.dstEnt = ENTIN;
 
-    /*clear the configuration structure*/
+	/*clear the configuration structure*/
 	memset(&cfg, 0, sizeof(cfg));
 
-    /*fill in some general sections of the header*/
-    stack_hdr_init(&cfg.hdr);
+	/*fill in some general sections of the header*/
+	stack_hdr_init(&cfg.hdr);
+
+	/*fill in the specific fields of the header*/
+	cfg.hdr.msgType     = TCFG;
+	cfg.hdr.entId.ent   = ENTIN;
+	cfg.hdr.entId.inst  = S_INST;
+	cfg.hdr.elmId.elmnt = STDLSAP;
 
-    /*fill in the specific fields of the header*/
-    cfg.hdr.msgType     = TCFG;
-    cfg.hdr.entId.ent   = ENTIN;
-    cfg.hdr.entId.inst  = S_INST;
-    cfg.hdr.elmId.elmnt = STDLSAP;
-	
 	cfg.hdr.response.selector=0;
 
-	
+
 	cfg.t.cfg.s.inDLSAP.sapId = signal_data->link_id;
 	cfg.t.cfg.s.inDLSAP.spId = signal_data->link_id;
 	cfg.t.cfg.s.inDLSAP.swtch = sng_isdn_stack_switchtype(signal_data->switchtype);
@@ -674,7 +659,7 @@ ftdm_status_t sng_isdn_stack_cfg_q931_dlsap(ftdm_span_t *span)
 		cfg.t.cfg.s.inDLSAP.ctldInt[1] = 1;
 	}
 
-	cfg.t.cfg.s.inDLSAP.numRstInd = 255;	
+	cfg.t.cfg.s.inDLSAP.numRstInd = 255;
 	cfg.t.cfg.s.inDLSAP.relOpt = TRUE;
 #ifdef ISDN_SRV
 	cfg.t.cfg.s.inDLSAP.bcas = FALSE;
@@ -701,7 +686,16 @@ ftdm_status_t sng_isdn_stack_cfg_q931_dlsap(ftdm_span_t *span)
 		cfg.t.cfg.s.inDLSAP.statEnqOpt = FALSE;
 		cfg.t.cfg.s.inDLSAP.rstOpt = FALSE;
 	}
-		
+
+	/* Override the restart options if user selected that option */
+	if (signal_data->restart_opt != SNGISDN_OPT_DEFAULT) {
+		if (signal_data->restart_opt == SNGISDN_OPT_TRUE) {
+			cfg.t.cfg.s.inDLSAP.rstOpt = TRUE;
+		} else {
+			cfg.t.cfg.s.inDLSAP.rstOpt = FALSE;
+		}
+	}
+	
 	for (i = 0; i < IN_MAXBCHNL; i++)
 	{
 		cfg.t.cfg.s.inDLSAP.bProf[i].profNmb = 0;
@@ -851,39 +845,39 @@ ftdm_status_t sng_isdn_stack_cfg_q931_dlsap(ftdm_span_t *span)
 	return FTDM_SUCCESS;
 }
 
-ftdm_status_t sng_isdn_stack_cfg_q931_lce(ftdm_span_t *span)
+ftdm_status_t sngisdn_stack_cfg_q931_lce(ftdm_span_t *span)
 {
 	InMngmt cfg;
-    Pst     pst;
+	Pst     pst;
 	uint8_t	i;
-	uint8_t numCes=1;	
+	uint8_t numCes=1;
 
 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*)span->signal_data;
 	if (span->trunk_type == FTDM_TRUNK_BRI_PTMP && signal_data->signalling == SNGISDN_SIGNALING_NET) {
 		numCes = 8;
 	}
-    /* initalize the post structure */
-    stack_pst_init(&pst);
+	/* initalize the post structure */
+	stack_pst_init(&pst);
 
-    /* insert the destination Entity */
-    pst.dstEnt = ENTIN;
+	/* insert the destination Entity */
+	pst.dstEnt = ENTIN;
 
-    /*clear the configuration structure*/
+	/*clear the configuration structure*/
 	memset(&cfg, 0, sizeof(cfg));
 
-    /*fill in some general sections of the header*/
-    stack_hdr_init(&cfg.hdr);	
+	/*fill in some general sections of the header*/
+	stack_hdr_init(&cfg.hdr);
 
-    /*fill in the specific fields of the header*/
-    cfg.hdr.msgType     = TCFG;
-    cfg.hdr.entId.ent   = ENTIN;
-    cfg.hdr.entId.inst  = S_INST;
-    cfg.hdr.elmId.elmnt = STDLC;
+	/*fill in the specific fields of the header*/
+	cfg.hdr.msgType     = TCFG;
+	cfg.hdr.entId.ent   = ENTIN;
+	cfg.hdr.entId.inst  = S_INST;
+	cfg.hdr.elmId.elmnt = STDLC;
 
 	cfg.hdr.response.selector=0;
 
 	cfg.t.cfg.s.inLCe.sapId = signal_data->link_id;
-	
+
 
 	cfg.t.cfg.s.inLCe.lnkUpDwnInd = TRUE;
 	cfg.t.cfg.s.inLCe.tCon.enb = TRUE;
@@ -892,7 +886,7 @@ ftdm_status_t sng_isdn_stack_cfg_q931_lce(ftdm_span_t *span)
 	cfg.t.cfg.s.inLCe.tDisc.val = 35;
 	cfg.t.cfg.s.inLCe.t314.enb = FALSE; /* if segmentation enabled, set to TRUE */
 	cfg.t.cfg.s.inLCe.t314.val = 35;
-		
+
 	cfg.t.cfg.s.inLCe.t332i.enb = FALSE; /* set to TRUE for NFAS */
 
 #ifdef NFAS
@@ -912,7 +906,6 @@ ftdm_status_t sng_isdn_stack_cfg_q931_lce(ftdm_span_t *span)
 	cfg.t.cfg.s.inLCe.tRstAck.enb = TRUE;
 	cfg.t.cfg.s.inLCe.tRstAck.val = 10;
 
-
 	cfg.t.cfg.s.inLCe.usid = 0;
 	cfg.t.cfg.s.inLCe.tid = 0;
 
@@ -927,7 +920,7 @@ ftdm_status_t sng_isdn_stack_cfg_q931_lce(ftdm_span_t *span)
 }
 
 
-ftdm_status_t sng_isdn_stack_cfg_cc_gen(void)
+ftdm_status_t sngisdn_stack_cfg_cc_gen(void)
 {
 	CcMngmt cfg;
 	Pst     pst;
@@ -966,7 +959,7 @@ ftdm_status_t sng_isdn_stack_cfg_cc_gen(void)
 }
 
 
-ftdm_status_t sng_isdn_stack_cfg_cc_sap(ftdm_span_t *span)
+ftdm_status_t sngisdn_stack_cfg_cc_sap(ftdm_span_t *span)
 {
 	CcMngmt cfg;
 	Pst     pst;
@@ -998,11 +991,11 @@ ftdm_status_t sng_isdn_stack_cfg_cc_sap(ftdm_span_t *span)
 	cfg.t.cfg.s.ccISAP.pst.dstInst		= S_INST;
 	cfg.t.cfg.s.ccISAP.pst.dstProcId	= SFndProcId();
 
-    cfg.t.cfg.s.ccISAP.pst.prior		= PRIOR0;
-    cfg.t.cfg.s.ccISAP.pst.route		= RTESPEC;
-    cfg.t.cfg.s.ccISAP.pst.region		= S_REG;
-    cfg.t.cfg.s.ccISAP.pst.pool			= S_POOL;
-    cfg.t.cfg.s.ccISAP.pst.selector		= 0;
+	cfg.t.cfg.s.ccISAP.pst.prior		= PRIOR0;
+	cfg.t.cfg.s.ccISAP.pst.route		= RTESPEC;
+	cfg.t.cfg.s.ccISAP.pst.region		= S_REG;
+	cfg.t.cfg.s.ccISAP.pst.pool			= S_POOL;
+	cfg.t.cfg.s.ccISAP.pst.selector		= 0;
 
 	cfg.t.cfg.s.ccISAP.suId				= signal_data->cc_id;
 	cfg.t.cfg.s.ccISAP.spId				= signal_data->cc_id;
@@ -1020,19 +1013,19 @@ ftdm_status_t sng_isdn_stack_cfg_cc_sap(ftdm_span_t *span)
 void stack_pst_init(Pst *pst)
 {
 	memset(pst, 0, sizeof(Pst));
-	 /*fill in the post structure*/
-    pst->dstProcId   = SFndProcId();
-    pst->dstInst     = S_INST;
+		/*fill in the post structure*/
+	pst->dstProcId   = SFndProcId();
+	pst->dstInst     = S_INST;
 
-    pst->srcProcId   = SFndProcId();
-    pst->srcEnt      = ENTSM;
-    pst->srcInst     = S_INST;
+	pst->srcProcId   = SFndProcId();
+	pst->srcEnt      = ENTSM;
+	pst->srcInst     = S_INST;
 
-    pst->prior       = PRIOR0;
-    pst->route       = RTESPEC;
-    pst->region      = S_REG;
-    pst->pool        = S_POOL;
-    pst->selector    = 0;
+	pst->prior       = PRIOR0;
+	pst->route       = RTESPEC;
+	pst->region      = S_REG;
+	pst->pool        = S_POOL;
+	pst->selector    = 0;
 	return;
 }
 
@@ -1041,21 +1034,21 @@ void stack_pst_init(Pst *pst)
 void stack_hdr_init(Header *hdr)
 {
 	hdr->msgType                = 0;
-    hdr->msgLen                 = 0;
-    hdr->entId.ent              = 0;
-    hdr->entId.inst             = 0;
-    hdr->elmId.elmnt            = 0;
-    hdr->elmId.elmntInst1       = 0;
-    hdr->elmId.elmntInst2       = 0;
-    hdr->elmId.elmntInst3       = 0;
-    hdr->seqNmb                 = 0;
-    hdr->version                = 0;
-    hdr->response.prior         = PRIOR0;
-    hdr->response.route         = RTESPEC;
-    hdr->response.mem.region    = S_REG;
-    hdr->response.mem.pool      = S_POOL;
-    hdr->transId                = 0;
-    hdr->response.selector      = 0;
+	hdr->msgLen                 = 0;
+	hdr->entId.ent              = 0;
+	hdr->entId.inst             = 0;
+	hdr->elmId.elmnt            = 0;
+	hdr->elmId.elmntInst1       = 0;
+	hdr->elmId.elmntInst2       = 0;
+	hdr->elmId.elmntInst3       = 0;
+	hdr->seqNmb                 = 0;
+	hdr->version                = 0;
+	hdr->response.prior         = PRIOR0;
+	hdr->response.route         = RTESPEC;
+	hdr->response.mem.region    = S_REG;
+	hdr->response.mem.pool      = S_POOL;
+	hdr->transId                = 0;
+	hdr->response.selector      = 0;
 	return;
 }
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cntrl.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cntrl.c
index bfc00d07ba..225244f57e 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cntrl.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cntrl.c
@@ -37,27 +37,26 @@
 
 void stack_resp_hdr_init(Header *hdr);
 
-ftdm_status_t sng_isdn_activate_phy(ftdm_span_t *span);
-ftdm_status_t sng_isdn_deactivate_phy(ftdm_span_t *span);
+ftdm_status_t sngisdn_activate_phy(ftdm_span_t *span);
+ftdm_status_t sngisdn_deactivate_phy(ftdm_span_t *span);
 
-ftdm_status_t sng_isdn_activate_cc(ftdm_span_t *span);
-ftdm_status_t sng_isdn_activate_trace(ftdm_span_t *span, sngisdn_tracetype_t trace_opt);
+ftdm_status_t sngisdn_activate_cc(ftdm_span_t *span);
 
-ftdm_status_t sng_isdn_cntrl_q931(ftdm_span_t *span, uint8_t action, uint8_t subaction);
-ftdm_status_t sng_isdn_cntrl_q921(ftdm_span_t *span, uint8_t action, uint8_t subaction);
+ftdm_status_t sngisdn_cntrl_q931(ftdm_span_t *span, uint8_t action, uint8_t subaction);
+ftdm_status_t sngisdn_cntrl_q921(ftdm_span_t *span, uint8_t action, uint8_t subaction);
 
 
 extern ftdm_sngisdn_data_t	g_sngisdn_data;
 
-ftdm_status_t sng_isdn_stack_stop(ftdm_span_t *span);
+ftdm_status_t sngisdn_stack_stop(ftdm_span_t *span);
 
 
-ftdm_status_t sng_isdn_stack_start(ftdm_span_t *span)
+ftdm_status_t sngisdn_stack_start(ftdm_span_t *span)
 {
 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*)span->signal_data;
 
 	
-	if (sng_isdn_cntrl_q921(span, ABND_ENA, NOTUSED) != FTDM_SUCCESS) {
+	if (sngisdn_cntrl_q921(span, ABND_ENA, NOTUSED) != FTDM_SUCCESS) {
 		ftdm_log(FTDM_LOG_CRIT, "%s:Failed to activate stack q921\n", span->name);
 		return FTDM_FAIL;
 	}
@@ -72,7 +71,7 @@ ftdm_status_t sng_isdn_stack_start(ftdm_span_t *span)
 	ftdm_log(FTDM_LOG_DEBUG, "%s:Stack q921 activated\n", span->name);
 	if (!g_sngisdn_data.ccs[signal_data->cc_id].activation_done) {
 		g_sngisdn_data.ccs[signal_data->cc_id].activation_done = 1;
-		if (sng_isdn_activate_cc(span) != FTDM_SUCCESS) {
+		if (sngisdn_activate_cc(span) != FTDM_SUCCESS) {
 			ftdm_log(FTDM_LOG_CRIT, "%s:Failed to activate stack CC\n", span->name);
 			return FTDM_FAIL;
 		}
@@ -80,7 +79,7 @@ ftdm_status_t sng_isdn_stack_start(ftdm_span_t *span)
 	}
 
 	
-	if (sng_isdn_cntrl_q931(span, ABND_ENA, SAELMNT) != FTDM_SUCCESS) {
+	if (sngisdn_cntrl_q931(span, ABND_ENA, SAELMNT) != FTDM_SUCCESS) {
 		ftdm_log(FTDM_LOG_CRIT, "%s:Failed to activate stack q931\n", span->name);
 		return FTDM_FAIL;
 	}
@@ -90,20 +89,20 @@ ftdm_status_t sng_isdn_stack_start(ftdm_span_t *span)
 	return FTDM_SUCCESS;
 }
 
-ftdm_status_t sng_isdn_stack_stop(ftdm_span_t *span)
+ftdm_status_t sngisdn_stack_stop(ftdm_span_t *span)
 {
 	/* Stop L1 first, so we do not receive any more frames */
-	if (sng_isdn_deactivate_phy(span) != FTDM_SUCCESS) {
+	if (sngisdn_deactivate_phy(span) != FTDM_SUCCESS) {
 		ftdm_log(FTDM_LOG_CRIT, "%s:Failed to deactivate stack phy\n", span->name);
 		return FTDM_FAIL;
 	}
 
-	if (sng_isdn_cntrl_q931(span, AUBND_DIS, SAELMNT) != FTDM_SUCCESS) {
+	if (sngisdn_cntrl_q931(span, AUBND_DIS, SAELMNT) != FTDM_SUCCESS) {
 		ftdm_log(FTDM_LOG_CRIT, "%s:Failed to deactivate stack q931\n", span->name);
 		return FTDM_FAIL;
 	}
 
-	if (sng_isdn_cntrl_q921(span, AUBND_DIS, SAELMNT) != FTDM_SUCCESS) {
+	if (sngisdn_cntrl_q921(span, AUBND_DIS, SAELMNT) != FTDM_SUCCESS) {
 		ftdm_log(FTDM_LOG_CRIT, "%s:Failed to deactivate stack q921\n", span->name);
 		return FTDM_FAIL;
 	}
@@ -113,41 +112,7 @@ ftdm_status_t sng_isdn_stack_stop(ftdm_span_t *span)
 }
 
 
-ftdm_status_t sng_isdn_wake_up_phy(ftdm_span_t *span)
-{
-	L1Mngmt cntrl;
-	Pst pst;
-
-	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*)span->signal_data;
-
-	/* initalize the post structure */
-	stack_pst_init(&pst);
-
-	/* insert the destination Entity */
-	pst.dstEnt = ENTL1;
-
-	/* initalize the control structure */
-	memset(&cntrl, 0, sizeof(cntrl));
-
-	/* initalize the control header */
-	stack_hdr_init(&cntrl.hdr);
-
-	cntrl.hdr.msgType = TCNTRL;			/* configuration */
-	cntrl.hdr.entId.ent = ENTL1;		/* entity */
-	cntrl.hdr.entId.inst = S_INST;		/* instance */
-	cntrl.hdr.elmId.elmnt = STTSAP;		/* SAP Specific cntrl */
-
-	cntrl.t.cntrl.action = AENA;
-	cntrl.t.cntrl.subAction = SAELMNT;
-	cntrl.t.cntrl.sapId = signal_data->link_id;
-	
-	if (sng_isdn_phy_cntrl(&pst, &cntrl)) {
-		return FTDM_FAIL;
-	}
-	return FTDM_SUCCESS;
-}
-
-ftdm_status_t sng_isdn_activate_phy(ftdm_span_t *span)
+ftdm_status_t sngisdn_activate_phy(ftdm_span_t *span)
 {
 
 	/* There is no need to start phy, as it will Q921 will send a activate request to phy when it starts */
@@ -155,7 +120,7 @@ ftdm_status_t sng_isdn_activate_phy(ftdm_span_t *span)
 	return FTDM_SUCCESS;
 }
 
-ftdm_status_t sng_isdn_deactivate_phy(ftdm_span_t *span)
+ftdm_status_t sngisdn_deactivate_phy(ftdm_span_t *span)
 {
 	L1Mngmt cntrl;
 	Pst pst;
@@ -189,8 +154,41 @@ ftdm_status_t sng_isdn_deactivate_phy(ftdm_span_t *span)
 	return FTDM_SUCCESS;
 }
 
+ftdm_status_t sngisdn_wake_up_phy(ftdm_span_t *span)
+{
+	L1Mngmt cntrl;
+	Pst pst;
 
-ftdm_status_t sng_isdn_activate_cc(ftdm_span_t *span)
+	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*)span->signal_data;
+
+	/* initalize the post structure */
+	stack_pst_init(&pst);
+
+	/* insert the destination Entity */
+	pst.dstEnt = ENTL1;
+
+	/* initalize the control structure */
+	memset(&cntrl, 0, sizeof(cntrl));
+
+	/* initalize the control header */
+	stack_hdr_init(&cntrl.hdr);
+
+	cntrl.hdr.msgType = TCNTRL;			/* configuration */
+	cntrl.hdr.entId.ent = ENTL1;		/* entity */
+	cntrl.hdr.entId.inst = S_INST;		/* instance */
+	cntrl.hdr.elmId.elmnt = STTSAP;		/* SAP Specific cntrl */
+
+	cntrl.t.cntrl.action = AENA;
+	cntrl.t.cntrl.subAction = SAELMNT;
+	cntrl.t.cntrl.sapId = signal_data->link_id;
+	
+	if (sng_isdn_phy_cntrl(&pst, &cntrl)) {
+		return FTDM_FAIL;
+	}
+	return FTDM_SUCCESS;
+}
+
+ftdm_status_t sngisdn_activate_cc(ftdm_span_t *span)
 {
 	CcMngmt cntrl;
     Pst pst;
@@ -224,7 +222,7 @@ ftdm_status_t sng_isdn_activate_cc(ftdm_span_t *span)
 	return FTDM_SUCCESS;
 }
 
-ftdm_status_t sng_isdn_activate_trace(ftdm_span_t *span, sngisdn_tracetype_t trace_opt)
+ftdm_status_t sngisdn_activate_trace(ftdm_span_t *span, sngisdn_tracetype_t trace_opt)
 {
 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*)span->signal_data;
 	switch (trace_opt) {
@@ -233,7 +231,7 @@ ftdm_status_t sng_isdn_activate_trace(ftdm_span_t *span, sngisdn_tracetype_t tra
 				ftdm_log(FTDM_LOG_INFO, "s%d Disabling q921 trace\n", signal_data->link_id);
 				sngisdn_clear_trace_flag(signal_data, SNGISDN_TRACE_Q921);
 				
-				if (sng_isdn_cntrl_q921(span, ADISIMM, SATRC) != FTDM_SUCCESS) {
+				if (sngisdn_cntrl_q921(span, ADISIMM, SATRC) != FTDM_SUCCESS) {
 					ftdm_log(FTDM_LOG_ERROR, "s%d Failed to disable q921 trace\n");
 				}
 			}
@@ -241,7 +239,7 @@ ftdm_status_t sng_isdn_activate_trace(ftdm_span_t *span, sngisdn_tracetype_t tra
 				ftdm_log(FTDM_LOG_INFO, "s%d Disabling q931 trace\n", signal_data->link_id);
 				sngisdn_clear_trace_flag(signal_data, SNGISDN_TRACE_Q931);
 
-				if (sng_isdn_cntrl_q931(span, ADISIMM, SATRC) != FTDM_SUCCESS) {
+				if (sngisdn_cntrl_q931(span, ADISIMM, SATRC) != FTDM_SUCCESS) {
 					ftdm_log(FTDM_LOG_ERROR, "s%d Failed to disable q931 trace\n");
 				}
 			}
@@ -251,7 +249,7 @@ ftdm_status_t sng_isdn_activate_trace(ftdm_span_t *span, sngisdn_tracetype_t tra
 				ftdm_log(FTDM_LOG_INFO, "s%d Enabling q921 trace\n", signal_data->link_id);
 				sngisdn_set_trace_flag(signal_data, SNGISDN_TRACE_Q921);
 
-				if (sng_isdn_cntrl_q921(span, AENA, SATRC) != FTDM_SUCCESS) {
+				if (sngisdn_cntrl_q921(span, AENA, SATRC) != FTDM_SUCCESS) {
 					ftdm_log(FTDM_LOG_ERROR, "s%d Failed to enable q921 trace\n");
 				}
 			}
@@ -261,7 +259,7 @@ ftdm_status_t sng_isdn_activate_trace(ftdm_span_t *span, sngisdn_tracetype_t tra
 				ftdm_log(FTDM_LOG_INFO, "s%d Enabling q931 trace\n", signal_data->link_id);
 				sngisdn_set_trace_flag(signal_data, SNGISDN_TRACE_Q931);
 				
-				if (sng_isdn_cntrl_q931(span, AENA, SATRC) != FTDM_SUCCESS) {
+				if (sngisdn_cntrl_q931(span, AENA, SATRC) != FTDM_SUCCESS) {
 					ftdm_log(FTDM_LOG_ERROR, "s%d Failed to enable q931 trace\n");
 				}
 			}
@@ -271,7 +269,7 @@ ftdm_status_t sng_isdn_activate_trace(ftdm_span_t *span, sngisdn_tracetype_t tra
 }
 
 
-ftdm_status_t sng_isdn_cntrl_q931(ftdm_span_t *span, uint8_t action, uint8_t subaction)
+ftdm_status_t sngisdn_cntrl_q931(ftdm_span_t *span, uint8_t action, uint8_t subaction)
 {
 	InMngmt cntrl;
 	Pst pst;
@@ -310,7 +308,7 @@ ftdm_status_t sng_isdn_cntrl_q931(ftdm_span_t *span, uint8_t action, uint8_t sub
 
 }
 
-ftdm_status_t sng_isdn_cntrl_q921(ftdm_span_t *span, uint8_t action, uint8_t subaction)
+ftdm_status_t sngisdn_cntrl_q921(ftdm_span_t *span, uint8_t action, uint8_t subaction)
 {
 	BdMngmt cntrl;
 	Pst pst;
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
index 8408c673ef..fb65d20cab 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
@@ -33,6 +33,7 @@
  */
 
 #include "ftmod_sangoma_isdn.h"
+ftdm_status_t sngisdn_cause_val_requires_disconnect(ftdm_channel_t *ftdmchan, CauseDgn *causeDgn);
 
 /* Remote side transmit a SETUP */
 void sngisdn_process_con_ind (sngisdn_event_data_t *sngisdn_event)
@@ -122,15 +123,20 @@ void sngisdn_process_con_ind (sngisdn_event_data_t *sngisdn_event)
 				break;
 			}
 
-#if 0
-			/* Export ftdmchan variables here if we need to */
-			ftdm_channel_add_var(ftdmchan, "isdn_specific_var", "1");
-#endif
 			/* Fill in call information */
-			cpy_calling_num_from_stack(&ftdmchan->caller_data, &conEvnt->cgPtyNmb);
-			cpy_called_num_from_stack(&ftdmchan->caller_data, &conEvnt->cdPtyNmb);
-			cpy_calling_name_from_stack(&ftdmchan->caller_data, &conEvnt->display);
-			cpy_redir_num_from_stack(&ftdmchan->caller_data, &conEvnt->redirNmb);
+			get_calling_num(ftdmchan, &conEvnt->cgPtyNmb);
+			get_calling_num2(ftdmchan, &conEvnt->cgPtyNmb2);
+			get_called_num(ftdmchan, &conEvnt->cdPtyNmb);
+			get_redir_num(ftdmchan, &conEvnt->redirNmb);
+			get_calling_subaddr(ftdmchan, &conEvnt->cgPtySad);
+			get_prog_ind_ie(ftdmchan, &conEvnt->progInd);
+			get_facility_ie(ftdmchan, &conEvnt->facilityStr);
+			
+			if (get_calling_name_from_display(ftdmchan, &conEvnt->display) != FTDM_SUCCESS) {
+				get_calling_name_from_usr_usr(ftdmchan, &conEvnt->usrUsr);
+			}
+
+			
 			ftdm_log_chan(sngisdn_info->ftdmchan, FTDM_LOG_INFO, "Incoming call: Called No:[%s] Calling No:[%s]\n", ftdmchan->caller_data.dnis.digits, ftdmchan->caller_data.cid_num.digits);
 
 			if (conEvnt->bearCap[0].eh.pres) {
@@ -138,41 +144,41 @@ void sngisdn_process_con_ind (sngisdn_event_data_t *sngisdn_event)
 				ftdmchan->caller_data.bearer_capability = sngisdn_get_infoTranCap_from_stack(conEvnt->bearCap[0].infoTranCap.val);
 			}
 			
-			if (signal_data->switchtype == SNGISDN_SWITCH_NI2) {
-				if (conEvnt->shift11.eh.pres && conEvnt->ni2OctStr.eh.pres) {
-					if (conEvnt->ni2OctStr.str.len == 4 && conEvnt->ni2OctStr.str.val[0] == 0x37) {
-						snprintf(ftdmchan->caller_data.aniII, 5, "%.2d", conEvnt->ni2OctStr.str.val[3]);
-					}
-				}
-				
-				if (signal_data->facility == SNGISDN_OPT_TRUE && conEvnt->facilityStr.eh.pres) {
-					/* Verify whether the Caller Name will come in a subsequent FACILITY message */
-					uint16_t ret_val;
-					char retrieved_str[255];
-					
-					ret_val = sng_isdn_retrieve_facility_caller_name(conEvnt->facilityStr.facilityStr.val, conEvnt->facilityStr.facilityStr.len, retrieved_str);
-					/*
-						return values for "sng_isdn_retrieve_facility_information_following":
-						If there will be no information following, or fails to decode IE, returns -1
-						If there will be no information following, but current FACILITY IE contains a caller name, returns 0
-						If there will be information following, returns 1
-					*/
-
-					if (ret_val == 1) {
-						ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Expecting Caller name in FACILITY\n");
-						ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_GET_CALLERID);
-						/* Launch timer in case we never get a FACILITY msg */
-						if (signal_data->facility_timeout) {
-							ftdm_sched_timer(signal_data->sched, "facility_timeout", signal_data->facility_timeout, 
-									sngisdn_facility_timeout, (void*) sngisdn_info, &sngisdn_info->timers[SNGISDN_TIMER_FACILITY]);
-						}
-						break;
-					} else if (ret_val == 0) {
-						strcpy(ftdmchan->caller_data.cid_name, retrieved_str);
-					}
+			
+			if (conEvnt->shift11.eh.pres && conEvnt->ni2OctStr.eh.pres) {
+				if (conEvnt->ni2OctStr.str.len == 4 && conEvnt->ni2OctStr.str.val[0] == 0x37) {
+					snprintf(ftdmchan->caller_data.aniII, 5, "%.2d", conEvnt->ni2OctStr.str.val[3]);
 				}
 			}
 
+			/* this should be in get_facility_ie function, fix this later */
+			if (signal_data->facility == SNGISDN_OPT_TRUE && conEvnt->facilityStr.eh.pres) {
+				/* Verify whether the Caller Name will come in a subsequent FACILITY message */
+				uint16_t ret_val;
+				char retrieved_str[255];
+
+				ret_val = sng_isdn_retrieve_facility_caller_name(conEvnt->facilityStr.facilityStr.val, conEvnt->facilityStr.facilityStr.len, retrieved_str);
+                                        /*
+                                                return values for "sng_isdn_retrieve_facility_information_following":
+				If there will be no information following, or fails to decode IE, returns -1
+				If there will be no information following, but current FACILITY IE contains a caller name, returns 0
+				If there will be information following, returns 1
+										*/
+
+				if (ret_val == 1) {
+					ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Expecting Caller name in FACILITY\n");
+					ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_GET_CALLERID);
+					/* Launch timer in case we never get a FACILITY msg */
+					if (signal_data->facility_timeout) {
+						ftdm_sched_timer(signal_data->sched, "facility_timeout", signal_data->facility_timeout,
+										 sngisdn_facility_timeout, (void*) sngisdn_info, &sngisdn_info->timers[SNGISDN_TIMER_FACILITY]);
+					}
+					break;
+				} else if (ret_val == 0) {
+					strcpy(ftdmchan->caller_data.cid_name, retrieved_str);
+				}
+			}
+			
 			if (signal_data->overlap_dial == SNGISDN_OPT_TRUE && !conEvnt->sndCmplt.eh.pres) {
 				ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_COLLECT);
 			} else {
@@ -243,11 +249,9 @@ void sngisdn_process_con_cfm (sngisdn_event_data_t *sngisdn_event)
 	uint8_t ces = sngisdn_event->ces;
 	sngisdn_chan_data_t *sngisdn_info = sngisdn_event->sngisdn_info;
 	ftdm_channel_t *ftdmchan = sngisdn_info->ftdmchan;
-	
-	ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
+	CnStEvnt *cnStEvnt = &sngisdn_event->event.cnStEvnt;
 
-	/* Function does not require any info from conStEvnt struct for now */
-	/* CnStEvnt *cnStEvnt = &sngisdn_event->event.cnStEvnt; */	
+	ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
 				
 	ftdm_assert(!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_STATE_CHANGE), "State change flag pending\n");
 	
@@ -269,9 +273,12 @@ void sngisdn_process_con_cfm (sngisdn_event_data_t *sngisdn_event)
 
 	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
 		switch(ftdmchan->state) {
+			case FTDM_CHANNEL_STATE_PROCEED:
 			case FTDM_CHANNEL_STATE_PROGRESS:
 			case FTDM_CHANNEL_STATE_PROGRESS_MEDIA:
 			case FTDM_CHANNEL_STATE_DIALING:
+				get_prog_ind_ie(ftdmchan, &cnStEvnt->progInd);
+				get_facility_ie(ftdmchan, &cnStEvnt->facilityStr);
 				ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_UP);
 				break;
 			case FTDM_CHANNEL_STATE_HANGUP_COMPLETE:
@@ -318,8 +325,6 @@ void sngisdn_process_cnst_ind (sngisdn_event_data_t *sngisdn_event)
 	sngisdn_chan_data_t *sngisdn_info = sngisdn_event->sngisdn_info;
 	ftdm_channel_t *ftdmchan = sngisdn_info->ftdmchan;
 	
-	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) ftdmchan->span->signal_data;
-	
 	CnStEvnt *cnStEvnt = &sngisdn_event->event.cnStEvnt;
 
 	ISDN_FUNC_TRACE_ENTER(__FUNCTION__);
@@ -335,49 +340,34 @@ void sngisdn_process_cnst_ind (sngisdn_event_data_t *sngisdn_event)
 															suId, suInstId, spInstId, ces);
 	
 	switch(evntType) {
+		case MI_CALLPROC:			
 		case MI_PROGRESS:
-			if (signal_data->switchtype == SNGISDN_SWITCH_NI2 &&
-						 cnStEvnt->causeDgn[0].eh.pres && cnStEvnt->causeDgn[0].causeVal.pres) {
-
-				switch(cnStEvnt->causeDgn[0].causeVal.val) {
-					case 17:	/* User Busy */
-					case 18:	/* No User responding */
-					case 19:	/* User alerting, no answer */
-					case 21:	/* Call rejected, the called party does not with to accept this call */
-					case 27:	/* Destination out of order */
-					case 31:	/* Normal, unspecified */
-					case 34:	/* Circuit/Channel congestion */
-					case 41:	/* Temporary failure */
-					case 42:	/* Switching equipment is experiencing a period of high traffic */
-					case 47:	/* Resource unavailable */
-					case 58:	/* Bearer Capability not available */
-					case 63:	/* Service or option not available */
-					case 65:	/* Bearer Cap not implemented, not supported */
-					case 79:	/* Service or option not implemented, unspecified */
-						ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Cause requires disconnect (cause:%d)\n", cnStEvnt->causeDgn[0].causeVal.val);
-						ftdmchan->caller_data.hangup_cause = cnStEvnt->causeDgn[0].causeVal.val;
-						
-						sngisdn_set_flag(sngisdn_info, FLAG_SEND_DISC);
-						ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING);
-						goto sngisdn_process_cnst_ind_end;
-				}
-			}
-			/* fall-through */
 		case MI_ALERTING:
-		case MI_CALLPROC:
-		
+			get_prog_ind_ie(ftdmchan, &cnStEvnt->progInd);
+			get_facility_ie(ftdmchan, &cnStEvnt->facilityStr);
+
+			if (sngisdn_cause_val_requires_disconnect(ftdmchan, &cnStEvnt->causeDgn[0]) == FTDM_SUCCESS) {
+				ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Cause requires disconnect (cause:%d)\n", cnStEvnt->causeDgn[0].causeVal.val);
+				ftdmchan->caller_data.hangup_cause = cnStEvnt->causeDgn[0].causeVal.val;
+						
+				sngisdn_set_flag(sngisdn_info, FLAG_SEND_DISC);
+				ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING);
+				goto sngisdn_process_cnst_ind_end;
+			}
+			
 			switch(ftdmchan->state) {
-				case FTDM_CHANNEL_STATE_DIALING:					
-					if (evntType == MI_PROGRESS ||
-						(cnStEvnt->progInd.eh.pres && cnStEvnt->progInd.progDesc.val == IN_PD_IBAVAIL)) {
+				case FTDM_CHANNEL_STATE_DIALING:
+				case FTDM_CHANNEL_STATE_PROCEED:
+					if (cnStEvnt->progInd.eh.pres && cnStEvnt->progInd.progDesc.val == IN_PD_IBAVAIL) {
 						ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_PROGRESS_MEDIA);
+					} else 	if (evntType == MI_CALLPROC) {
+						ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_PROCEED);
 					} else {
 						ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_PROGRESS);
 					}
 					break;
 				case FTDM_CHANNEL_STATE_PROGRESS:
-					if (evntType == MI_PROGRESS ||
-						(cnStEvnt->progInd.eh.pres && cnStEvnt->progInd.progDesc.val == IN_PD_IBAVAIL)) {
+					if (cnStEvnt->progInd.eh.pres && cnStEvnt->progInd.progDesc.val == IN_PD_IBAVAIL) {
 						ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_PROGRESS_MEDIA);
 					}
 					break;
@@ -406,7 +396,7 @@ void sngisdn_process_cnst_ind (sngisdn_event_data_t *sngisdn_event)
 						ftdm_size_t min_digits = ((sngisdn_span_data_t*)ftdmchan->span->signal_data)->min_digits;
 						ftdm_size_t num_digits;
 
-						cpy_called_num_from_stack(&ftdmchan->caller_data, &cnStEvnt->cdPtyNmb);
+						get_called_num(ftdmchan, &cnStEvnt->cdPtyNmb);
 						num_digits = strlen(ftdmchan->caller_data.dnis.digits);
 
 						if (cnStEvnt->sndCmplt.eh.pres || num_digits >= min_digits) {
@@ -417,6 +407,8 @@ void sngisdn_process_cnst_ind (sngisdn_event_data_t *sngisdn_event)
 					}
 					break;
 					case FTDM_CHANNEL_STATE_RING:
+					case FTDM_CHANNEL_STATE_RINGING:
+					case FTDM_CHANNEL_STATE_PROCEED:
 					case FTDM_CHANNEL_STATE_PROGRESS:
 					case FTDM_CHANNEL_STATE_PROGRESS_MEDIA:
 					case FTDM_CHANNEL_STATE_UP:
@@ -454,12 +446,16 @@ void sngisdn_process_disc_ind (sngisdn_event_data_t *sngisdn_event)
 	ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Processing DISCONNECT (suId:%u suInstId:%u spInstId:%u)\n", suId, suInstId, spInstId);
 
 	ftdm_assert(!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_STATE_CHANGE), "State change flag pending\n");
-	switch (ftdmchan->state) {
+	switch (ftdmchan->state) {		
 		case FTDM_CHANNEL_STATE_RING:
+		case FTDM_CHANNEL_STATE_RINGING:
 		case FTDM_CHANNEL_STATE_DIALING:
+		case FTDM_CHANNEL_STATE_PROCEED:
 		case FTDM_CHANNEL_STATE_PROGRESS:
 		case FTDM_CHANNEL_STATE_PROGRESS_MEDIA:
 		case FTDM_CHANNEL_STATE_UP:
+			get_facility_ie(ftdmchan, &discEvnt->facilityStr);
+
 			if (discEvnt->causeDgn[0].eh.pres && discEvnt->causeDgn[0].causeVal.pres) {
 				ftdmchan->caller_data.hangup_cause = discEvnt->causeDgn[0].causeVal.val;
 			} else {
@@ -535,18 +531,23 @@ void sngisdn_process_rel_ind (sngisdn_event_data_t *sngisdn_event)
 		case FTDM_CHANNEL_STATE_DIALING:
 			/* Remote side rejected our SETUP message on outbound call */
 			if (!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_SIG_UP)) {
-				sng_isdn_set_avail_rate(ftdmchan->span, SNGISDN_AVAIL_DOWN);
+				sngisdn_set_avail_rate(ftdmchan->span, SNGISDN_AVAIL_DOWN);
 			}
 			/* fall-through */
+		case FTDM_CHANNEL_STATE_PROCEED:
 		case FTDM_CHANNEL_STATE_PROGRESS:
 		case FTDM_CHANNEL_STATE_PROGRESS_MEDIA:
 		case FTDM_CHANNEL_STATE_UP:
 		case FTDM_CHANNEL_STATE_RING:
+		case FTDM_CHANNEL_STATE_RINGING:
 			/* If we previously had a glare on this channel,
 			this RELEASE could be for the previous call.  Confirm whether call_data has
 			not changed while we were waiting for ftdmchan->mutex by comparing suInstId's */
 			if (((sngisdn_chan_data_t*)ftdmchan->call_data)->suInstId == suInstId ||
 									((sngisdn_chan_data_t*)ftdmchan->call_data)->spInstId == spInstId) {
+
+				get_facility_ie(ftdmchan, &relEvnt->facilityStr);
+				
 				if (relEvnt->causeDgn[0].eh.pres && relEvnt->causeDgn[0].causeVal.pres) {
 					ftdmchan->caller_data.hangup_cause = relEvnt->causeDgn[0].causeVal.val;
 					ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "cause:%d\n", ftdmchan->caller_data.hangup_cause);
@@ -725,15 +726,16 @@ void sngisdn_process_fac_ind (sngisdn_event_data_t *sngisdn_event)
 	switch (ftdmchan->state) {
 		case FTDM_CHANNEL_STATE_GET_CALLERID:
 			/* Update the caller ID Name */
+
 			if (facEvnt->facElmt.facStr.pres) {
 				char retrieved_str[255];
-				
+
 				/* return values for "sng_isdn_retrieve_facility_information_following":
 				If there will be no information following, or fails to decode IE, returns -1
 				If there will be no information following, but current FACILITY IE contains a caller name, returns 0
 				If there will be information following, returns 1
 				*/
-				
+
 				if (sng_isdn_retrieve_facility_caller_name(&facEvnt->facElmt.facStr.val[2], facEvnt->facElmt.facStr.len, retrieved_str) == 0) {
 					strcpy(ftdmchan->caller_data.cid_name, retrieved_str);
 				} else {
@@ -751,6 +753,21 @@ void sngisdn_process_fac_ind (sngisdn_event_data_t *sngisdn_event)
 			/* We received the caller ID Name in FACILITY, but its too late, facility-timeout already occurred */
 			ftdm_log_chan_msg(ftdmchan, FTDM_LOG_WARNING, "FACILITY received, but we already proceeded with call\n");
 			break;
+		case FTDM_CHANNEL_STATE_UP:
+			{
+				ftdm_sigmsg_t sigev;
+				if (facEvnt->facElmt.facStr.pres) {
+					get_facility_ie_str(ftdmchan, &facEvnt->facElmt.facStr.val[2], facEvnt->facElmt.facStr.len-2);
+				}
+				memset(&sigev, 0, sizeof(sigev));
+				sigev.chan_id = ftdmchan->chan_id;
+				sigev.span_id = ftdmchan->span_id;
+				sigev.channel = ftdmchan;
+				
+				sigev.event_id = FTDM_SIGEVENT_FACILITY;
+				ftdm_span_send_signal(ftdmchan->span, &sigev);
+			}
+			break;
 		default:
 			/* We do not support other FACILITY types for now, so do nothing */
 			break;
@@ -865,7 +882,9 @@ void sngisdn_process_sta_cfm (sngisdn_event_data_t *sngisdn_event)
 							ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "T302 Timer expired, proceeding with call\n");
 							ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RING);
 							break;
+						case FTDM_CHANNEL_STATE_PROCEED:
 						case FTDM_CHANNEL_STATE_PROGRESS:
+						case FTDM_CHANNEL_STATE_RINGING:
 						case FTDM_CHANNEL_STATE_PROGRESS_MEDIA:
 							ftdm_log_chan_msg(ftdmchan, FTDM_LOG_WARNING, "Remote switch expecting OVERLAP receive, but we are already PROCEEDING\n");
 							sngisdn_snd_disconnect(ftdmchan);
@@ -882,7 +901,9 @@ void sngisdn_process_sta_cfm (sngisdn_event_data_t *sngisdn_event)
 					break;
 			case 3:
 				switch (ftdmchan->state) {
+					case FTDM_CHANNEL_STATE_PROCEED:
 					case FTDM_CHANNEL_STATE_PROGRESS:
+					case FTDM_CHANNEL_STATE_RINGING:
 						/* T310 timer has expired */
 						ftdmchan->caller_data.hangup_cause = staEvnt->causeDgn[0].causeVal.val;
 						ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "T310 Timer expired, hanging up call\n");
@@ -919,6 +940,7 @@ void sngisdn_process_sta_cfm (sngisdn_event_data_t *sngisdn_event)
 				break;
 			case 9: /* Remote switch is in "Incoming call proceeding" state */
 				switch (ftdmchan->state) {
+					case FTDM_CHANNEL_STATE_RINGING:
 					case FTDM_CHANNEL_STATE_PROGRESS:
 					case FTDM_CHANNEL_STATE_PROGRESS_MEDIA:
 					case FTDM_CHANNEL_STATE_GET_CALLERID:
@@ -1062,8 +1084,44 @@ void sngisdn_process_rst_ind (sngisdn_event_data_t *sngisdn_event)
 													(evntType == IN_LNK_DWN)?"LNK_DOWN":
 													(evntType == IN_LNK_UP)?"LNK_UP":
 													(evntType == IN_INDCHAN)?"b-channel":
-													(evntType == IN_LNK_DWN_DM_RLS)?"Nfas service procedures":
+													(evntType == IN_LNK_DWN_DM_RLS)?"NFAS service procedures":
 													(evntType == IN_SWCHD_BU_DCHAN)?"NFAS switchover to backup":"Unknown");
 	ISDN_FUNC_TRACE_EXIT(__FUNCTION__);
 	return;
 }
+
+ftdm_status_t sngisdn_cause_val_requires_disconnect(ftdm_channel_t *ftdmchan, CauseDgn *causeDgn)
+{
+	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) ftdmchan->span->signal_data;
+	
+	if (signal_data->ignore_cause_value == SNGISDN_OPT_TRUE) {
+		return FTDM_FAIL;
+	}
+
+	/* By default, we only evaluate cause value on 5ESS switches */
+	if (signal_data->ignore_cause_value == SNGISDN_OPT_DEFAULT &&
+		signal_data->switchtype != SNGISDN_SWITCH_5ESS) {
+
+		return FTDM_FAIL;
+	}
+
+	/* ignore_cause_value = SNGISDN_OPT_FALSE or switchtype == 5ESS */
+	switch(causeDgn->causeVal.val) {
+		case 17:	/* User Busy */
+		case 18:	/* No User responding */
+		case 19:	/* User alerting, no answer */
+		case 21:	/* Call rejected, the called party does not with to accept this call */
+		case 27:	/* Destination out of order */
+		case 31:	/* Normal, unspecified */
+		case 34:	/* Circuit/Channel congestion */
+		case 41:	/* Temporary failure */
+		case 42:	/* Switching equipment is experiencing a period of high traffic */
+		case 47:	/* Resource unavailable */
+		case 58:	/* Bearer Capability not available */
+		case 63:	/* Service or option not available */
+		case 65:	/* Bearer Cap not implemented, not supported */
+		case 79:	/* Service or option not implemented, unspecified */
+			return FTDM_SUCCESS;
+	}
+	return FTDM_FAIL;
+}
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
index cb508a54b4..297c59c3b7 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
@@ -34,18 +34,12 @@
 
 #include "ftmod_sangoma_isdn.h"
 
-void sngisdn_snd_setup(ftdm_channel_t *ftdmchan);
-void sngisdn_snd_proceed(ftdm_channel_t *ftdmchan);
-void sngisdn_snd_progress(ftdm_channel_t *ftdmchan);
-void sngisdn_snd_connect(ftdm_channel_t *ftdmchan);
-void sngisdn_snd_disconnect(ftdm_channel_t *ftdmchan);
-void sngisdn_snd_release(ftdm_channel_t *ftdmchan, uint8_t glare);
-
 void sngisdn_snd_setup(ftdm_channel_t *ftdmchan)
 {
-	ConEvnt conEvnt;
+	ConEvnt conEvnt;	
 	sngisdn_chan_data_t *sngisdn_info = ftdmchan->call_data;
-	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) ftdmchan->span->signal_data;	
+	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) ftdmchan->span->signal_data;
+	ftdm_sngisdn_progind_t prog_ind = {SNGISDN_PROGIND_LOC_USER, SNGISDN_PROGIND_DESCR_NETE_ISDN};
 
 	ftdm_assert((!sngisdn_info->suInstId && !sngisdn_info->spInstId), "Trying to call out, but call data was not cleared\n");
 	
@@ -123,14 +117,6 @@ void sngisdn_snd_setup(ftdm_channel_t *ftdmchan)
 		conEvnt.chanId.chanNmbSlotMap.val[0] = ftdmchan->physical_chan_id;
 	}
 
-	conEvnt.progInd.eh.pres = PRSNT_NODEF;
-	conEvnt.progInd.location.pres = PRSNT_NODEF;
-	conEvnt.progInd.location.val = IN_LOC_USER;
-	conEvnt.progInd.codeStand0.pres = PRSNT_NODEF;
-	conEvnt.progInd.codeStand0.val = IN_CSTD_CCITT;
-	conEvnt.progInd.progDesc.pres = PRSNT_NODEF;
-	conEvnt.progInd.progDesc.val = IN_PD_NOTETEISDN; /* Not end-to-end ISDN */
-
 	if (signal_data->switchtype == SNGISDN_SWITCH_EUROISDN) {
 		conEvnt.sndCmplt.eh.pres = PRSNT_NODEF;
 	}
@@ -140,10 +126,14 @@ void sngisdn_snd_setup(ftdm_channel_t *ftdmchan)
 	}
 	ftdm_log_chan(sngisdn_info->ftdmchan, FTDM_LOG_INFO, "Outgoing call: Called No:[%s] Calling No:[%s]\n", ftdmchan->caller_data.dnis.digits, ftdmchan->caller_data.cid_num.digits);
 
-	cpy_called_num_from_user(&conEvnt.cdPtyNmb, &ftdmchan->caller_data);
-	cpy_calling_num_from_user(&conEvnt.cgPtyNmb, &ftdmchan->caller_data);
-	cpy_redir_num_from_user(&conEvnt.redirNmb, &ftdmchan->caller_data);
-	cpy_calling_name_from_user(&conEvnt, ftdmchan);
+	set_called_num(ftdmchan, &conEvnt.cdPtyNmb);
+	set_calling_num(ftdmchan, &conEvnt.cgPtyNmb);
+	set_calling_num2(ftdmchan, &conEvnt.cgPtyNmb2);
+	set_calling_subaddr(ftdmchan, &conEvnt.cgPtySad);
+	set_redir_num(ftdmchan, &conEvnt.redirNmb);
+	set_calling_name(ftdmchan, &conEvnt);
+	set_facility_ie(ftdmchan, &conEvnt.facilityStr);
+	set_prog_ind_ie(ftdmchan, &conEvnt.progInd, prog_ind);
 
 	ftdm_log_chan(ftdmchan, FTDM_LOG_INFO, "Sending SETUP (suId:%d suInstId:%u spInstId:%u dchan:%d ces:%d)\n", signal_data->cc_id, sngisdn_info->suInstId, sngisdn_info->spInstId, signal_data->dchan_id, sngisdn_info->ces);
 
@@ -273,10 +263,9 @@ void sngisdn_snd_con_complete(ftdm_channel_t *ftdmchan)
 }
 
 
-void sngisdn_snd_proceed(ftdm_channel_t *ftdmchan)
+void sngisdn_snd_proceed(ftdm_channel_t *ftdmchan, ftdm_sngisdn_progind_t prog_ind)
 {
 	CnStEvnt cnStEvnt;
-	
 	sngisdn_chan_data_t *sngisdn_info = (sngisdn_chan_data_t*) ftdmchan->call_data;
 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) ftdmchan->span->signal_data;
 
@@ -321,6 +310,9 @@ void sngisdn_snd_proceed(ftdm_channel_t *ftdmchan)
 		cnStEvnt.chanId.chanNmbSlotMap.val[0] = ftdmchan->physical_chan_id;
 	}
 
+	set_prog_ind_ie(ftdmchan, &cnStEvnt.progInd, prog_ind);
+	set_facility_ie(ftdmchan, &cnStEvnt.facilityStr);
+	ftdm_call_clear_data(&ftdmchan->caller_data);
 
 	ftdm_log_chan(ftdmchan, FTDM_LOG_INFO, "Sending PROCEED (suId:%d suInstId:%u spInstId:%u dchan:%d ces:%d)\n", signal_data->cc_id, sngisdn_info->suInstId, sngisdn_info->spInstId, signal_data->dchan_id, sngisdn_info->ces);
 
@@ -330,14 +322,14 @@ void sngisdn_snd_proceed(ftdm_channel_t *ftdmchan)
 	return;
 }
 
-void sngisdn_snd_progress(ftdm_channel_t *ftdmchan)
+void sngisdn_snd_progress(ftdm_channel_t *ftdmchan, ftdm_sngisdn_progind_t prog_ind)
 {
 	CnStEvnt cnStEvnt;
 	
 	sngisdn_chan_data_t *sngisdn_info = (sngisdn_chan_data_t*) ftdmchan->call_data;
 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) ftdmchan->span->signal_data;
 
- if (!sngisdn_info->suInstId || !sngisdn_info->spInstId) {
+	if (!sngisdn_info->suInstId || !sngisdn_info->spInstId) {
 		ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Sending PROGRESS, but no call data, aborting (suId:%d suInstId:%u spInstId:%u)\n", signal_data->cc_id, sngisdn_info->suInstId, sngisdn_info->spInstId);
 		sngisdn_set_flag(sngisdn_info, FLAG_LOCAL_ABORT);
 		ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING);
@@ -351,14 +343,9 @@ void sngisdn_snd_progress(ftdm_channel_t *ftdmchan)
 	}
 
 	memset(&cnStEvnt, 0, sizeof(cnStEvnt));	
-
-	cnStEvnt.progInd.eh.pres = PRSNT_NODEF;
-	cnStEvnt.progInd.location.pres = PRSNT_NODEF;
-	cnStEvnt.progInd.location.val = IN_LOC_USER;
-	cnStEvnt.progInd.codeStand0.pres = PRSNT_NODEF;
-	cnStEvnt.progInd.codeStand0.val = IN_CSTD_CCITT;
-	cnStEvnt.progInd.progDesc.pres = PRSNT_NODEF;
-	cnStEvnt.progInd.progDesc.val = IN_PD_IBAVAIL;
+	set_prog_ind_ie(ftdmchan, &cnStEvnt.progInd, prog_ind);
+	set_facility_ie(ftdmchan, &cnStEvnt.facilityStr);
+	ftdm_call_clear_data(&ftdmchan->caller_data);
 
 	ftdm_log_chan(ftdmchan, FTDM_LOG_INFO, "Sending PROGRESS (suId:%d suInstId:%u spInstId:%u dchan:%d ces:%d)\n", signal_data->cc_id, sngisdn_info->suInstId, sngisdn_info->spInstId, signal_data->dchan_id, sngisdn_info->ces);
 	if(sng_isdn_con_status(signal_data->cc_id, sngisdn_info->suInstId, sngisdn_info->spInstId,&cnStEvnt, MI_PROGRESS, signal_data->dchan_id, sngisdn_info->ces)) {
@@ -367,14 +354,14 @@ void sngisdn_snd_progress(ftdm_channel_t *ftdmchan)
 	return;
 }
 
-void sngisdn_snd_alert(ftdm_channel_t *ftdmchan)
+void sngisdn_snd_alert(ftdm_channel_t *ftdmchan, ftdm_sngisdn_progind_t prog_ind)
 {
 	CnStEvnt cnStEvnt;
 	
 	sngisdn_chan_data_t *sngisdn_info = (sngisdn_chan_data_t*) ftdmchan->call_data;
 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) ftdmchan->span->signal_data;
 
- if (!sngisdn_info->suInstId || !sngisdn_info->spInstId) {
+	if (!sngisdn_info->suInstId || !sngisdn_info->spInstId) {
 		ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Sending ALERT, but no call data, aborting (suId:%d suInstId:%u spInstId:%u)\n", signal_data->cc_id, sngisdn_info->suInstId, sngisdn_info->spInstId);
 		sngisdn_set_flag(sngisdn_info, FLAG_LOCAL_ABORT);
 		ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING);
@@ -383,13 +370,9 @@ void sngisdn_snd_alert(ftdm_channel_t *ftdmchan)
 
 	memset(&cnStEvnt, 0, sizeof(cnStEvnt));
 
-	cnStEvnt.progInd.eh.pres = PRSNT_NODEF;
-	cnStEvnt.progInd.location.pres = PRSNT_NODEF;
-	cnStEvnt.progInd.location.val = IN_LOC_USER;
-	cnStEvnt.progInd.codeStand0.pres = PRSNT_NODEF;
-	cnStEvnt.progInd.codeStand0.val = IN_CSTD_CCITT;
-	cnStEvnt.progInd.progDesc.pres = PRSNT_NODEF;
-	cnStEvnt.progInd.progDesc.val = IN_PD_NOTETEISDN;
+	set_prog_ind_ie(ftdmchan, &cnStEvnt.progInd, prog_ind);
+	set_facility_ie(ftdmchan, &cnStEvnt.facilityStr);
+	ftdm_call_clear_data(&ftdmchan->caller_data);
 
 	ftdm_log_chan(ftdmchan, FTDM_LOG_INFO, "Sending ALERT (suId:%d suInstId:%u spInstId:%u dchan:%d ces:%d)\n", signal_data->cc_id, sngisdn_info->suInstId, sngisdn_info->spInstId, signal_data->dchan_id, sngisdn_info->ces);
 
@@ -401,10 +384,10 @@ void sngisdn_snd_alert(ftdm_channel_t *ftdmchan)
 
 void sngisdn_snd_connect(ftdm_channel_t *ftdmchan)
 {
-	CnStEvnt cnStEvnt;
-	
+	CnStEvnt cnStEvnt;	
 	sngisdn_chan_data_t *sngisdn_info = (sngisdn_chan_data_t*) ftdmchan->call_data;
 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) ftdmchan->span->signal_data;
+	ftdm_sngisdn_progind_t prog_ind = {SNGISDN_PROGIND_LOC_USER, SNGISDN_PROGIND_DESCR_NETE_ISDN};
 
  	if (!sngisdn_info->suInstId || !sngisdn_info->spInstId) {
 		ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Sending CONNECT, but no call data, aborting (suId:%d suInstId:%u spInstId:%u)\n", signal_data->cc_id, sngisdn_info->suInstId, sngisdn_info->spInstId);
@@ -415,7 +398,6 @@ void sngisdn_snd_connect(ftdm_channel_t *ftdmchan)
 	
 	memset(&cnStEvnt, 0, sizeof(cnStEvnt));
 
-
 	cnStEvnt.chanId.eh.pres = PRSNT_NODEF;
 	cnStEvnt.chanId.prefExc.pres = PRSNT_NODEF;
 	cnStEvnt.chanId.prefExc.val = IN_PE_EXCLSVE;
@@ -447,14 +429,10 @@ void sngisdn_snd_connect(ftdm_channel_t *ftdmchan)
 		cnStEvnt.chanId.chanNmbSlotMap.len = 1;
 		cnStEvnt.chanId.chanNmbSlotMap.val[0] = ftdmchan->physical_chan_id;
 	}
-	
-	cnStEvnt.progInd.eh.pres = PRSNT_NODEF;
-	cnStEvnt.progInd.location.pres = PRSNT_NODEF;
-	cnStEvnt.progInd.location.val = IN_LOC_USER;
-	cnStEvnt.progInd.codeStand0.pres = PRSNT_NODEF;
-	cnStEvnt.progInd.codeStand0.val = IN_CSTD_CCITT;
-	cnStEvnt.progInd.progDesc.pres = PRSNT_NODEF;
-	cnStEvnt.progInd.progDesc.val = IN_PD_NOTETEISDN; /* Not end-to-end ISDN */
+
+	set_prog_ind_ie(ftdmchan, &cnStEvnt.progInd, prog_ind);
+	set_facility_ie(ftdmchan, &cnStEvnt.facilityStr);
+	ftdm_call_clear_data(&ftdmchan->caller_data);
 
 	ftdm_log_chan(ftdmchan, FTDM_LOG_INFO, "Sending CONNECT (suId:%d suInstId:%u spInstId:%u dchan:%d ces:%d)\n", signal_data->cc_id, sngisdn_info->suInstId, sngisdn_info->spInstId, signal_data->dchan_id, sngisdn_info->ces);
 	if (sng_isdn_con_response(signal_data->cc_id, sngisdn_info->suInstId, sngisdn_info->spInstId, &cnStEvnt, signal_data->dchan_id, sngisdn_info->ces)) {
@@ -463,6 +441,39 @@ void sngisdn_snd_connect(ftdm_channel_t *ftdmchan)
 	return;
 }
 
+void sngisdn_snd_fac_req(ftdm_channel_t *ftdmchan)
+{
+	FacEvnt facEvnt;
+	
+	sngisdn_chan_data_t *sngisdn_info = (sngisdn_chan_data_t*) ftdmchan->call_data;
+	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) ftdmchan->span->signal_data;
+
+	if (!sngisdn_info->suInstId || !sngisdn_info->spInstId) {
+		ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Sending FACILITY, but no call data, ignoring (suId:%d suInstId:%u spInstId:%u)\n", signal_data->cc_id, sngisdn_info->suInstId, sngisdn_info->spInstId);
+		return;
+	}
+		
+	memset(&facEvnt, 0, sizeof(facEvnt));
+	
+	if (set_facility_ie_str(ftdmchan, &facEvnt.facElmt.facStr.val[2], (uint8_t*)&facEvnt.facElmt.facStr.len) != FTDM_SUCCESS) {
+		/* No point in sending a FACILITY message if there is no Facility IE to transmit */
+		return;
+	}
+	ftdm_call_clear_data(&ftdmchan->caller_data);
+	
+	facEvnt.facElmt.eh.pres = PRSNT_NODEF;
+	facEvnt.facElmt.facStr.pres = PRSNT_NODEF;
+	facEvnt.facElmt.facStr.val[0] = 0x1C;
+	facEvnt.facElmt.facStr.val[1] = (uint8_t)facEvnt.facElmt.facStr.len;
+	facEvnt.facElmt.facStr.len +=2; /* Need to include the size of identifier + len */
+	
+	ftdm_log_chan(ftdmchan, FTDM_LOG_INFO, "Sending FACILITY (suId:%d suInstId:%u spInstId:%u dchan:%d ces:%d)\n", signal_data->cc_id, sngisdn_info->suInstId, sngisdn_info->spInstId, signal_data->dchan_id, sngisdn_info->ces);
+
+	if (sng_isdn_facility_request(signal_data->cc_id, sngisdn_info->suInstId, sngisdn_info->spInstId, &facEvnt, MI_FACIL, signal_data->dchan_id, sngisdn_info->ces)) {
+		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_CRIT, 	"stack refused FACILITY request\n");
+	}
+	return;
+}
 
 void sngisdn_snd_info_req(ftdm_channel_t *ftdmchan)
 {
@@ -482,6 +493,8 @@ void sngisdn_snd_info_req(ftdm_channel_t *ftdmchan)
 	//ftdm_log_chan_msg(ftdmchan, FTDM_LOG_INFO, "Sending INFO REQ\n");
 
 
+	ftdm_call_clear_data(&ftdmchan->caller_data);
+	
 	ftdm_log_chan(ftdmchan, FTDM_LOG_INFO, "Sending INFO REQ (suId:%d dchan:%d ces:%d)\n", signal_data->cc_id, signal_data->dchan_id, sngisdn_info->ces);
 
 	if (sng_isdn_con_status(signal_data->cc_id, 0, 0, &cnStEvnt, MI_INFO, signal_data->dchan_id, sngisdn_info->ces)) {
@@ -502,6 +515,8 @@ void sngisdn_snd_status_enq(ftdm_channel_t *ftdmchan)
 
 	memset(&staEvnt, 0, sizeof(StaEvnt));
 
+	ftdm_call_clear_data(&ftdmchan->caller_data);
+	
 	ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Sending Status ENQ on suId:%d suInstId:%u spInstId:%d dchan:%d ces:%d\n", signal_data->cc_id, sngisdn_info->suInstId, sngisdn_info->spInstId, signal_data->dchan_id, sngisdn_info->ces);
 	if (sng_isdn_status_request(signal_data->cc_id, sngisdn_info->suInstId, sngisdn_info->spInstId, &staEvnt, MI_STATENQ)) {
 		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_CRIT, 	"stack refused Status ENQ request\n");
@@ -517,7 +532,7 @@ void sngisdn_snd_disconnect(ftdm_channel_t *ftdmchan)
 	sngisdn_chan_data_t *sngisdn_info = (sngisdn_chan_data_t*) ftdmchan->call_data;
 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) ftdmchan->span->signal_data;
 
- if (!sngisdn_info->suInstId || !sngisdn_info->spInstId) {
+	if (!sngisdn_info->suInstId || !sngisdn_info->spInstId) {
 		ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Sending DISCONNECT, but no call data, aborting (suId:%d suInstId:%u spInstId:%u)\n", signal_data->cc_id, sngisdn_info->suInstId, sngisdn_info->spInstId);
 
 		sngisdn_set_flag(sngisdn_info, FLAG_LOCAL_ABORT);
@@ -527,7 +542,8 @@ void sngisdn_snd_disconnect(ftdm_channel_t *ftdmchan)
 	
 	memset(&discEvnt, 0, sizeof(discEvnt));
 	
-	/* Fill discEvnt here */	
+	/* Fill discEvnt here */
+	/* TODO move this to set_cause_ie function */
   	discEvnt.causeDgn[0].eh.pres = PRSNT_NODEF;
 	discEvnt.causeDgn[0].location.pres = PRSNT_NODEF;
 	discEvnt.causeDgn[0].location.val = IN_LOC_PRIVNETLU;
@@ -538,6 +554,9 @@ void sngisdn_snd_disconnect(ftdm_channel_t *ftdmchan)
 	discEvnt.causeDgn[0].recommend.pres = NOTPRSNT;
 	discEvnt.causeDgn[0].dgnVal.pres = NOTPRSNT;
 
+	set_facility_ie(ftdmchan, &discEvnt.facilityStr);
+	ftdm_call_clear_data(&ftdmchan->caller_data);
+
 	ftdm_log_chan(ftdmchan, FTDM_LOG_INFO, "Sending DISCONNECT (suId:%d suInstId:%u spInstId:%u)\n", signal_data->cc_id, sngisdn_info->suInstId, sngisdn_info->spInstId);
 	if (sng_isdn_disc_request(signal_data->cc_id, sngisdn_info->suInstId, sngisdn_info->spInstId, &discEvnt)) {
 		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_CRIT, "stack refused DISCONNECT request\n");
@@ -562,7 +581,7 @@ void sngisdn_snd_release(ftdm_channel_t *ftdmchan, uint8_t glare)
 	
 	memset(&relEvnt, 0, sizeof(relEvnt));
 	
-	/* Fill discEvnt here */	
+	/* Fill relEvnt here */
   	relEvnt.causeDgn[0].eh.pres = PRSNT_NODEF;
 	relEvnt.causeDgn[0].location.pres = PRSNT_NODEF;
 	relEvnt.causeDgn[0].location.val = IN_LOC_PRIVNETLU;
@@ -582,6 +601,9 @@ void sngisdn_snd_release(ftdm_channel_t *ftdmchan, uint8_t glare)
 		spInstId = sngisdn_info->spInstId;
 	}
 
+	set_facility_ie(ftdmchan, &relEvnt.facilityStr);
+	ftdm_call_clear_data(&ftdmchan->caller_data);
+	
 	ftdm_log_chan(ftdmchan, FTDM_LOG_INFO, "Sending RELEASE/RELEASE COMPLETE (suId:%d suInstId:%u spInstId:%u)\n", signal_data->cc_id, suInstId, spInstId);
 
 	if (glare) {
@@ -597,6 +619,74 @@ void sngisdn_snd_release(ftdm_channel_t *ftdmchan, uint8_t glare)
 }
 
 
+/* We received an incoming frame on the d-channel, send data to the stack */
+void sngisdn_snd_data(ftdm_channel_t *dchan, uint8_t *data, ftdm_size_t len)
+{
+	sng_l1_frame_t l1_frame;
+	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) dchan->span->signal_data;
+
+	memset(&l1_frame, 0, sizeof(l1_frame));
+	l1_frame.len = len;
+
+	memcpy(&l1_frame.data, data, len);
+
+	if (ftdm_test_flag(&(dchan->iostats.rx), FTDM_IOSTATS_ERROR_CRC)) {
+		l1_frame.flags |= SNG_L1FRAME_ERROR_CRC;
+	}
+
+	if (ftdm_test_flag(&(dchan->iostats.rx), FTDM_IOSTATS_ERROR_FRAME)) {
+		l1_frame.flags |= SNG_L1FRAME_ERROR_FRAME;
+	}
+	
+	if (ftdm_test_flag(&(dchan->iostats.rx), FTDM_IOSTATS_ERROR_ABORT)) {
+		l1_frame.flags |= SNG_L1FRAME_ERROR_ABORT;
+	}
+
+	if (ftdm_test_flag(&(dchan->iostats.rx), FTDM_IOSTATS_ERROR_FIFO)) {
+		l1_frame.flags |= SNG_L1FRAME_ERROR_FIFO;
+	}
+
+	if (ftdm_test_flag(&(dchan->iostats.rx), FTDM_IOSTATS_ERROR_DMA)) {
+		l1_frame.flags |= SNG_L1FRAME_ERROR_DMA;
+	}
+
+	if (ftdm_test_flag(&(dchan->iostats.rx), FTDM_IOSTATS_ERROR_QUEUE_THRES)) {
+		/* Should we trigger congestion here? */		
+		l1_frame.flags |= SNG_L1FRAME_QUEUE_THRES;
+	}
+
+	if (ftdm_test_flag(&(dchan->iostats.rx), FTDM_IOSTATS_ERROR_QUEUE_FULL)) {
+		/* Should we trigger congestion here? */
+		l1_frame.flags |= SNG_L1FRAME_QUEUE_FULL;
+	}
+	
+	sng_isdn_data_ind(signal_data->link_id, &l1_frame);
+}
+
+void sngisdn_snd_event(ftdm_channel_t *dchan, ftdm_oob_event_t event)
+{
+	sng_l1_event_t l1_event;
+	sngisdn_span_data_t *signal_data = NULL;
+	memset(&l1_event, 0, sizeof(l1_event));
+	
+	
+	signal_data = (sngisdn_span_data_t*) dchan->span->signal_data;
+	switch(event) {
+		case FTDM_OOB_ALARM_CLEAR:
+			l1_event.type = SNG_L1EVENT_ALARM_OFF;
+			sng_isdn_event_ind(signal_data->link_id, &l1_event);
+			break;
+		case FTDM_OOB_ALARM_TRAP:
+			l1_event.type = SNG_L1EVENT_ALARM_ON;
+			sng_isdn_event_ind(signal_data->link_id, &l1_event);
+			break;
+		default:
+			/* We do not care about the other OOB events for now */
+			return;
+	}
+	return;
+}
+
 
 /* For Emacs:
  * Local Variables:
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
index 7c375f7c64..af180d1f7c 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
@@ -732,7 +732,7 @@ void sngisdn_rcv_q931_ind(InMngmt *status)
 								DECODE_LCM_CAUSE(status->t.usta.alarm.cause), status->t.usta.alarm.cause);
 				
 				sngisdn_set_span_sig_status(ftdmspan, FTDM_SIG_STATE_UP);
-				sng_isdn_set_avail_rate(ftdmspan, SNGISDN_AVAIL_UP);
+				sngisdn_set_avail_rate(ftdmspan, SNGISDN_AVAIL_UP);
 			} else {
 				ftdm_log(FTDM_LOG_WARNING, "[SNGISDN Q931] s%d: %s: %s(%d): %s(%d)\n",
 						 		status->t.usta.suId,
@@ -741,7 +741,7 @@ void sngisdn_rcv_q931_ind(InMngmt *status)
 								DECODE_LCM_CAUSE(status->t.usta.alarm.cause), status->t.usta.alarm.cause);
 				
 				sngisdn_set_span_sig_status(ftdmspan, FTDM_SIG_STATE_DOWN);
-				sng_isdn_set_avail_rate(ftdmspan, SNGISDN_AVAIL_PWR_SAVING);
+				sngisdn_set_avail_rate(ftdmspan, SNGISDN_AVAIL_PWR_SAVING);
 			}
 		}
 		break;
@@ -862,6 +862,82 @@ end_of_trace:
 	return;
 }
 
+/* The stacks is wants to transmit a frame */
+int16_t sngisdn_rcv_l1_data_req(uint16_t spId, sng_l1_frame_t *l1_frame)
+{
+	ftdm_status_t status;
+	ftdm_wait_flag_t flags = FTDM_WRITE;
+	sngisdn_span_data_t	*signal_data = g_sngisdn_data.spans[spId];	
+	ftdm_size_t length = l1_frame->len;
+
+	ftdm_assert(signal_data, "Received Data request on unconfigured span\n");
+	
+	do {
+		flags = FTDM_WRITE;
+		status = signal_data->dchan->fio->wait(signal_data->dchan, &flags, 1000);
+		if (status != FTDM_SUCCESS) {
+			ftdm_log_chan_msg(signal_data->dchan, FTDM_LOG_WARNING, "transmit timed-out\n");
+			return -1;
+		}
+		
+		
+		if ((flags & FTDM_WRITE)) {
+			status = signal_data->dchan->fio->write(signal_data->dchan, l1_frame->data, (ftdm_size_t*)&length);
+			if (status != FTDM_SUCCESS) {
+				ftdm_log_chan_msg(signal_data->dchan, FTDM_LOG_CRIT, "Failed to transmit frame\n");
+				return -1;
+			}
+			break;
+		/* On WIN32, it is possible for poll to return without FTDM_WRITE flag set, so we try to retransmit */
+#ifndef WIN32
+		} else {
+			ftdm_log_chan_msg(signal_data->dchan, FTDM_LOG_WARNING, "Failed to poll for d-channel\n");
+			return -1;
+#endif
+		}
+	} while(1);
+	return 0;
+}
+
+int16_t sngisdn_rcv_l1_cmd_req(uint16_t spId, sng_l1_cmd_t *l1_cmd)
+{	
+	sngisdn_span_data_t	*signal_data = g_sngisdn_data.spans[spId];
+	ftdm_assert(signal_data, "Received Data request on unconfigured span\n");
+	
+	switch(l1_cmd->type) {
+		case SNG_L1CMD_SET_LINK_STATUS:
+			{
+				ftdm_channel_hw_link_status_t status = FTDM_HW_LINK_CONNECTED;
+				ftdm_channel_command(signal_data->dchan, FTDM_COMMAND_SET_LINK_STATUS, &status);
+			}
+			break;
+		case SNG_L1CMD_GET_LINK_STATUS:
+			{
+				ftdm_channel_hw_link_status_t status = 0;
+				ftdm_channel_command(signal_data->dchan, FTDM_COMMAND_GET_LINK_STATUS, &status);
+				if (status == FTDM_HW_LINK_CONNECTED) {
+					l1_cmd->cmd.status = 1;
+				} else if (status == FTDM_HW_LINK_DISCONNECTED) {
+					l1_cmd->cmd.status = 0;
+				} else {
+					ftdm_log_chan(signal_data->dchan, FTDM_LOG_CRIT, "Invalid link status reported %d\n", status);
+					l1_cmd->cmd.status = 0;
+				}
+			}
+			break;
+		case SNG_L1CMD_FLUSH_STATS:
+			ftdm_channel_command(signal_data->dchan, FTDM_COMMAND_FLUSH_IOSTATS, NULL);
+			break;
+		case SNG_L1CMD_FLUSH_BUFFERS:
+			ftdm_channel_command(signal_data->dchan, FTDM_COMMAND_FLUSH_BUFFERS, NULL);
+			break;
+		default:
+			ftdm_log_chan(signal_data->dchan, FTDM_LOG_CRIT, "Unsupported channel command:%d\n", l1_cmd->type);
+			return -1;
+	}
+	return 0;
+}
+
 void sngisdn_rcv_sng_assert(char *message)
 {
 	ftdm_assert(0, message);
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
index 7322aeddaa..76d11d6d34 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
@@ -33,13 +33,22 @@
  */
 
 #include "ftmod_sangoma_isdn.h"
+#define SNGISDN_Q931_FACILITY_IE_ID 0x1C
+
+/* ftmod_sangoma_isdn specific enum look-up functions */
+
+SNGISDN_ENUM_NAMES(SNGISDN_PROGIND_DESCR_NAMES, SNGISDN_PROGIND_DESCR_STRINGS)
+SNGISDN_STR2ENUM(ftdm_str2ftdm_sngisdn_progind_descr, ftdm_sngisdn_progind_descr2str, ftdm_sngisdn_progind_descr_t, SNGISDN_PROGIND_DESCR_NAMES, SNGISDN_PROGIND_DESCR_INVALID)
+
+SNGISDN_ENUM_NAMES(SNGISDN_PROGIND_LOC_NAMES, SNGISDN_PROGIND_LOC_STRINGS)
+SNGISDN_STR2ENUM(ftdm_str2ftdm_sngisdn_progind_loc, ftdm_sngisdn_progind_loc2str, ftdm_sngisdn_progind_loc_t, SNGISDN_PROGIND_LOC_NAMES, SNGISDN_PROGIND_LOC_INVALID)
 
 ftdm_status_t sngisdn_check_free_ids(void);
 
 extern ftdm_sngisdn_data_t	g_sngisdn_data;
 void get_memory_info(void);
 
-FT_DECLARE(void) clear_call_data(sngisdn_chan_data_t *sngisdn_info)
+void clear_call_data(sngisdn_chan_data_t *sngisdn_info)
 {
 	uint32_t cc_id = ((sngisdn_span_data_t*)sngisdn_info->ftdmchan->span->signal_data)->cc_id;
 
@@ -56,7 +65,7 @@ FT_DECLARE(void) clear_call_data(sngisdn_chan_data_t *sngisdn_info)
 	return;
 }
 
-FT_DECLARE(void) clear_call_glare_data(sngisdn_chan_data_t *sngisdn_info)
+void clear_call_glare_data(sngisdn_chan_data_t *sngisdn_info)
 {
 	ftdm_log_chan(sngisdn_info->ftdmchan, FTDM_LOG_DEBUG, "Clearing glare data (suId:%d suInstId:%u spInstId:%u actv-suInstId:%u  actv-spInstId:%u)\n",
 										sngisdn_info->glare.suId,
@@ -81,7 +90,7 @@ FT_DECLARE(void) clear_call_glare_data(sngisdn_chan_data_t *sngisdn_info)
 }
 
 
-FT_DECLARE(uint32_t) get_unique_suInstId(int16_t cc_id)
+uint32_t get_unique_suInstId(int16_t cc_id)
 {
 	uint32_t suInstId;
 	ftdm_assert_return((cc_id > 0 && cc_id <=MAX_VARIANTS), FTDM_FAIL, "Invalid cc_id\n");
@@ -103,7 +112,7 @@ FT_DECLARE(uint32_t) get_unique_suInstId(int16_t cc_id)
 	return 0;
 }
 
-FT_DECLARE(ftdm_status_t) get_ftdmchan_by_suInstId(int16_t cc_id, uint32_t suInstId, sngisdn_chan_data_t **sngisdn_data)
+ftdm_status_t get_ftdmchan_by_suInstId(int16_t cc_id, uint32_t suInstId, sngisdn_chan_data_t **sngisdn_data)
 {
 	ftdm_assert_return((cc_id > 0 && cc_id <=MAX_VARIANTS), FTDM_FAIL, "Invalid cc_id\n");
 	ftdm_assert_return(g_sngisdn_data.ccs[cc_id].activation_done, FTDM_FAIL, "Trying to find call on unconfigured CC\n");
@@ -115,7 +124,7 @@ FT_DECLARE(ftdm_status_t) get_ftdmchan_by_suInstId(int16_t cc_id, uint32_t suIns
 	return FTDM_SUCCESS;
 }
 
-FT_DECLARE(ftdm_status_t) get_ftdmchan_by_spInstId(int16_t cc_id, uint32_t spInstId, sngisdn_chan_data_t **sngisdn_data)
+ftdm_status_t get_ftdmchan_by_spInstId(int16_t cc_id, uint32_t spInstId, sngisdn_chan_data_t **sngisdn_data)
 {
 	ftdm_assert_return((cc_id > 0 && cc_id <=MAX_VARIANTS), FTDM_FAIL, "Invalid cc_id\n");
 	ftdm_assert_return(g_sngisdn_data.ccs[cc_id].activation_done, FTDM_FAIL, "Trying to find call on unconfigured CC\n");
@@ -127,9 +136,8 @@ FT_DECLARE(ftdm_status_t) get_ftdmchan_by_spInstId(int16_t cc_id, uint32_t spIns
 	return FTDM_SUCCESS;
 }
 
-ftdm_status_t sng_isdn_set_avail_rate(ftdm_span_t *span, sngisdn_avail_t avail)
+ftdm_status_t sngisdn_set_avail_rate(ftdm_span_t *span, sngisdn_avail_t avail)
 {
-	
 	if (span->trunk_type == FTDM_TRUNK_BRI ||
 		span->trunk_type == FTDM_TRUNK_BRI_PTMP) {
 
@@ -147,77 +155,117 @@ ftdm_status_t sng_isdn_set_avail_rate(ftdm_span_t *span, sngisdn_avail_t avail)
 	return FTDM_SUCCESS;
 }
 
-FT_DECLARE(ftdm_status_t) cpy_calling_num_from_stack(ftdm_caller_data_t *ftdm, CgPtyNmb *cgPtyNmb)
+ftdm_status_t get_calling_num(ftdm_channel_t *ftdmchan, CgPtyNmb *cgPtyNmb)
 {
+	ftdm_caller_data_t *caller_data = &ftdmchan->caller_data;
 	if (cgPtyNmb->eh.pres != PRSNT_NODEF) {
 		return FTDM_FAIL;
 	}
 
 	if (cgPtyNmb->screenInd.pres == PRSNT_NODEF) {
-		ftdm->screen = cgPtyNmb->screenInd.val;
+		caller_data->screen = cgPtyNmb->screenInd.val;
 	}
 
 	if (cgPtyNmb->presInd0.pres == PRSNT_NODEF) {
-		ftdm->pres = cgPtyNmb->presInd0.val;
+		caller_data->pres = cgPtyNmb->presInd0.val;
 	}
 
 	if (cgPtyNmb->nmbPlanId.pres == PRSNT_NODEF) {
-		ftdm->cid_num.plan = cgPtyNmb->nmbPlanId.val;
+		caller_data->cid_num.plan = cgPtyNmb->nmbPlanId.val;
 	}
+		
 	if (cgPtyNmb->typeNmb1.pres == PRSNT_NODEF) {
-		ftdm->cid_num.type = cgPtyNmb->typeNmb1.val;
+		caller_data->cid_num.type = cgPtyNmb->typeNmb1.val;
 	}
 	
 	if (cgPtyNmb->nmbDigits.pres == PRSNT_NODEF) {
-		ftdm_copy_string(ftdm->cid_num.digits, (const char*)cgPtyNmb->nmbDigits.val, cgPtyNmb->nmbDigits.len+1);
+		ftdm_copy_string(caller_data->cid_num.digits, (const char*)cgPtyNmb->nmbDigits.val, cgPtyNmb->nmbDigits.len+1);
 	}
+	memcpy(&caller_data->ani, &caller_data->cid_num, sizeof(caller_data->ani));
 	return FTDM_SUCCESS;
 }
 
-FT_DECLARE(ftdm_status_t) cpy_called_num_from_stack(ftdm_caller_data_t *ftdm, CdPtyNmb *cdPtyNmb)
+ftdm_status_t get_calling_num2(ftdm_channel_t *ftdmchan, CgPtyNmb *cgPtyNmb)
 {
+	ftdm_caller_data_t *caller_data = &ftdmchan->caller_data;
+	if (cgPtyNmb->eh.pres != PRSNT_NODEF) {
+		return FTDM_FAIL;
+	}
+
+	if (cgPtyNmb->screenInd.pres == PRSNT_NODEF) {
+		ftdm_call_add_var(caller_data, "isdn.cg_pty2.screen_ind", ftdm_screening2str(cgPtyNmb->screenInd.val));
+	}
+
+	if (cgPtyNmb->presInd0.pres == PRSNT_NODEF) {
+		ftdm_call_add_var(caller_data, "isdn.cg_pty2.presentation_ind", ftdm_presentation2str(cgPtyNmb->presInd0.val));
+	}
+
+	if (cgPtyNmb->nmbPlanId.pres == PRSNT_NODEF) {
+		ftdm_call_add_var(caller_data, "isdn.cg_pty2.npi", ftdm_npi2str(cgPtyNmb->nmbPlanId.val));
+	}
+		
+	if (cgPtyNmb->typeNmb1.pres == PRSNT_NODEF) {
+		ftdm_call_add_var(caller_data, "isdn.cg_pty2.ton", ftdm_ton2str(cgPtyNmb->typeNmb1.val));
+	}
+	
+	if (cgPtyNmb->nmbDigits.pres == PRSNT_NODEF) {
+		char digits_string [32];
+		memcpy(digits_string, (const char*)cgPtyNmb->nmbDigits.val, cgPtyNmb->nmbDigits.len);
+		digits_string[cgPtyNmb->nmbDigits.len] = '\0';
+		ftdm_call_add_var(caller_data, "isdn.cg_pty2.digits", digits_string);
+	}
+	memcpy(&caller_data->ani, &caller_data->cid_num, sizeof(caller_data->ani));
+	return FTDM_SUCCESS;
+}
+
+ftdm_status_t get_called_num(ftdm_channel_t *ftdmchan, CdPtyNmb *cdPtyNmb)
+{
+	ftdm_caller_data_t *caller_data = &ftdmchan->caller_data;
 	if (cdPtyNmb->eh.pres != PRSNT_NODEF) {
 		return FTDM_FAIL;
 	}
 
 	if (cdPtyNmb->nmbPlanId.pres == PRSNT_NODEF) {
-		ftdm->dnis.plan = cdPtyNmb->nmbPlanId.val;
+		caller_data->dnis.plan = cdPtyNmb->nmbPlanId.val;
 	}
 
 	if (cdPtyNmb->typeNmb0.pres == PRSNT_NODEF) {
-		ftdm->dnis.type = cdPtyNmb->typeNmb0.val;
+		caller_data->dnis.type = cdPtyNmb->typeNmb0.val;
 	}
 	
 	if (cdPtyNmb->nmbDigits.pres == PRSNT_NODEF) {
-		unsigned i = strlen(ftdm->dnis.digits);
+		/* In overlap receive mode, append the new digits to the existing dnis */
+		unsigned i = strlen(caller_data->dnis.digits);
 		
-		ftdm_copy_string(&ftdm->dnis.digits[i], (const char*)cdPtyNmb->nmbDigits.val, cdPtyNmb->nmbDigits.len+1);
+		ftdm_copy_string(&caller_data->dnis.digits[i], (const char*)cdPtyNmb->nmbDigits.val, cdPtyNmb->nmbDigits.len+1);
 	}
 	return FTDM_SUCCESS;
 }
 
-FT_DECLARE(ftdm_status_t) cpy_redir_num_from_stack(ftdm_caller_data_t *ftdm, RedirNmb *redirNmb)
+ftdm_status_t get_redir_num(ftdm_channel_t *ftdmchan, RedirNmb *redirNmb)
 {
+	ftdm_caller_data_t *caller_data = &ftdmchan->caller_data;
 	if (redirNmb->eh.pres != PRSNT_NODEF) {
 		return FTDM_FAIL;
 	}
 
 	if (redirNmb->nmbPlanId.pres == PRSNT_NODEF) {
-		ftdm->rdnis.plan = redirNmb->nmbPlanId.val;
+		caller_data->rdnis.plan = redirNmb->nmbPlanId.val;
 	}
 
 	if (redirNmb->typeNmb.pres == PRSNT_NODEF) {
-		ftdm->rdnis.type = redirNmb->typeNmb.val;
+		caller_data->rdnis.type = redirNmb->typeNmb.val;
 	}
 	
 	if (redirNmb->nmbDigits.pres == PRSNT_NODEF) {
-		ftdm_copy_string(ftdm->rdnis.digits, (const char*)redirNmb->nmbDigits.val, redirNmb->nmbDigits.len+1);
+		ftdm_copy_string(caller_data->rdnis.digits, (const char*)redirNmb->nmbDigits.val, redirNmb->nmbDigits.len+1);
 	}
 	return FTDM_SUCCESS;
 }
 
-FT_DECLARE(ftdm_status_t) cpy_calling_name_from_stack(ftdm_caller_data_t *ftdm, Display *display)
+ftdm_status_t get_calling_name_from_display(ftdm_channel_t *ftdmchan, Display *display)
 {
+	ftdm_caller_data_t *caller_data = &ftdmchan->caller_data;
 	if (display->eh.pres != PRSNT_NODEF) {
 		return FTDM_FAIL;
 	}
@@ -225,71 +273,307 @@ FT_DECLARE(ftdm_status_t) cpy_calling_name_from_stack(ftdm_caller_data_t *ftdm,
 		return FTDM_FAIL;
 	}
 	
-	ftdm_copy_string(ftdm->cid_name, (const char*)display->dispInfo.val, display->dispInfo.len+1);
+	ftdm_copy_string(caller_data->cid_name, (const char*)display->dispInfo.val, display->dispInfo.len+1);
 	return FTDM_SUCCESS;
 }
 
-FT_DECLARE(ftdm_status_t) cpy_calling_num_from_user(CgPtyNmb *cgPtyNmb, ftdm_caller_data_t *ftdm)
+ftdm_status_t get_calling_name_from_usr_usr(ftdm_channel_t *ftdmchan, UsrUsr *usrUsr)
 {
-	uint8_t len = strlen(ftdm->cid_num.digits);
+	ftdm_caller_data_t *caller_data = &ftdmchan->caller_data;
+	if (usrUsr->eh.pres != PRSNT_NODEF) {
+		return FTDM_FAIL;
+	}
+	
+	if (usrUsr->protocolDisc.val != PD_IA5) {
+		return FTDM_FAIL;
+	}
+		
+	if (usrUsr->usrInfo.pres != PRSNT_NODEF) {
+		return FTDM_FAIL;
+	}
+		
+	ftdm_copy_string(caller_data->cid_name, (const char*)usrUsr->usrInfo.val, usrUsr->usrInfo.len+1);
+	return FTDM_SUCCESS;
+}
+
+ftdm_status_t get_calling_subaddr(ftdm_channel_t *ftdmchan, CgPtySad *cgPtySad)
+{
+	char subaddress[100];
+	
+	if (cgPtySad->eh.pres != PRSNT_NODEF) {
+		return FTDM_FAIL;
+	}
+	memset(subaddress, 0, sizeof(subaddress));
+	if(cgPtySad->sadInfo.len >= sizeof(subaddress)) {
+		ftdm_log_chan(ftdmchan, FTDM_LOG_WARNING, "Calling Party Subaddress exceeds local size limit (len:%d max:%d)\n", cgPtySad->sadInfo.len, sizeof(subaddress));
+		cgPtySad->sadInfo.len = sizeof(subaddress)-1;
+	}
+		
+	memcpy(subaddress, (char*)cgPtySad->sadInfo.val, cgPtySad->sadInfo.len);
+	subaddress[cgPtySad->sadInfo.len] = '\0';
+	ftdm_call_add_var(&ftdmchan->caller_data, "isdn.calling_subaddr", subaddress);
+	return FTDM_SUCCESS;
+}
+
+ftdm_status_t get_facility_ie(ftdm_channel_t *ftdmchan, FacilityStr *facilityStr)
+{
+	if (!facilityStr->eh.pres) {
+		return FTDM_FAIL;
+	}
+
+	return get_facility_ie_str(ftdmchan, facilityStr->facilityStr.val, facilityStr->facilityStr.len);
+}
+
+ftdm_status_t get_facility_ie_str(ftdm_channel_t *ftdmchan, uint8_t *data, uint8_t data_len)
+{
+	ftdm_caller_data_t *caller_data = &ftdmchan->caller_data;
+	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) ftdmchan->span->signal_data;
+	
+	if (signal_data->facility_ie_decode == SNGISDN_OPT_FALSE) {
+		/* size of facilityStr->facilityStr.len is a uint8_t so no need to check
+		for overflow here as facilityStr->facilityStr.len will always be smaller
+		than sizeof(caller_data->raw_data) */
+		
+		memset(caller_data->raw_data, 0, sizeof(caller_data->raw_data));
+		/* Always include Facility IE identifier + len so this can be used as a sanity check by the user */
+		caller_data->raw_data[0] = SNGISDN_Q931_FACILITY_IE_ID;
+		caller_data->raw_data[1] = data_len;
+	
+		memcpy(&caller_data->raw_data[2], data, data_len);
+		caller_data->raw_data_len = data_len+2;
+		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "Raw Facility IE copied available\n");
+	} else {
+		/* Call libsng_isdn to process facility IE's here */
+	}
+	return FTDM_SUCCESS;
+}
+
+ftdm_status_t get_prog_ind_ie(ftdm_channel_t *ftdmchan, ProgInd *progInd)
+{
+	uint8_t val;	
+	if (!progInd->eh.pres) {
+		return FTDM_FAIL;
+	}
+
+	if (progInd->progDesc.pres) {
+		switch (progInd->progDesc.val) {
+			case IN_PD_NOTETEISDN:
+				val = SNGISDN_PROGIND_DESCR_NETE_ISDN;
+				break;
+			case IN_PD_DSTNOTISDN:
+				val = SNGISDN_PROGIND_DESCR_DEST_NISDN;
+				break;
+			case IN_PD_ORGNOTISDN:
+				val = SNGISDN_PROGIND_DESCR_ORIG_NISDN;
+				break;
+			case IN_PD_CALLRET:
+				val = SNGISDN_PROGIND_DESCR_RET_ISDN;
+				break;
+			case IN_PD_DELRESP:
+				val = SNGISDN_PROGIND_DESCR_SERV_CHANGE;
+				break;
+			case IN_PD_IBAVAIL:
+				val = SNGISDN_PROGIND_DESCR_IB_AVAIL;
+				break;
+			default:
+				ftdm_log_chan(ftdmchan, FTDM_LOG_WARNING, "Unknown Progress Indicator Description (%d)\n", progInd->progDesc.val);
+				val = SNGISDN_PROGIND_DESCR_INVALID;
+				break;
+		}
+		ftdm_call_add_var(&ftdmchan->caller_data, "isdn.prog_ind.descr", ftdm_sngisdn_progind_descr2str(val));
+	}
+	
+	if (progInd->location.pres) {
+		switch (progInd->location.val) {
+			case IN_LOC_USER:
+				val = SNGISDN_PROGIND_LOC_USER;
+				break;
+			case IN_LOC_PRIVNETLU:
+				val = SNGISDN_PROGIND_LOC_PRIV_NET_LOCAL_USR;
+				break;
+			case IN_LOC_PUBNETLU:
+				val = SNGISDN_PROGIND_LOC_PUB_NET_LOCAL_USR;
+				break;
+			case IN_LOC_TRANNET:
+				val = SNGISDN_PROGIND_LOC_TRANSIT_NET;
+				break;
+			case IN_LOC_PUBNETRU:
+				val = SNGISDN_PROGIND_LOC_PUB_NET_REMOTE_USR;
+				break;
+			case IN_LOC_PRIVNETRU:
+				val = SNGISDN_PROGIND_LOC_PRIV_NET_REMOTE_USR;
+				break;
+			case IN_LOC_NETINTER:
+				val = SNGISDN_PROGIND_LOC_NET_BEYOND_INTRW;
+				break;
+			default:
+				ftdm_log_chan(ftdmchan, FTDM_LOG_WARNING, "Unknown Progress Indicator Location (%d)", progInd->location.val);
+				val = SNGISDN_PROGIND_LOC_INVALID;
+				break;
+		}
+		ftdm_call_add_var(&ftdmchan->caller_data, "isdn.prog_ind.loc", ftdm_sngisdn_progind_loc2str(val));
+	}	
+	return FTDM_SUCCESS;
+}
+
+
+ftdm_status_t set_calling_num(ftdm_channel_t *ftdmchan, CgPtyNmb *cgPtyNmb)
+{
+	ftdm_caller_data_t *caller_data = &ftdmchan->caller_data;
+	uint8_t len = strlen(caller_data->cid_num.digits);
 	if (!len) {
 		return FTDM_SUCCESS;
 	}
 	cgPtyNmb->eh.pres			= PRSNT_NODEF;
 
 	cgPtyNmb->screenInd.pres	= PRSNT_NODEF;
-	cgPtyNmb->screenInd.val		= ftdm->screen;
+	cgPtyNmb->screenInd.val		= caller_data->screen;
 
 	cgPtyNmb->presInd0.pres     = PRSNT_NODEF;
-	cgPtyNmb->presInd0.val      = ftdm->pres;
-
+	cgPtyNmb->presInd0.val      = caller_data->pres;
+	
 	cgPtyNmb->nmbPlanId.pres	= PRSNT_NODEF;
-	cgPtyNmb->nmbPlanId.val		= ftdm->cid_num.plan;
+	if (caller_data->cid_num.plan >= FTDM_NPI_INVALID) {
+		cgPtyNmb->nmbPlanId.val		= FTDM_NPI_UNKNOWN;
+	} else {
+		cgPtyNmb->nmbPlanId.val		= caller_data->cid_num.plan;
+	}
 
 	cgPtyNmb->typeNmb1.pres		= PRSNT_NODEF;
-	cgPtyNmb->typeNmb1.val		= ftdm->cid_num.type;
+
+	if (caller_data->cid_num.type >= FTDM_TON_INVALID) {
+		cgPtyNmb->typeNmb1.val		= FTDM_TON_UNKNOWN;
+	} else {
+		cgPtyNmb->typeNmb1.val		= caller_data->cid_num.type;
+	}
 
 	cgPtyNmb->nmbDigits.pres	= PRSNT_NODEF;
 	cgPtyNmb->nmbDigits.len		= len;
 
-	memcpy(cgPtyNmb->nmbDigits.val, ftdm->cid_num.digits, len);
+	memcpy(cgPtyNmb->nmbDigits.val, caller_data->cid_num.digits, len);
 
 	return FTDM_SUCCESS;
 }
 
-FT_DECLARE(ftdm_status_t) cpy_called_num_from_user(CdPtyNmb *cdPtyNmb, ftdm_caller_data_t *ftdm)
+ftdm_status_t set_calling_num2(ftdm_channel_t *ftdmchan, CgPtyNmb *cgPtyNmb)
 {
-	uint8_t len = strlen(ftdm->dnis.digits);
+	const char* string = NULL;
+	uint8_t len,val;
+	ftdm_caller_data_t *caller_data = &ftdmchan->caller_data;
+	
+	string = ftdm_call_get_var(caller_data, "isdn.cg_pty2.digits");
+	if ((string == NULL) || !(*string)) {
+		return FTDM_FAIL;
+	}
+
+	cgPtyNmb->eh.pres			= PRSNT_NODEF;
+	
+	len = strlen(string);
+	cgPtyNmb->nmbDigits.len		= len;
+
+	cgPtyNmb->nmbDigits.pres	= PRSNT_NODEF;
+	memcpy(cgPtyNmb->nmbDigits.val, string, len);
+
+	/* Screening Indicator */
+	cgPtyNmb->screenInd.pres	= PRSNT_NODEF;
+
+	val = FTDM_SCREENING_INVALID;
+	string = ftdm_call_get_var(caller_data, "isdn.cg_pty2.screening_ind");
+	if ((string != NULL) && (*string)) {
+		val = ftdm_str2ftdm_screening(string);
+	}
+
+	/* isdn.cg_pty2.screen_ind does not exist or we could not parse its value */
+	if (val == FTDM_SCREENING_INVALID) {		
+		/* default to caller data screening ind */
+		cgPtyNmb->screenInd.val = caller_data->screen;
+	} else {
+		cgPtyNmb->screenInd.val = val;
+	}
+
+	/* Presentation Indicator */
+	cgPtyNmb->presInd0.pres = PRSNT_NODEF;
+	
+	val = FTDM_PRES_INVALID;
+	string = ftdm_call_get_var(caller_data, "isdn.cg_pty2.presentation_ind");
+	if ((string != NULL) && (*string)) {
+		val = ftdm_str2ftdm_presentation(string);
+	}
+
+	if (val == FTDM_PRES_INVALID) {
+		cgPtyNmb->presInd0.val = caller_data->pres;
+	} else {
+		cgPtyNmb->presInd0.val = val;
+	}
+
+	/* Numbering Plan Indicator */
+	cgPtyNmb->nmbPlanId.pres	= PRSNT_NODEF;
+	
+	val = FTDM_NPI_INVALID;
+	string = ftdm_call_get_var(caller_data, "isdn.cg_pty2.npi");
+	if ((string != NULL) && (*string)) {
+		val = ftdm_str2ftdm_npi(string);
+	}
+
+	if (val == FTDM_NPI_INVALID) {
+		cgPtyNmb->nmbPlanId.val = caller_data->cid_num.plan;
+	} else {
+		cgPtyNmb->nmbPlanId.val	= val;
+	}
+
+	cgPtyNmb->typeNmb1.pres		= PRSNT_NODEF;
+
+	/* Type of Number */
+	val = FTDM_TON_INVALID;
+	string = ftdm_call_get_var(caller_data, "isdn.cg_pty2.ton");
+	if ((string != NULL) && (*string)) {
+		val = ftdm_str2ftdm_ton(string);
+	}
+
+	if (val == FTDM_TON_INVALID) {
+		cgPtyNmb->typeNmb1.val = caller_data->cid_num.type;
+	} else {
+		cgPtyNmb->typeNmb1.val = val;
+	}
+	return FTDM_SUCCESS;
+}
+
+ftdm_status_t set_called_num(ftdm_channel_t *ftdmchan, CdPtyNmb *cdPtyNmb)
+{
+	ftdm_caller_data_t *caller_data = &ftdmchan->caller_data;
+	uint8_t len = strlen(caller_data->dnis.digits);
+	
 	if (!len) {
 		return FTDM_SUCCESS;
 	}
 	cdPtyNmb->eh.pres           = PRSNT_NODEF;
 
 	cdPtyNmb->nmbPlanId.pres      = PRSNT_NODEF;
-	if (ftdm->dnis.plan == FTDM_NPI_INVALID) {
+	if (caller_data->dnis.plan >= FTDM_NPI_INVALID) {
 		cdPtyNmb->nmbPlanId.val       = FTDM_NPI_UNKNOWN;
 	} else {
-		cdPtyNmb->nmbPlanId.val       = ftdm->dnis.plan;
+		cdPtyNmb->nmbPlanId.val       = caller_data->dnis.plan;
 	}
 	
 	cdPtyNmb->typeNmb0.pres       = PRSNT_NODEF;
-	if (ftdm->dnis.type == FTDM_TON_INVALID) {
+	if (caller_data->dnis.type >= FTDM_TON_INVALID) {
 		cdPtyNmb->typeNmb0.val        = FTDM_TON_UNKNOWN;
 	} else {
-		cdPtyNmb->typeNmb0.val        = ftdm->dnis.type;
+		cdPtyNmb->typeNmb0.val        = caller_data->dnis.type;
 	}
 
 	cdPtyNmb->nmbDigits.pres = PRSNT_NODEF;
 	cdPtyNmb->nmbDigits.len = len;
 
 	
-	memcpy(cdPtyNmb->nmbDigits.val, ftdm->dnis.digits, len);
+	memcpy(cdPtyNmb->nmbDigits.val, caller_data->dnis.digits, len);
     return FTDM_SUCCESS;
 }
 
-FT_DECLARE(ftdm_status_t) cpy_redir_num_from_user(RedirNmb *redirNmb, ftdm_caller_data_t *ftdm)
+ftdm_status_t set_redir_num(ftdm_channel_t *ftdmchan, RedirNmb *redirNmb)
 {
-	uint8_t len = strlen(ftdm->rdnis.digits);
+	ftdm_caller_data_t *caller_data = &ftdmchan->caller_data;
+	uint8_t len = strlen(caller_data->rdnis.digits);
 	if (!len) {
 		return FTDM_SUCCESS;
 	}
@@ -297,36 +581,36 @@ FT_DECLARE(ftdm_status_t) cpy_redir_num_from_user(RedirNmb *redirNmb, ftdm_calle
 	redirNmb->eh.pres 	= PRSNT_NODEF;
 
 	redirNmb->nmbPlanId.pres 	= PRSNT_NODEF;
-	if (ftdm->rdnis.plan == FTDM_NPI_INVALID) {
+	if (caller_data->rdnis.plan >= FTDM_NPI_INVALID) {
 		redirNmb->nmbPlanId.val	= FTDM_NPI_UNKNOWN;
 	} else {
-		redirNmb->nmbPlanId.val = ftdm->rdnis.plan;
+		redirNmb->nmbPlanId.val = caller_data->rdnis.plan;
 	}
 
 	redirNmb->typeNmb.pres		= PRSNT_NODEF;
-	if (ftdm->rdnis.type == FTDM_TON_INVALID) {
+	if (caller_data->rdnis.type >= FTDM_TON_INVALID) {
 		redirNmb->typeNmb.val		= FTDM_TON_UNKNOWN;
 	} else {
-		redirNmb->typeNmb.val		= ftdm->rdnis.type;
+		redirNmb->typeNmb.val		= caller_data->rdnis.type;
 	}
 
 	redirNmb->nmbDigits.pres = PRSNT_NODEF;
 	redirNmb->nmbDigits.len = len;
 
-	memcpy(redirNmb->nmbDigits.val, ftdm->rdnis.digits, len);
+	memcpy(redirNmb->nmbDigits.val, caller_data->rdnis.digits, len);
 
 	return FTDM_SUCCESS;
 }
 
 
-FT_DECLARE(ftdm_status_t) cpy_calling_name_from_user(ConEvnt *conEvnt, ftdm_channel_t *ftdmchan)
+ftdm_status_t set_calling_name(ftdm_channel_t *ftdmchan, ConEvnt *conEvnt)
 {
 	uint8_t len;
-	ftdm_caller_data_t *ftdm = &ftdmchan->caller_data;
+	ftdm_caller_data_t *caller_data = &ftdmchan->caller_data;
 	/* sngisdn_chan_data_t *sngisdn_info = ftdmchan->call_data; */
 	sngisdn_span_data_t *signal_data = (sngisdn_span_data_t*) ftdmchan->span->signal_data;
 
-	len = strlen(ftdm->cid_name); 
+	len = strlen(caller_data->cid_name);
 	if (!len) {
 		return FTDM_SUCCESS;
 	}
@@ -341,7 +625,7 @@ FT_DECLARE(ftdm_status_t) cpy_calling_name_from_user(ConEvnt *conEvnt, ftdm_chan
 		conEvnt->usrUsr.usrInfo.len = len;
 		/* in sangoma_brid we used to send usr-usr info as <cid_name>!<calling_number>,
 		change to previous style if current one does not work */
-		memcpy(conEvnt->usrUsr.usrInfo.val, ftdm->cid_name, len);
+		memcpy(conEvnt->usrUsr.usrInfo.val, caller_data->cid_name, len);
 	} else {
 		switch (signal_data->switchtype) {
 		case SNGISDN_SWITCH_NI2:
@@ -359,7 +643,7 @@ FT_DECLARE(ftdm_status_t) cpy_calling_name_from_user(ConEvnt *conEvnt, ftdm_chan
 			conEvnt->display.eh.pres = PRSNT_NODEF;
 			conEvnt->display.dispInfo.pres = PRSNT_NODEF;
 			conEvnt->display.dispInfo.len = len;
-			memcpy(conEvnt->display.dispInfo.val, ftdm->cid_name, len);
+			memcpy(conEvnt->display.dispInfo.val, caller_data->cid_name, len);
 			break;
 		case SNGISDN_SWITCH_QSIG:
 			/* It seems like QSIG does not support Caller ID Name */
@@ -372,6 +656,140 @@ FT_DECLARE(ftdm_status_t) cpy_calling_name_from_user(ConEvnt *conEvnt, ftdm_chan
 	return FTDM_SUCCESS;
 }
 
+ftdm_status_t set_calling_subaddr(ftdm_channel_t *ftdmchan, CgPtySad *cgPtySad)
+{
+	const char* clg_subaddr = NULL;
+	clg_subaddr = ftdm_call_get_var(&ftdmchan->caller_data, "isdn.calling_subaddr");
+	if ((clg_subaddr != NULL) && (*clg_subaddr)) {
+		unsigned len = strlen (clg_subaddr);
+		cgPtySad->eh.pres = PRSNT_NODEF;
+		cgPtySad->typeSad.pres = 1;
+		cgPtySad->typeSad.val = 0; /* NSAP */
+		cgPtySad->oddEvenInd.pres = 1;
+		cgPtySad->oddEvenInd.val = 0;
+
+		ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Sending Calling Party Subaddress:%s\n", clg_subaddr);
+		cgPtySad->sadInfo.pres = 1;
+		cgPtySad->sadInfo.len = len;
+		memcpy(cgPtySad->sadInfo.val, clg_subaddr, len);
+	}
+	return FTDM_SUCCESS;
+}
+
+
+ftdm_status_t set_facility_ie(ftdm_channel_t *ftdmchan, FacilityStr *facilityStr)
+{
+	ftdm_status_t status;
+	status = set_facility_ie_str(ftdmchan, facilityStr->facilityStr.val, (uint8_t*)&(facilityStr->facilityStr.len));
+	if (status == FTDM_SUCCESS) {
+		facilityStr->eh.pres = PRSNT_NODEF;
+		facilityStr->facilityStr.pres = PRSNT_NODEF;
+	}
+	return status;
+}
+
+ftdm_status_t set_facility_ie_str(ftdm_channel_t *ftdmchan, uint8_t *data, uint8_t *data_len)
+{
+	int len;
+	ftdm_caller_data_t *caller_data = &ftdmchan->caller_data;
+
+	if (caller_data->raw_data_len > 0 && caller_data->raw_data[0] == SNGISDN_Q931_FACILITY_IE_ID) {
+		len = caller_data->raw_data[1];
+		memcpy(data, &caller_data->raw_data[2], len);
+		*data_len = len;
+		return FTDM_SUCCESS;
+	}	
+	return FTDM_FAIL;
+}
+
+ftdm_status_t set_prog_ind_ie(ftdm_channel_t *ftdmchan, ProgInd *progInd, ftdm_sngisdn_progind_t prog_ind)
+{
+	const char *str = NULL;
+	int descr = prog_ind.descr;
+	int loc = prog_ind.loc;
+	
+	str = ftdm_call_get_var(&ftdmchan->caller_data, "isdn.prog_ind.descr");
+	if (str && *str) {
+		/* User wants to override progress indicator */
+		descr = ftdm_str2ftdm_sngisdn_progind_descr(str);
+	}
+
+	if (descr == SNGISDN_PROGIND_DESCR_INVALID) {
+		/* User does not want to send progress indicator */
+		return FTDM_SUCCESS;
+	}
+
+	str = ftdm_call_get_var(&ftdmchan->caller_data, "isdn.prog_ind.loc");
+	if (str && *str) {
+		loc = ftdm_str2ftdm_sngisdn_progind_loc(str);
+	}
+	if (loc == SNGISDN_PROGIND_LOC_INVALID) {
+		loc = SNGISDN_PROGIND_LOC_USER;
+	}
+
+	progInd->eh.pres = PRSNT_NODEF;	
+	progInd->codeStand0.pres = PRSNT_NODEF;
+	progInd->codeStand0.val = IN_CSTD_CCITT;
+	
+	progInd->progDesc.pres = PRSNT_NODEF;
+	switch(descr) {
+		case SNGISDN_PROGIND_DESCR_NETE_ISDN:
+			progInd->progDesc.val = IN_PD_NOTETEISDN;
+			break;
+		case SNGISDN_PROGIND_DESCR_DEST_NISDN:
+			progInd->progDesc.val = IN_PD_DSTNOTISDN;
+			break;
+		case SNGISDN_PROGIND_DESCR_ORIG_NISDN:
+			progInd->progDesc.val = IN_PD_ORGNOTISDN;
+			break;
+		case SNGISDN_PROGIND_DESCR_RET_ISDN:
+			progInd->progDesc.val = IN_PD_CALLRET;
+			break;
+		case SNGISDN_PROGIND_DESCR_SERV_CHANGE:
+			/* Trillium defines do not match ITU-T Q931 Progress descriptions,
+			indicate a delayed response for now */
+			progInd->progDesc.val = IN_PD_DELRESP;
+			break;
+		case SNGISDN_PROGIND_DESCR_IB_AVAIL:
+			progInd->progDesc.val = IN_PD_IBAVAIL;
+			break;
+		default:
+			ftdm_log(FTDM_LOG_WARNING, "Invalid prog_ind description:%d\n", descr);
+			progInd->progDesc.val = IN_PD_NOTETEISDN;
+			break;
+	}
+
+	progInd->location.pres = PRSNT_NODEF;
+	switch (loc) {
+		case SNGISDN_PROGIND_LOC_USER:
+			progInd->location.val = IN_LOC_USER;
+			break;
+		case SNGISDN_PROGIND_LOC_PRIV_NET_LOCAL_USR:
+			progInd->location.val = IN_LOC_PRIVNETLU;
+			break;
+		case SNGISDN_PROGIND_LOC_PUB_NET_LOCAL_USR:
+			progInd->location.val = IN_LOC_PUBNETLU;
+			break;
+		case SNGISDN_PROGIND_LOC_TRANSIT_NET:
+			progInd->location.val = IN_LOC_TRANNET;
+			break;
+		case SNGISDN_PROGIND_LOC_PUB_NET_REMOTE_USR:
+			progInd->location.val = IN_LOC_PUBNETRU;
+			break;
+		case SNGISDN_PROGIND_LOC_PRIV_NET_REMOTE_USR:
+			progInd->location.val = IN_LOC_PRIVNETRU;
+			break;
+		case SNGISDN_PROGIND_LOC_NET_BEYOND_INTRW:
+			progInd->location.val = IN_LOC_NETINTER;
+			break;
+		default:
+			ftdm_log(FTDM_LOG_WARNING, "Invalid prog_ind location:%d\n", loc);
+			progInd->location.val = IN_PD_NOTETEISDN;
+	}
+	return FTDM_SUCCESS;
+}
+
+
 void sngisdn_t3_timeout(void* p_sngisdn_info)
 {
 	sngisdn_chan_data_t *sngisdn_info = (sngisdn_chan_data_t*)p_sngisdn_info;
@@ -394,6 +812,17 @@ void sngisdn_t3_timeout(void* p_sngisdn_info)
 	ftdm_mutex_unlock(ftdmchan->mutex);
 }
 
+void sngisdn_delayed_setup(void* p_sngisdn_info)
+{
+	sngisdn_chan_data_t *sngisdn_info = (sngisdn_chan_data_t*)p_sngisdn_info;
+	ftdm_channel_t *ftdmchan = sngisdn_info->ftdmchan;
+
+	ftdm_mutex_lock(ftdmchan->mutex);
+	sngisdn_snd_setup(ftdmchan);
+	ftdm_mutex_unlock(ftdmchan->mutex);
+	return;
+}
+
 void sngisdn_delayed_release(void* p_sngisdn_info)
 {
 	sngisdn_chan_data_t *sngisdn_info = (sngisdn_chan_data_t*)p_sngisdn_info;	
@@ -517,13 +946,12 @@ uint8_t sngisdn_get_infoTranCap_from_stack(ftdm_bearer_cap_t bearer_capability)
 	switch(bearer_capability) {
 	case FTDM_BEARER_CAP_SPEECH:
 		return IN_ITC_SPEECH;
-
 	case FTDM_BEARER_CAP_64K_UNRESTRICTED:
 		return IN_ITC_UNRDIG;
-
 	case FTDM_BEARER_CAP_3_1KHZ_AUDIO:
 		return IN_ITC_A31KHZ;
-		
+	case FTDM_BEARER_CAP_INVALID:
+		return IN_ITC_SPEECH;
 		/* Do not put a default case here, so we can see compile warnings if we have unhandled cases */
 	}
 	return FTDM_BEARER_CAP_SPEECH;
@@ -534,13 +962,12 @@ uint8_t sngisdn_get_usrInfoLyr1Prot_from_stack(ftdm_user_layer1_prot_t layer1_pr
 	switch(layer1_prot) {
 	case FTDM_USER_LAYER1_PROT_V110:
 		return IN_UIL1_CCITTV110;
-
 	case FTDM_USER_LAYER1_PROT_ULAW:
 		return IN_UIL1_G711ULAW;
-
 	case FTDM_USER_LAYER1_PROT_ALAW:
 		return IN_UIL1_G711ALAW;
-			
+	case FTDM_USER_LAYER1_PROT_INVALID:
+		return IN_UIL1_G711ULAW;
 	/* Do not put a default case here, so we can see compile warnings if we have unhandled cases */
 	}
 	return IN_UIL1_G711ULAW;
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
index 624d35c147..e5167164b3 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
@@ -613,6 +613,21 @@ uint32_t sngisdn_decode_ie(char *str, uint32_t *str_len, uint8_t current_codeset
 			return 0;
 			break;
 		case PROT_Q931_IE_CALLED_PARTY_SUBADDRESS:
+			{
+				uint8_t type;
+				uint8_t currentOct, j=0;
+				char calling_subaddr_string[82];
+				memset(calling_subaddr_string, 0, sizeof(calling_subaddr_string));
+				type = get_bits(OCTET(3),5,7);
+				currentOct = 3;
+				while(currentOct++ <= len+1) {
+						calling_subaddr_string[j++]=ia5[get_bits(OCTET(currentOct),1,4)][get_bits(OCTET(currentOct),5,8)];
+				}
+				calling_subaddr_string[j++]='\0';
+				*str_len += sprintf(&str[*str_len], "%s (l:%d) type:%s(%d) \n",
+														calling_subaddr_string, (j-1), get_code_2_str(type, dcodQ931TypeOfSubaddressTable), type);
+			}
+			break;
 		case PROT_Q931_IE_REDIRECTION_NUMBER:
 		case PROT_Q931_IE_NOTIFICATION_IND:
 		case PROT_Q931_IE_DATE_TIME:
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.h b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.h
index d210c50db9..f054de9377 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.h
@@ -544,5 +544,11 @@ struct code2str dcodQ931GenDigitsTypeTable[] = {
 	{-1, "Invalid"},
 };
 
+struct code2str dcodQ931TypeOfSubaddressTable[] = {
+	{ 0x00, "NSAP"},
+	{ 0x02, "User-specified"},
+	{ -1,   "Invalid"},
+};
+
 #endif /* __FTMOD_SANGOMA_ISDN_TRACE_H__ */
 
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
index 72e4bacf52..7517ee42a0 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
@@ -211,10 +211,10 @@ ftdm_status_t handle_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
 			/* add any special variables for the dialplan */
 			sprintf(nadi, "%d", siConEvnt->cgPtyNum.natAddrInd.val);
-			ftdm_channel_add_var(ftdmchan, "ss7_clg_nadi", nadi);
+			ftdm_call_add_var(&ftdmchan->caller_data, "ss7_clg_nadi", nadi);
 
 			sprintf(nadi, "%d", siConEvnt->cdPtyNum.natAddrInd.val);
-			ftdm_channel_add_var(ftdmchan, "ss7_cld_nadi", nadi);
+			ftdm_call_add_var(&ftdmchan->caller_data, "ss7_cld_nadi", nadi);
 
 
 			/* check if a COT test is requested */
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
index 304e9d6ce3..5c171a9f6b 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
@@ -502,6 +502,8 @@ void ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 	/**************************************************************************/
 	case FTDM_CHANNEL_STATE_COLLECT:	/* IAM received but wating on digits */
 
+		isup_intf = &g_ftdm_sngss7_data.cfg.isupIntf[sngss7_info->circuit->infId];
+
 		if (ftdmchan->last_state == FTDM_CHANNEL_STATE_SUSPENDED) {
 			SS7_DEBUG("re-entering state from processing block/unblock request ... do nothing\n");
 			break;
@@ -521,8 +523,8 @@ void ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			/*now go to the RING state */
 			ftdm_set_state_locked (ftdmchan, FTDM_CHANNEL_STATE_RING);
 			
-		} else if (i >= g_ftdm_sngss7_data.min_digits) {
-			SS7_DEBUG_CHAN(ftdmchan, "Received %d digits (min digits = %d)\n", i, g_ftdm_sngss7_data.min_digits);
+		} else if (i >= isup_intf->min_digits) {
+			SS7_DEBUG_CHAN(ftdmchan, "Received %d digits (min digits = %d)\n", i, isup_intf->min_digits);
 
 			/*now go to the RING state */
 			ftdm_set_state_locked (ftdmchan, FTDM_CHANNEL_STATE_RING);
@@ -532,7 +534,7 @@ void ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 			if (ftdmchan->last_state != FTDM_CHANNEL_STATE_IDLE) {
 				SS7_INFO_CHAN(ftdmchan,"Received %d out of %d so far: %s...starting T35\n",
 										i,
-										g_ftdm_sngss7_data.min_digits,
+										isup_intf->min_digits,
 										ftdmchan->caller_data.dnis.digits);
 		
 				/* start ISUP t35 */
@@ -1520,9 +1522,6 @@ static FIO_SIG_LOAD_FUNCTION(ftdm_sangoma_ss7_init)
 	/* initalize the global gen_config flag */
 	g_ftdm_sngss7_data.gen_config = 0;
 
-	/* min. number of digitis to wait for */
-	g_ftdm_sngss7_data.min_digits = 7;
-
 	/* function trace initizalation */
 	g_ftdm_sngss7_data.function_trace = 1;
 	g_ftdm_sngss7_data.function_trace_level = 7;
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
index 378b50e0ad..fe4b6f45c4 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
@@ -50,7 +50,7 @@
 /******************************************************************************/
 
 /* DEFINES ********************************************************************/
-#define MAX_NAME_LEN			10
+#define MAX_NAME_LEN			25
 #define MAX_PATH				255
 
 #define MAX_CIC_LENGTH			5
@@ -224,6 +224,7 @@ typedef struct sng_isup_intf {
 	uint32_t		isap;
 	uint32_t		clg_nadi;
 	uint32_t		cld_nadi;
+	uint32_t		min_digits;
 	uint16_t		t4;
 	uint32_t		t10;
 	uint32_t		t11;
@@ -326,7 +327,6 @@ typedef struct sng_ss7_cfg {
 typedef struct ftdm_sngss7_data {
 	sng_ss7_cfg_t		cfg;
 	int					gen_config;
-	int					min_digits;
 	int					function_trace;
 	int					function_trace_level;
 	int					message_trace;
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
index 008265b9a4..ec8d7df12a 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
@@ -187,7 +187,7 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 	copy_cgPtyNum_to_sngss7 (&ftdmchan->caller_data, &iam.cgPtyNum);
 
 	/* check if the user would like a custom NADI value for the calling Pty Num */
-	clg_nadi = ftdm_channel_get_var(ftdmchan, "ss7_clg_nadi");
+	clg_nadi = ftdm_call_get_var(&ftdmchan->caller_data, "ss7_clg_nadi");
 	if ((clg_nadi != NULL) && (*clg_nadi)) {
 		SS7_DEBUG_CHAN(ftdmchan,"Found user supplied Calling NADI value \"%s\"\n", clg_nadi);
 		iam.cgPtyNum.natAddrInd.val	= atoi(clg_nadi);
@@ -196,7 +196,7 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 		SS7_DEBUG_CHAN(ftdmchan,"No user supplied NADI value found for CLG, using \"%d\"\n", iam.cgPtyNum.natAddrInd.val);
 	}
 
-	cld_nadi = ftdm_channel_get_var(ftdmchan, "ss7_cld_nadi");
+	cld_nadi = ftdm_call_get_var(&ftdmchan->caller_data, "ss7_cld_nadi");
 	if ((cld_nadi != NULL) && (*cld_nadi)) {
 		SS7_DEBUG_CHAN(ftdmchan,"Found user supplied Called NADI value \"%s\"\n", cld_nadi);
 		iam.cdPtyNum.natAddrInd.val	= atoi(cld_nadi);
@@ -206,7 +206,7 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 	}
 
 	/* check if the user would like us to send a clg_sub-address */
-	clg_subAddr = ftdm_channel_get_var(ftdmchan, "ss7_clg_subaddr");
+	clg_subAddr = ftdm_call_get_var(&ftdmchan->caller_data, "ss7_clg_subaddr");
 	if ((clg_subAddr != NULL) && (*clg_subAddr)) {
 		SS7_DEBUG_CHAN(ftdmchan,"Found user supplied Calling Sub-Address value \"%s\"\n", clg_subAddr);
 		
@@ -245,7 +245,7 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 	}
 
 	/* check if the user would like us to send a cld_sub-address */
-	cld_subAddr = ftdm_channel_get_var(ftdmchan, "ss7_cld_subaddr");
+	cld_subAddr = ftdm_call_get_var(&ftdmchan->caller_data, "ss7_cld_subaddr");
 	if ((cld_subAddr != NULL) && (*cld_subAddr)) {
 		SS7_DEBUG_CHAN(ftdmchan,"Found user supplied Called Sub-Address value \"%s\"\n", cld_subAddr);
 		
@@ -298,7 +298,8 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 							iam.cgPtyNum.natAddrInd.val,
 							ftdmchan->caller_data.dnis.digits,
 							iam.cdPtyNum.natAddrInd.val);
-	
+
+	ftdm_call_clear_vars(&ftdmchan->caller_data);
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -379,7 +380,7 @@ void ft_to_sngss7_acm (ftdm_channel_t * ftdmchan)
 						ADDRCMPLT);
 	
 	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx ACM\n", sngss7_info->circuit->cic);
-	
+	ftdm_call_clear_vars(&ftdmchan->caller_data);
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -403,7 +404,7 @@ void ft_to_sngss7_anm (ftdm_channel_t * ftdmchan)
 						5);
 
   SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx ANM\n", sngss7_info->circuit->cic);
-
+  ftdm_call_clear_vars(&ftdmchan->caller_data);
   SS7_FUNC_TRACE_EXIT (__FUNCTION__);
   return;
 }
@@ -438,7 +439,7 @@ void ft_to_sngss7_rel (ftdm_channel_t * ftdmchan)
 	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx REL cause=%d \n",
 							sngss7_info->circuit->cic,
 							ftdmchan->caller_data.hangup_cause );
-	
+	ftdm_call_clear_vars(&ftdmchan->caller_data);
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -461,7 +462,7 @@ void ft_to_sngss7_rlc (ftdm_channel_t * ftdmchan)
 						&rlc);
 	
 	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx RLC\n", sngss7_info->circuit->cic);
-	
+	ftdm_call_clear_vars(&ftdmchan->caller_data);
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -482,7 +483,7 @@ void ft_to_sngss7_rsc (ftdm_channel_t * ftdmchan)
 						NULL);
 	
 	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx RSC\n", sngss7_info->circuit->cic);
-	
+	ftdm_call_clear_vars(&ftdmchan->caller_data);
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -503,7 +504,7 @@ void ft_to_sngss7_rsca (ftdm_channel_t * ftdmchan)
 						NULL);
 	
 	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx RSC-RLC\n", sngss7_info->circuit->cic);
-	
+	ftdm_call_clear_vars(&ftdmchan->caller_data);
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
   return;
 }
@@ -524,7 +525,7 @@ void ft_to_sngss7_blo (ftdm_channel_t * ftdmchan)
 						NULL);
 	
 	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx BLO\n", sngss7_info->circuit->cic);
-	
+	ftdm_call_clear_vars(&ftdmchan->caller_data);
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -545,7 +546,7 @@ void ft_to_sngss7_bla (ftdm_channel_t * ftdmchan)
 						NULL);
 	
 	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx BLA\n", sngss7_info->circuit->cic);
-	
+	ftdm_call_clear_vars(&ftdmchan->caller_data);
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -567,7 +568,7 @@ ft_to_sngss7_ubl (ftdm_channel_t * ftdmchan)
 						NULL);
 	
 	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx UBL\n", sngss7_info->circuit->cic);
-	
+	ftdm_call_clear_vars(&ftdmchan->caller_data);
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -588,7 +589,7 @@ void ft_to_sngss7_uba (ftdm_channel_t * ftdmchan)
 						NULL);
 	
 	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx UBA\n", sngss7_info->circuit->cic);
-	
+	ftdm_call_clear_vars(&ftdmchan->caller_data);
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -609,7 +610,7 @@ void ft_to_sngss7_lpa (ftdm_channel_t * ftdmchan)
 						NULL);
 	
 	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx LPA\n", sngss7_info->circuit->cic);
-	
+	ftdm_call_clear_vars(&ftdmchan->caller_data);
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 return;
 }
@@ -654,6 +655,7 @@ void ft_to_sngss7_gra (ftdm_channel_t * ftdmchan)
 							sngss7_info->circuit->cic,
 							(sngss7_info->circuit->cic + sngss7_span->rx_grs.range));
 	
+	ftdm_call_clear_vars(&ftdmchan->caller_data);
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -686,7 +688,8 @@ void ft_to_sngss7_grs (ftdm_channel_t * ftdmchan)
 							sngss7_info->circuit->cic,
 							sngss7_info->circuit->cic,
 							(sngss7_info->circuit->cic + sngss7_span->tx_grs.range));
-	
+
+	ftdm_call_clear_vars(&ftdmchan->caller_data);
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 return;
 }
@@ -735,7 +738,7 @@ void ft_to_sngss7_cgba(ftdm_channel_t * ftdmchan)
 
 	/* clean out the saved data */
 	memset(&sngss7_span->rx_cgb, 0x0, sizeof(sngss7_group_data_t));
-
+	ftdm_call_clear_vars(&ftdmchan->caller_data);
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -785,6 +788,7 @@ void ft_to_sngss7_cgua(ftdm_channel_t * ftdmchan)
 	/* clean out the saved data */
 	memset(&sngss7_span->rx_cgu, 0x0, sizeof(sngss7_group_data_t));
 
+	ftdm_call_clear_vars(&ftdmchan->caller_data);
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -835,6 +839,7 @@ void ft_to_sngss7_cgb(ftdm_channel_t * ftdmchan)
 	/* clean out the saved data */
 	memset(&sngss7_span->tx_cgb, 0x0, sizeof(sngss7_group_data_t));
 
+	ftdm_call_clear_vars(&ftdmchan->caller_data);
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -885,6 +890,7 @@ void ft_to_sngss7_cgu(ftdm_channel_t * ftdmchan)
 	/* clean out the saved data */
 	memset(&sngss7_span->tx_cgu, 0x0, sizeof(sngss7_group_data_t));
 
+	ftdm_call_clear_vars(&ftdmchan->caller_data);
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
index 4a9c863b12..d4fd1ca9b3 100644
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
@@ -142,7 +142,7 @@ int ftmod_ss7_parse_xml(ftdm_conf_parameter_t *ftdm_parameters, ftdm_span_t *spa
 
 		if (!strcasecmp(var, "ch_map")) {
 		/**********************************************************************/
-			strcpy(isupCkt.ch_map, val);
+			strncpy(isupCkt.ch_map, val, MAX_CIC_MAP_LENGTH-1);
 			SS7_DEBUG("\tFound channel map \"%s\"\n", isupCkt.ch_map);
 		/**********************************************************************/
 		} else if (!strcasecmp(var, "typeCntrl")) {
@@ -393,7 +393,7 @@ static int ftmod_ss7_parse_mtp_linkset(ftdm_conf_node_t *mtp_linkset)
 	for (i = 0; i < num_parms; i++) {
 		/**********************************************************************/
 		if (!strcasecmp(parm->var, "name")) {
-			strcpy((char *)mtpLinkSet.name, parm->val);
+			strncpy((char *)mtpLinkSet.name, parm->val, MAX_NAME_LEN-1);
 			SS7_DEBUG("\tFound an \"mtp_linkset\" named = %s\n", mtpLinkSet.name);
 		/**********************************************************************/
 		} else if (!strcasecmp(parm->var, "apc")) {
@@ -508,7 +508,7 @@ static int ftmod_ss7_parse_mtp_link(ftdm_conf_node_t *mtp_link, sng_mtp_link_t *
 		/* try to match the parameter to what we expect */
 		/**********************************************************************/
 		if (!strcasecmp(parm->var, "name")) {
-			strcpy((char *)mtpLink->name, parm->val);
+			strncpy((char *)mtpLink->name, parm->val, MAX_NAME_LEN-1);
 			SS7_DEBUG("\tFound an \"mtp_link\" named = %s\n", mtpLink->name);
 		/**********************************************************************/
 		} else if (!strcasecmp(parm->var, "span")) {
@@ -827,7 +827,7 @@ static int ftmod_ss7_parse_mtp_route(ftdm_conf_node_t *mtp_route)
 		/* try to match the parameter to what we expect */
 		/**********************************************************************/
 		if (!strcasecmp(parm->var, "name")) {
-			strcpy((char *)mtpRoute.name, parm->val);
+			strncpy((char *)mtpRoute.name, parm->val, MAX_NAME_LEN-1);
 			SS7_DEBUG("\tFound an \"mtp_route\" named = %s\n", mtpRoute.name);
 		/**********************************************************************/
 		} else if (!strcasecmp(parm->var, "dpc")) {
@@ -999,7 +999,7 @@ static int ftmod_ss7_parse_isup_interface(ftdm_conf_node_t *isup_interface)
 		/* try to match the parameter to what we expect */
 		/**********************************************************************/
 		if (!strcasecmp(parm->var, "name")) {
-			strcpy((char *)sng_isup.name, parm->val);
+			strncpy((char *)sng_isup.name, parm->val, MAX_NAME_LEN-1);
 			SS7_DEBUG("\tFound an \"isup_interface\" named = %s\n", sng_isup.name);
 		/**********************************************************************/
 		} else if (!strcasecmp(parm->var, "spc")) {
@@ -1047,6 +1047,11 @@ static int ftmod_ss7_parse_isup_interface(ftdm_conf_node_t *isup_interface)
 				SS7_DEBUG("\tFound MTP3 Route = %s\n", parm->val);
 			}
 		/**********************************************************************/
+		} else if (!strcasecmp(parm->var, "min_digits")) {
+			sng_isup.min_digits = atoi(parm->val);
+
+			SS7_DEBUG("\tFound min_digits = %d\n", sng_isup.min_digits);
+		/**********************************************************************/
 		} else if (!strcasecmp(parm->var, "ssf")) {
 			if (!strcasecmp(parm->val, "nat")) {
 				sng_isup.ssf = SSF_NAT;
@@ -1067,8 +1072,8 @@ static int ftmod_ss7_parse_isup_interface(ftdm_conf_node_t *isup_interface)
 		/**********************************************************************/
 		} else if (!strcasecmp(parm->var, "license")) {
 		/**********************************************************************/
-			strcpy(g_ftdm_sngss7_data.cfg.license, parm->val);
-			strcpy(g_ftdm_sngss7_data.cfg.signature, parm->val);
+			strncpy(g_ftdm_sngss7_data.cfg.license, parm->val, MAX_PATH-1);
+			strncpy(g_ftdm_sngss7_data.cfg.signature, parm->val, MAX_PATH-1);
 			strcat(g_ftdm_sngss7_data.cfg.signature, ".sig");
 			SS7_DEBUG("\tFound license file = %s\n", g_ftdm_sngss7_data.cfg.license);
 			SS7_DEBUG("\tFound signature file = %s\n", g_ftdm_sngss7_data.cfg.signature);	
@@ -1304,6 +1309,13 @@ static int ftmod_ss7_parse_isup_interface(ftdm_conf_node_t *isup_interface)
 		sng_isup.clg_nadi = 0x03;
 	}
 
+	/* check if the user requested min_digits value */
+	if (sng_isup.min_digits == 0) {
+		/* default to 7 */
+		sng_isup.min_digits = 7;
+	}
+		
+
 	/* trickle down the SPC to all sub entities */
 	linkSetId = g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].linkSetId;
 
@@ -1359,7 +1371,7 @@ static int ftmod_ss7_fill_in_mtpLink(sng_mtp_link_t *mtpLink)
 	}
 
 	/* fill in the information */
-	strcpy((char *)g_ftdm_sngss7_data.cfg.mtpLink[i].name, (char *)mtpLink->name);
+	strncpy((char *)g_ftdm_sngss7_data.cfg.mtpLink[i].name, (char *)mtpLink->name, MAX_NAME_LEN-1);
 
 	g_ftdm_sngss7_data.cfg.mtpLink[i].id				= mtpLink->id;
 
@@ -1521,7 +1533,7 @@ static int ftmod_ss7_fill_in_mtpLinkSet(sng_link_set_t *mtpLinkSet)
 {
 	int	i = mtpLinkSet->id;
 
-	strcpy((char *)g_ftdm_sngss7_data.cfg.mtpLinkSet[i].name, (char *)mtpLinkSet->name);
+	strncpy((char *)g_ftdm_sngss7_data.cfg.mtpLinkSet[i].name, (char *)mtpLinkSet->name, MAX_NAME_LEN-1);
 
 	g_ftdm_sngss7_data.cfg.mtpLinkSet[i].id			= mtpLinkSet->id;
 	g_ftdm_sngss7_data.cfg.mtpLinkSet[i].apc		= mtpLinkSet->apc;
@@ -1559,7 +1571,7 @@ static int ftmod_ss7_fill_in_mtp3_route(sng_route_t *mtp3_route)
 		SS7_DEBUG("found existing mtp3_route, id is = %d\n", mtp3_route->id);
 	}
 
-	strcpy((char *)g_ftdm_sngss7_data.cfg.mtpRoute[i].name, (char *)mtp3_route->name);
+	strncpy((char *)g_ftdm_sngss7_data.cfg.mtpRoute[i].name, (char *)mtp3_route->name, MAX_NAME_LEN-1);
 
 	g_ftdm_sngss7_data.cfg.mtpRoute[i].id			= mtp3_route->id;
 	g_ftdm_sngss7_data.cfg.mtpRoute[i].dpc			= mtp3_route->dpc;
@@ -1693,7 +1705,7 @@ static int ftmod_ss7_fill_in_isup_interface(sng_isup_inf_t *sng_isup)
 		SS7_DEBUG("found existing isup interface, id is = %d\n", sng_isup->id);
 	}
 
-	strcpy((char *)g_ftdm_sngss7_data.cfg.isupIntf[i].name, (char *)sng_isup->name);
+	strncpy((char *)g_ftdm_sngss7_data.cfg.isupIntf[i].name, (char *)sng_isup->name, MAX_NAME_LEN-1);
 
 	g_ftdm_sngss7_data.cfg.isupIntf[i].id			= sng_isup->id;
 	g_ftdm_sngss7_data.cfg.isupIntf[i].mtpRouteId	= sng_isup->mtpRouteId;
@@ -1705,6 +1717,7 @@ static int ftmod_ss7_fill_in_isup_interface(sng_isup_inf_t *sng_isup)
 	g_ftdm_sngss7_data.cfg.isupIntf[i].isap			= sng_isup->isap;
 	g_ftdm_sngss7_data.cfg.isupIntf[i].cld_nadi		= sng_isup->cld_nadi;
 	g_ftdm_sngss7_data.cfg.isupIntf[i].clg_nadi		= sng_isup->clg_nadi;
+	g_ftdm_sngss7_data.cfg.isupIntf[i].min_digits	= sng_isup->min_digits;
 	g_ftdm_sngss7_data.cfg.isupIntf[i].options		= sng_isup->options;
 	if (sng_isup->t4 != 0) {
 		g_ftdm_sngss7_data.cfg.isupIntf[i].t4		= sng_isup->t4;
@@ -1976,7 +1989,7 @@ static int ftmod_ss7_fill_in_self_route(int spc, int linkType, int switchType, i
 		return FTDM_FAIL;
 	}
 
-	strcpy((char *)g_ftdm_sngss7_data.cfg.mtpRoute[0].name, "self-route");
+	strncpy((char *)g_ftdm_sngss7_data.cfg.mtpRoute[0].name, "self-route", MAX_NAME_LEN-1);
 
 	g_ftdm_sngss7_data.cfg.mtpRoute[0].id			= 0;
 	g_ftdm_sngss7_data.cfg.mtpRoute[0].dpc			= spc;
@@ -2230,7 +2243,7 @@ static int ftmod_ss7_next_timeslot(char *ch_map, sng_timeslot_t *timeslot)
 	int			lower;
 	int			upper;
 	char		tmp[5]; /*KONRAD FIX ME*/
-	char		new_ch_map[MAX_CIC_LENGTH];
+	char		new_ch_map[MAX_CIC_MAP_LENGTH];
 
 	memset(&tmp[0], '\0', sizeof(tmp));
 	memset(&new_ch_map[0], '\0', sizeof(new_ch_map));
@@ -2337,7 +2350,9 @@ static int ftmod_ss7_next_timeslot(char *ch_map, sng_timeslot_t *timeslot)
 		/* the the rest of ch_map to new_ch_map */
 		strncat(new_ch_map, &ch_map[x], strlen(&ch_map[x]));
 
+
 		/* set the new cic map to ch_map*/
+		memset(ch_map, '\0', sizeof(ch_map));
 		strcpy(ch_map, new_ch_map);
 
 	} else if (ch_map[x] == ',') {
@@ -2345,16 +2360,21 @@ static int ftmod_ss7_next_timeslot(char *ch_map, sng_timeslot_t *timeslot)
 		x++;
 
 		/* copy the rest of the list to new_ch_map */
+		memset(new_ch_map, '\0', sizeof(new_ch_map));
 		strcpy(new_ch_map, &ch_map[x]);
 
 		/* copy the new_ch_map over the old one */
+		memset(ch_map, '\0', sizeof(ch_map));
 		strcpy(ch_map, new_ch_map);
 
 	} else if (ch_map[x] == '\0') {
+
 		/* we're at the end of the string...copy the rest of the list to new_ch_map */
+		memset(new_ch_map, '\0', sizeof(new_ch_map));
 		strcpy(new_ch_map, &ch_map[x]);
 
 		/* set the new cic map to ch_map*/
+		memset(ch_map, '\0', sizeof(ch_map));
 		strcpy(ch_map, new_ch_map);
 	} else { 
 		/* nothing to do */
diff --git a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2010.vcxproj b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2010.vcxproj
new file mode 100644
index 0000000000..b165ac82d3
--- /dev/null
+++ b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2010.vcxproj
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>ftmod_wanpipe</ProjectName>
+    <ProjectGuid>{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}</ProjectGuid>
+    <RootNamespace>ftmod_wanpipe</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;C:\Program Files\Sangoma\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>freetdm.lib;libsangoma.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir);C:\Program Files\Sangoma\api\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;C:\Program Files\Sangoma\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>freetdm.lib;libsangoma.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir);C:\Program Files\Sangoma\api\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../include;C:\Program Files\Sangoma\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>freetdm.lib;libsangoma.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir);C:\Program Files\Sangoma\api\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../include;C:\Program Files\Sangoma\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>freetdm.lib;libsangoma.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir);C:\Program Files\Sangoma\api\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="ftmod_wanpipe.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\msvc\freetdm.2010.vcxproj">
+      <Project>{93b8812c-3ec4-4f78-8970-ffbfc99e167d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2010.vcxproj.filters b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2010.vcxproj.filters
new file mode 100644
index 0000000000..15a8bc3d35
--- /dev/null
+++ b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2010.vcxproj.filters
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ftmod_wanpipe.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
index 8e8acc24e3..e1b6658945 100644
--- a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
+++ b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
@@ -35,6 +35,7 @@
  * Moises Silva <moy@sangoma.com>
  * David Yat Sin <davidy@sangoma.com>
  * Nenad Corbic <ncorbic@sangoma.com>
+ * Arnaldo Pereira <arnaldo@sangoma.com>
  *
  */
 
@@ -99,7 +100,8 @@ static struct {
 /* a bunch of this stuff should go into the wanpipe_tdm_api_iface.h */
 
 FIO_SPAN_POLL_EVENT_FUNCTION(wanpipe_poll_event);
-FIO_SPAN_NEXT_EVENT_FUNCTION(wanpipe_next_event);
+FIO_SPAN_NEXT_EVENT_FUNCTION(wanpipe_span_next_event);
+FIO_CHANNEL_NEXT_EVENT_FUNCTION(wanpipe_channel_next_event);
 
 /**
  * \brief Poll for event on a wanpipe socket
@@ -115,12 +117,16 @@ FIO_SPAN_NEXT_EVENT_FUNCTION(wanpipe_next_event);
 static __inline__ int tdmv_api_wait_socket(ftdm_channel_t *ftdmchan, int timeout, int *flags)
 {
 	
-#ifdef LIBSANGOMA_VERSION
+#ifdef LIBSANGOMA_VERSION	
 	int err;
 	uint32_t inflags = *flags;
 	uint32_t outflags = 0;
 	sangoma_wait_obj_t *sangoma_wait_obj = ftdmchan->io_data;
 
+	if (timeout == -1) {
+		timeout = SANGOMA_WAIT_INFINITE;
+	}
+
 	err = sangoma_waitfor(sangoma_wait_obj, inflags, &outflags, timeout);
 	*flags = 0;
 	if (err == SANG_STATUS_SUCCESS) {
@@ -169,7 +175,7 @@ static __inline__ sng_fd_t tdmv_api_open_span_chan(int span, int chan)
 static __inline__ sng_fd_t __tdmv_api_open_span_chan(int span, int chan) 
 { 
 	return  __sangoma_open_tdmapi_span_chan(span, chan);
-}                        
+}
 #endif
 
 static ftdm_io_interface_t wanpipe_interface;
@@ -333,8 +339,8 @@ static unsigned wp_open_range(ftdm_span_t *span, unsigned spanno, unsigned start
 					ftdm_log(FTDM_LOG_ERROR, "Failed to enable RBS/CAS events in device %d:%d fd:%d\n", chan->span_id, chan->chan_id, sockfd);
 					continue;
 				}
-				/* probably done by the driver but lets write defensive code this time */
 				sangoma_flush_bufs(chan->sockfd, &tdm_api);
+				sangoma_flush_event_bufs(chan->sockfd, &tdm_api);
 #else
 				/* 
 				 * With wanpipe 3.4.4.2 I get failure even though the events are enabled, /var/log/messages said:
@@ -513,10 +519,10 @@ static FIO_OPEN_FUNCTION(wanpipe_open)
 	wanpipe_tdm_api_t tdm_api;
 
 	memset(&tdm_api,0,sizeof(tdm_api));
+
 	sangoma_tdm_flush_bufs(ftdmchan->sockfd, &tdm_api);
-#ifdef LIBSANGOMA_VERSION
-	sangoma_flush_event_bufs(ftdmchan->sockfd, &tdm_api);
-#endif
+	sangoma_flush_stats(ftdmchan->sockfd, &tdm_api);
+	memset(&ftdmchan->iostats, 0, sizeof(ftdmchan->iostats));
 
 	if (ftdmchan->type == FTDM_CHAN_TYPE_DQ921 || ftdmchan->type == FTDM_CHAN_TYPE_DQ931) {
 		ftdmchan->native_codec = ftdmchan->effective_codec = FTDM_CODEC_NONE;
@@ -745,19 +751,150 @@ static FIO_COMMAND_FUNCTION(wanpipe_command)
 			}
 		}
 		break;
+	case FTDM_COMMAND_FLUSH_BUFFERS:
+		{
+			err = sangoma_flush_bufs(ftdmchan->sockfd, &tdm_api);
+		}
+		break;
+	case FTDM_COMMAND_FLUSH_RX_BUFFERS:
+		{
+			err = sangoma_flush_rx_bufs(ftdmchan->sockfd, &tdm_api);
+		}
+		break;
+	case FTDM_COMMAND_FLUSH_TX_BUFFERS:
+		{
+			err = sangoma_flush_tx_bufs(ftdmchan->sockfd, &tdm_api);
+		}
+		break;
+	case FTDM_COMMAND_FLUSH_IOSTATS:
+		{
+			err = sangoma_flush_stats(ftdmchan->sockfd, &tdm_api);
+			memset(&ftdmchan->iostats, 0, sizeof(ftdmchan->iostats));
+		}
+		break;
+	case FTDM_COMMAND_SET_RX_QUEUE_SIZE:
+		{
+			uint32_t queue_size = FTDM_COMMAND_OBJ_INT;
+			err = sangoma_set_rx_queue_sz(ftdmchan->sockfd, &tdm_api, queue_size);
+		}
+		break;
+	case FTDM_COMMAND_SET_TX_QUEUE_SIZE:
+		{
+			uint32_t queue_size = FTDM_COMMAND_OBJ_INT;
+			err = sangoma_set_tx_queue_sz(ftdmchan->sockfd, &tdm_api, queue_size);
+		}
+		break;
 	default:
+		err = FTDM_NOTIMPL;
 		break;
 	};
 
 	if (err) {
 		snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "%s", strerror(errno));
-		return FTDM_FAIL;
+		return err;
 	}
 
 
 	return FTDM_SUCCESS;
 }
 
+static void wanpipe_write_stats(ftdm_channel_t *ftdmchan, wp_tdm_api_tx_hdr_t *tx_stats)
+{
+	ftdmchan->iostats.tx.errors = tx_stats->wp_api_tx_hdr_errors;
+	ftdmchan->iostats.tx.queue_size = tx_stats->wp_api_tx_hdr_max_queue_length;
+	ftdmchan->iostats.tx.queue_len = tx_stats->wp_api_tx_hdr_number_of_frames_in_queue;
+	
+	/* we don't test for 80% full in tx since is typically full for voice channels, should we test tx 80% full for D-channels? */
+	if (ftdmchan->iostats.tx.queue_len >= ftdmchan->iostats.tx.queue_size) {
+		ftdm_set_flag(&(ftdmchan->iostats.tx), FTDM_IOSTATS_ERROR_QUEUE_FULL);
+	} else if (ftdm_test_flag(&(ftdmchan->iostats.tx), FTDM_IOSTATS_ERROR_QUEUE_FULL)){
+		ftdm_clear_flag(&(ftdmchan->iostats.tx), FTDM_IOSTATS_ERROR_QUEUE_FULL);
+	}
+
+	if (ftdmchan->iostats.tx.idle_packets < tx_stats->wp_api_tx_hdr_tx_idle_packets) {
+		/* HDLC channels do not always transmit, so its ok for drivers to fill with idle
+		 * also do not report idle warning when we just started transmitting */
+		if (ftdmchan->iostats.tx.packets && FTDM_IS_VOICE_CHANNEL(ftdmchan)) {
+			ftdm_log_chan(ftdmchan, FTDM_LOG_WARNING, "Tx idle changed from %d to %d\n", 
+					ftdmchan->iostats.tx.idle_packets, tx_stats->wp_api_tx_hdr_tx_idle_packets);
+		}
+		ftdmchan->iostats.tx.idle_packets = tx_stats->wp_api_tx_hdr_tx_idle_packets;
+	}
+
+	if (!ftdmchan->iostats.tx.packets) {
+		ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "First packet write stats: Tx queue len: %d, Tx queue size: %d, Tx idle: %d\n", 
+				ftdmchan->iostats.tx.queue_len, 
+				ftdmchan->iostats.tx.queue_size,
+				ftdmchan->iostats.tx.idle_packets);
+	}
+
+	ftdmchan->iostats.tx.packets++;
+}
+
+static void wanpipe_read_stats(ftdm_channel_t *ftdmchan, wp_tdm_api_rx_hdr_t *rx_stats)
+{
+	ftdmchan->iostats.rx.errors = rx_stats->wp_api_rx_hdr_errors;
+	ftdmchan->iostats.rx.queue_size = rx_stats->wp_api_rx_hdr_max_queue_length;
+	ftdmchan->iostats.rx.queue_len = rx_stats->wp_api_rx_hdr_number_of_frames_in_queue;
+	
+	if ((rx_stats->wp_api_rx_hdr_error_map & (1 << WP_ABORT_ERROR_BIT))) {
+		ftdm_set_flag(&(ftdmchan->iostats.rx), FTDM_IOSTATS_ERROR_ABORT);
+	} else {
+		ftdm_clear_flag(&(ftdmchan->iostats.rx), FTDM_IOSTATS_ERROR_ABORT);
+	}
+
+	if ((rx_stats->wp_api_rx_hdr_error_map & (1 << WP_DMA_ERROR_BIT))) {
+		ftdm_set_flag(&(ftdmchan->iostats.rx), FTDM_IOSTATS_ERROR_DMA);
+	} else {
+		ftdm_clear_flag(&(ftdmchan->iostats.rx), FTDM_IOSTATS_ERROR_DMA);
+	}
+
+	if ((rx_stats->wp_api_rx_hdr_error_map & (1 << WP_FIFO_ERROR_BIT))) {
+		ftdm_set_flag(&(ftdmchan->iostats.rx), FTDM_IOSTATS_ERROR_FIFO);
+	} else {
+		ftdm_clear_flag(&(ftdmchan->iostats.rx), FTDM_IOSTATS_ERROR_FIFO);
+	}
+
+	if ((rx_stats->wp_api_rx_hdr_error_map & (1 << WP_CRC_ERROR_BIT))) {
+		ftdm_set_flag(&(ftdmchan->iostats.rx), FTDM_IOSTATS_ERROR_CRC);
+	} else {
+		ftdm_clear_flag(&(ftdmchan->iostats.rx), FTDM_IOSTATS_ERROR_CRC);
+	}
+
+	if ((rx_stats->wp_api_rx_hdr_error_map & (1 << WP_FRAME_ERROR_BIT))) {
+		ftdm_set_flag(&(ftdmchan->iostats.rx), FTDM_IOSTATS_ERROR_FRAME);
+	} else {
+		ftdm_clear_flag(&(ftdmchan->iostats.rx), FTDM_IOSTATS_ERROR_FRAME);
+	}
+
+	if (ftdmchan->iostats.rx.queue_len >= (0.8 * ftdmchan->iostats.rx.queue_size)) {
+		ftdm_log_chan(ftdmchan, FTDM_LOG_WARNING, "Rx Queue length exceeded 80% threshold (%d/%d)\n",
+					  		ftdmchan->iostats.rx.queue_len, ftdmchan->iostats.rx.queue_size);
+		ftdm_set_flag(&(ftdmchan->iostats.rx), FTDM_IOSTATS_ERROR_QUEUE_THRES);
+	} else if (ftdm_test_flag(&(ftdmchan->iostats.rx), FTDM_IOSTATS_ERROR_QUEUE_THRES)){
+		ftdm_log_chan(ftdmchan, FTDM_LOG_NOTICE, "Rx Queue length reduced 80% threshold (%d/%d)\n",
+					  		ftdmchan->iostats.rx.queue_len, ftdmchan->iostats.rx.queue_size);
+		ftdm_clear_flag(&(ftdmchan->iostats.rx), FTDM_IOSTATS_ERROR_QUEUE_THRES);
+	}
+	
+	if (ftdmchan->iostats.rx.queue_len >= ftdmchan->iostats.rx.queue_size) {
+		ftdm_log_chan(ftdmchan, FTDM_LOG_CRIT, "Rx Queue Full (%d/%d)\n",
+					  ftdmchan->iostats.rx.queue_len, ftdmchan->iostats.rx.queue_size);
+		ftdm_set_flag(&(ftdmchan->iostats.rx), FTDM_IOSTATS_ERROR_QUEUE_FULL);
+	} else if (ftdm_test_flag(&(ftdmchan->iostats.rx), FTDM_IOSTATS_ERROR_QUEUE_FULL)){
+		ftdm_log_chan(ftdmchan, FTDM_LOG_NOTICE, "Rx Queue no longer full (%d/%d)\n",
+					  ftdmchan->iostats.rx.queue_len, ftdmchan->iostats.rx.queue_size);
+		ftdm_clear_flag(&(ftdmchan->iostats.rx), FTDM_IOSTATS_ERROR_QUEUE_FULL);
+	}
+
+	if (!ftdmchan->iostats.rx.packets) {
+		ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "First packet read stats: Rx queue len: %d, Rx queue size: %d\n", 
+				ftdmchan->iostats.rx.queue_len, ftdmchan->iostats.rx.queue_size);
+	}
+
+	ftdmchan->iostats.rx.packets++;
+}
+
 /**
  * \brief Reads data from a Wanpipe channel
  * \param ftdmchan Channel to read from
@@ -786,9 +923,11 @@ static FIO_READ_FUNCTION(wanpipe_read)
 		snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "%s", strerror(errno));
 		ftdm_log_chan(ftdmchan, FTDM_LOG_WARNING, "Failed to read from sangoma device: %s (%d)\n", strerror(errno), rx_len);
 		return FTDM_FAIL;
-	} 
-
+	}
 
+	if (ftdm_channel_test_feature(ftdmchan, FTDM_CHANNEL_FEATURE_IO_STATS)) {
+		wanpipe_read_stats(ftdmchan, &hdrframe);
+	}
 	return FTDM_SUCCESS;
 }
 
@@ -801,7 +940,8 @@ static FIO_READ_FUNCTION(wanpipe_read)
  */
 static FIO_WRITE_FUNCTION(wanpipe_write)
 {
-	int bsent;
+	int bsent = 0;
+	int err = 0;
 	wp_tdm_api_tx_hdr_t hdrframe;
 
 	/* Do we even need the headerframe here? on windows, we don't even pass it to the driver */
@@ -809,11 +949,28 @@ static FIO_WRITE_FUNCTION(wanpipe_write)
 	if (*datalen == 0) {
 		return FTDM_SUCCESS;
 	}
+
+	if (ftdm_channel_test_feature(ftdmchan, FTDM_CHANNEL_FEATURE_IO_STATS) && !ftdmchan->iostats.tx.packets) {
+		wanpipe_tdm_api_t tdm_api;
+		memset(&tdm_api, 0, sizeof(tdm_api));
+		/* if this is the first write ever, flush the tx first to have clean stats */
+		err = sangoma_flush_tx_bufs(ftdmchan->sockfd, &tdm_api);
+		if (err) {
+			ftdm_log_chan_msg(ftdmchan, FTDM_LOG_WARNING, "Failed to flush on first write\n");
+		}
+	}
+
 	bsent = sangoma_writemsg_tdm(ftdmchan->sockfd, &hdrframe, (int)sizeof(hdrframe), data, (unsigned short)(*datalen),0);
 
 	/* should we be checking if bsent == *datalen here? */
 	if (bsent > 0) {
 		*datalen = bsent;
+		if (ftdm_channel_test_feature(ftdmchan, FTDM_CHANNEL_FEATURE_IO_STATS)) {
+			/* BRI cards do not support TX queues for now */
+			if(!FTDM_SPAN_IS_BRI(ftdmchan->span)) {
+				wanpipe_write_stats(ftdmchan, &hdrframe);
+			}
+		}
 		return FTDM_SUCCESS;
 	}
 
@@ -1049,13 +1206,155 @@ static FIO_GET_ALARMS_FUNCTION(wanpipe_get_alarms)
 	return FTDM_SUCCESS;
 }
 
+/**
+ * \brief Retrieves an event from a wanpipe channel
+ * \param channel Channel to retrieve event from
+ * \param event FreeTDM event to return
+ * \return Success or failure
+ */
+FIO_CHANNEL_NEXT_EVENT_FUNCTION(wanpipe_channel_next_event)
+{
+	ftdm_status_t status;
+	ftdm_oob_event_t event_id;
+	wanpipe_tdm_api_t tdm_api;
+	ftdm_span_t *span = ftdmchan->span;
+
+	if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_EVENT))
+		ftdm_clear_flag(ftdmchan, FTDM_CHANNEL_EVENT);
+
+	memset(&tdm_api, 0, sizeof(tdm_api));
+	status = sangoma_tdm_read_event(ftdmchan->sockfd, &tdm_api);
+	if (status != FTDM_SUCCESS) {
+		snprintf(span->last_error, sizeof(span->last_error), "%s", strerror(errno));
+		ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "Failed to read event from channel: %s\n", strerror(errno));
+		return FTDM_FAIL;
+	}
+
+	ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "read wanpipe event %d\n", tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_type);
+	switch(tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_type) {
+
+	case WP_TDMAPI_EVENT_LINK_STATUS:
+		{
+			switch(tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_link_status) {
+			case WP_TDMAPI_EVENT_LINK_STATUS_CONNECTED:
+				event_id = FTDM_OOB_ALARM_CLEAR;
+				break;
+			default:
+				event_id = FTDM_OOB_ALARM_TRAP;
+				break;
+			};
+		}
+		break;
+
+	case WP_TDMAPI_EVENT_RXHOOK:
+		{
+			if (ftdmchan->type == FTDM_CHAN_TYPE_FXS) {
+				event_id = tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_hook_state & WP_TDMAPI_EVENT_RXHOOK_OFF ? FTDM_OOB_OFFHOOK : FTDM_OOB_ONHOOK;
+				if (event_id == FTDM_OOB_OFFHOOK) {
+					if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_FLASH)) {
+						ftdm_clear_flag_locked(ftdmchan, FTDM_CHANNEL_FLASH);
+						ftdm_clear_flag_locked(ftdmchan, FTDM_CHANNEL_WINK);
+						event_id = FTDM_OOB_FLASH;
+						goto event;
+					} else {
+						ftdm_set_flag_locked(ftdmchan, FTDM_CHANNEL_WINK);
+					}
+				} else {
+					if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_WINK)) {
+						ftdm_clear_flag_locked(ftdmchan, FTDM_CHANNEL_WINK);
+						ftdm_clear_flag_locked(ftdmchan, FTDM_CHANNEL_FLASH);
+						event_id = FTDM_OOB_WINK;
+						goto event;
+					} else {
+						ftdm_set_flag_locked(ftdmchan, FTDM_CHANNEL_FLASH);
+					}
+				}					
+				break;
+			} else {
+				wanpipe_tdm_api_t onhook_tdm_api;
+				memset(&onhook_tdm_api, 0, sizeof(onhook_tdm_api));
+				status = sangoma_tdm_txsig_onhook(ftdmchan->sockfd, &onhook_tdm_api);
+				if (status) {
+					snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "ONHOOK Failed");
+					return FTDM_FAIL;
+				}
+				event_id = onhook_tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_hook_state & WP_TDMAPI_EVENT_RXHOOK_OFF ? FTDM_OOB_ONHOOK : FTDM_OOB_NOOP;	
+			}
+		}
+		break;
+	case WP_TDMAPI_EVENT_RING_DETECT:
+		{
+			event_id = tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_ring_state == WP_TDMAPI_EVENT_RING_PRESENT ? FTDM_OOB_RING_START : FTDM_OOB_RING_STOP;
+		}
+		break;
+		/*
+		disabled this ones when configuring, we don't need them, do we?
+	case WP_TDMAPI_EVENT_RING_TRIP_DETECT:
+		{
+			event_id = tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_ring_state == WP_TDMAPI_EVENT_RING_PRESENT ? FTDM_OOB_ONHOOK : FTDM_OOB_OFFHOOK;
+		}
+		break;
+		*/
+	case WP_TDMAPI_EVENT_RBS:
+		{
+			event_id = FTDM_OOB_CAS_BITS_CHANGE;
+			ftdmchan->rx_cas_bits = wanpipe_swap_bits(tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_rbs_bits);
+		}
+		break;
+	case WP_TDMAPI_EVENT_DTMF:
+		{
+			char tmp_dtmf[2] = { tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_dtmf_digit, 0 };
+			event_id = FTDM_OOB_NOOP;
+
+			if (tmp_dtmf[0] == 'f') {
+				ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Ignoring wanpipe DTMF: %c, fax tones will be passed through!\n", tmp_dtmf[0]);
+				break;
+			}
+
+			if (tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_dtmf_type == WAN_EC_TONE_PRESENT) {
+				ftdm_set_flag_locked(ftdmchan, FTDM_CHANNEL_MUTE);
+			}
+
+			if (tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_dtmf_type == WAN_EC_TONE_STOP) {
+				ftdm_clear_flag_locked(ftdmchan, FTDM_CHANNEL_MUTE);
+				if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_INUSE)) {
+					ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Queuing wanpipe DTMF: %c\n", tmp_dtmf[0]);
+					ftdm_channel_queue_dtmf(ftdmchan, tmp_dtmf);
+				}
+			} 
+		}
+		break;
+	case WP_TDMAPI_EVENT_ALARM:
+		{
+			ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "Got wanpipe alarms %d\n", tdm_api.wp_tdm_cmd.event.wp_api_event_alarm);
+			event_id = FTDM_OOB_ALARM_TRAP;
+		}
+		break;
+	default:
+		{
+			ftdm_log_chan(ftdmchan, FTDM_LOG_WARNING, "Unhandled wanpipe event %d\n", tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_type);
+			event_id = FTDM_OOB_INVALID;
+		}
+		break;
+	}
+
+event:
+
+	ftdmchan->last_event_time = 0;
+	span->event_header.e_type = FTDM_EVENT_OOB;
+	span->event_header.enum_id = event_id;
+	span->event_header.channel = ftdmchan;
+	*event = &span->event_header;
+	return FTDM_SUCCESS;
+}
+
 /**
  * \brief Retrieves an event from a wanpipe span
  * \param span Span to retrieve event from
  * \param event FreeTDM event to return
  * \return Success or failure
  */
-FIO_SPAN_NEXT_EVENT_FUNCTION(wanpipe_next_event)
+FIO_SPAN_NEXT_EVENT_FUNCTION(wanpipe_span_next_event)
 {
 	uint32_t i,err;
 	ftdm_oob_event_t event_id;
@@ -1287,7 +1586,8 @@ static FIO_IO_LOAD_FUNCTION(wanpipe_init)
 	wanpipe_interface.read = wanpipe_read;
 	wanpipe_interface.write = wanpipe_write;
 	wanpipe_interface.poll_event = wanpipe_poll_event;
-	wanpipe_interface.next_event = wanpipe_next_event;
+	wanpipe_interface.next_event = wanpipe_span_next_event;
+	wanpipe_interface.channel_next_event = wanpipe_channel_next_event;
 	wanpipe_interface.channel_destroy = wanpipe_channel_destroy;
 	wanpipe_interface.get_alarms = wanpipe_get_alarms;
 	*fio = &wanpipe_interface;
diff --git a/libs/freetdm/src/ftmod/ftmod_wanpipe/ozmod_wanpipe.2005.vcproj b/libs/freetdm/src/ftmod/ftmod_wanpipe/ozmod_wanpipe.2005.vcproj
deleted file mode 100644
index abebf30427..0000000000
--- a/libs/freetdm/src/ftmod/ftmod_wanpipe/ozmod_wanpipe.2005.vcproj
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="ftmod_wanpipe"
-	ProjectGUID="{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}"
-	RootNamespace="ftmod_wanpipe"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../src/include;../../../src/isdn/include;../../../wanpipe/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="freetdm.lib libsangoma.lib"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;../../../wanpipe/api/lib/x86"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../src/include;../../../src/isdn/include;../../../wanpipe/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="freetdm.lib libsangoma.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;../../../wanpipe/api/lib/x86"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\ftmod_wanpipe.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/libs/freetdm/src/ftmod/ftmod_wanpipe/wanpipe_tdm_api_iface.h b/libs/freetdm/src/ftmod/ftmod_wanpipe/wanpipe_tdm_api_iface.h
deleted file mode 100644
index 3801ff9c8c..0000000000
--- a/libs/freetdm/src/ftmod/ftmod_wanpipe/wanpipe_tdm_api_iface.h
+++ /dev/null
@@ -1,351 +0,0 @@
-/*****************************************************************************
-* wanpipe_tdm_api_iface.h 
-* 		
-* 		WANPIPE(tm) AFT TE1 Hardware Support
-*
-* Authors: 	Nenad Corbic <ncorbic@sangoma.com>
-*
-* Copyright (c) 2007 - 08, Sangoma Technologies
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the <organization> nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-* ============================================================================
-* Oct 04, 2005	Nenad Corbic	Initial version.
-*
-* Jul 25, 2006	David Rokhvarg	<davidr@sangoma.com>	Ported to Windows.
-*****************************************************************************/
-
-#ifndef __WANPIPE_TDM_API_IFACE_H_
-#define __WANPIPE_TDM_API_IFACE_H_ 
-
-
-#if defined(__WINDOWS__)
-typedef HANDLE sng_fd_t;
-#else
-typedef int sng_fd_t;
-#endif
-
-/* Indicate to library that new features exist */
-#define WP_TDM_FEATURE_DTMF_EVENTS	1
-#define WP_TDM_FEATURE_FE_ALARM		1
-#define WP_TDM_FEATURE_EVENTS		1
-#define WP_TDM_FEATURE_LINK_STATUS	1
-
-enum wanpipe_tdm_api_cmds {
-
-	SIOC_WP_TDM_GET_USR_MTU_MRU,	/* 0x00 */
-
-	SIOC_WP_TDM_SET_USR_PERIOD,	/* 0x01 */
-	SIOC_WP_TDM_GET_USR_PERIOD,	/* 0x02 */
-	
-	SIOC_WP_TDM_SET_HW_MTU_MRU,	/* 0x03 */
-	SIOC_WP_TDM_GET_HW_MTU_MRU,	/* 0x04 */
-
-	SIOC_WP_TDM_SET_CODEC,		/* 0x05 */
-	SIOC_WP_TDM_GET_CODEC,		/* 0x06 */
-
-	SIOC_WP_TDM_SET_POWER_LEVEL,	/* 0x07 */
-	SIOC_WP_TDM_GET_POWER_LEVEL,	/* 0x08 */
-
-	SIOC_WP_TDM_TOGGLE_RX,		/* 0x09 */
-	SIOC_WP_TDM_TOGGLE_TX,		/* 0x0A */
-
-	SIOC_WP_TDM_GET_HW_CODING,	/* 0x0B */
-	SIOC_WP_TDM_SET_HW_CODING,	/* 0x0C */
-
-	SIOC_WP_TDM_GET_FULL_CFG,	/* 0x0D */
-
-	SIOC_WP_TDM_SET_EC_TAP,		/* 0x0E */
-	SIOC_WP_TDM_GET_EC_TAP,		/* 0x0F */
-	
-	SIOC_WP_TDM_ENABLE_RBS_EVENTS,	/* 0x10 */
-	SIOC_WP_TDM_DISABLE_RBS_EVENTS,	/* 0x11 */
-	SIOC_WP_TDM_WRITE_RBS_BITS,	/* 0x12 */
-	
-	SIOC_WP_TDM_GET_STATS,		/* 0x13 */
-	SIOC_WP_TDM_FLUSH_BUFFERS,	/* 0x14 */
-	
-	SIOC_WP_TDM_READ_EVENT,		/* 0x15 */
-	
-	SIOC_WP_TDM_SET_EVENT,		/* 0x16 */
-
-	SIOC_WP_TDM_SET_RX_GAINS,	/* 0x17 */
-	SIOC_WP_TDM_SET_TX_GAINS,	/* 0x18 */
-	SIOC_WP_TDM_CLEAR_RX_GAINS,	/* 0x19 */
-	SIOC_WP_TDM_CLEAR_TX_GAINS,	/* 0x1A */
-
-	SIOC_WP_TDM_GET_FE_ALARMS,	/* 0x1B */
-
-	SIOC_WP_TDM_ENABLE_HWEC,	/* 0x1C */
-	SIOC_WP_TDM_DISABLE_HWEC,	/* 0x1D */
-	
-	SIOC_WP_TDM_SET_FE_STATUS,	/* 0x1E */
-	SIOC_WP_TDM_GET_FE_STATUS,	/* 0x1F */
-
-	SIOC_WP_TDM_GET_HW_DTMF,	/* 0x20 */
-
-	SIOC_WP_TDM_NOTSUPP		/*  */
-
-};
-
-#define SIOC_WP_TDM_GET_LINK_STATUS SIOC_WP_TDM_GET_FE_STATUS
-
-enum wanpipe_tdm_api_events {
-	WP_TDMAPI_EVENT_NONE,
-	WP_TDMAPI_EVENT_RBS,
-	WP_TDMAPI_EVENT_ALARM,
-	WP_TDMAPI_EVENT_DTMF,
-	WP_TDMAPI_EVENT_RM_DTMF,
-	WP_TDMAPI_EVENT_RXHOOK,
-	WP_TDMAPI_EVENT_RING,
-	WP_TDMAPI_EVENT_RING_DETECT,
-	WP_TDMAPI_EVENT_RING_TRIP_DETECT,
-	WP_TDMAPI_EVENT_TONE,
-	WP_TDMAPI_EVENT_TXSIG_KEWL,
-	WP_TDMAPI_EVENT_TXSIG_START,
-	WP_TDMAPI_EVENT_TXSIG_OFFHOOK,
-	WP_TDMAPI_EVENT_TXSIG_ONHOOK,
-	WP_TDMAPI_EVENT_ONHOOKTRANSFER,
-	WP_TDMAPI_EVENT_SETPOLARITY,
-	WP_TDMAPI_EVENT_BRI_CHAN_LOOPBACK,
-	WP_TDMAPI_EVENT_LINK_STATUS
-};
-
-#define WP_TDMAPI_EVENT_FE_ALARM WP_TDMAPI_EVENT_ALARM
-
-
-#define WP_TDMAPI_EVENT_ENABLE		0x01
-#define WP_TDMAPI_EVENT_DISABLE		0x02
-#define WP_TDMAPI_EVENT_MODE_DECODE(mode)				\
-		((mode) == WP_TDMAPI_EVENT_ENABLE) ? "Enable" :	\
-		((mode) == WP_TDMAPI_EVENT_DISABLE) ? "Disable" :	\
-						"(Unknown mode)"
-
-#define WPTDM_A_BIT 			WAN_RBS_SIG_A
-#define WPTDM_B_BIT 			WAN_RBS_SIG_B
-#define WPTDM_C_BIT 			WAN_RBS_SIG_C
-#define WPTDM_D_BIT 			WAN_RBS_SIG_D
- 
-#define WP_TDMAPI_EVENT_RXHOOK_OFF	0x01
-#define WP_TDMAPI_EVENT_RXHOOK_ON	0x02
-#define WP_TDMAPI_EVENT_RXHOOK_DECODE(state)				\
-		((state) == WP_TDMAPI_EVENT_RXHOOK_OFF) ? "Off-hook" :	\
-		((state) == WP_TDMAPI_EVENT_RXHOOK_ON) ? "On-hook" :	\
-						"(Unknown state)"
-
-#define WP_TDMAPI_EVENT_RING_PRESENT	0x01
-#define WP_TDMAPI_EVENT_RING_STOP	0x02
-#define WP_TDMAPI_EVENT_RING_DECODE(state)				\
-		((state) == WP_TDMAPI_EVENT_RING_PRESENT) ? "Ring Present" :	\
-		((state) == WP_TDMAPI_EVENT_RING_STOP) ? "Ring Stop" :	\
-						"(Unknown state)"
-
-#define WP_TDMAPI_EVENT_RING_TRIP_PRESENT	0x01
-#define WP_TDMAPI_EVENT_RING_TRIP_STOP	0x02
-#define WP_TDMAPI_EVENT_RING_TRIP_DECODE(state)				\
-		((state) == WP_TDMAPI_EVENT_RING_TRIP_PRESENT) ? "Ring Present" :	\
-		((state) == WP_TDMAPI_EVENT_RING_TRIP_STOP) ? "Ring Stop" :	\
-						"(Unknown state)"
-/*Link Status */
-#define WP_TDMAPI_EVENT_LINK_STATUS_CONNECTED		0x01
-#define WP_TDMAPI_EVENT_LINK_STATUS_DISCONNECTED	0x02
-#define WP_TDMAPI_EVENT_LINK_STATUS_DECODE(status)					\
-		((status) == WP_TDMAPI_EVENT_LINK_STATUS_CONNECTED) ? "Connected" :		\
-		((status) == WP_TDMAPI_EVENT_LINK_STATUS_DISCONNECTED)  ? "Disconnected" :		\
-							"Unknown"
-#define	WP_TDMAPI_EVENT_TONE_DIAL	0x01
-#define	WP_TDMAPI_EVENT_TONE_BUSY	0x02
-#define	WP_TDMAPI_EVENT_TONE_RING	0x03
-#define	WP_TDMAPI_EVENT_TONE_CONGESTION	0x04
-
-/* BRI channels list */						
-#define	WAN_BRI_BCHAN1		0x01
-#define	WAN_BRI_BCHAN2		0x02
-#define	WAN_BRI_DCHAN		0x03
-
-
-typedef struct {
-
-	u_int8_t	type;
-	u_int8_t	mode;
-	u_int32_t	time_stamp;
-	u_int8_t	channel;
-	u_int32_t	chan_map;
-	u_int8_t	span;
-	union {
-		struct {
-			u_int8_t	alarm;
-		} te1_alarm;
-		struct {
-			u_int8_t	rbs_bits;
-		} te1_rbs;
-		struct {
-			u_int8_t	state;
-			u_int8_t	sig;
-		} rm_hook;
-		struct {
-			u_int8_t	state;
-		} rm_ring;
-		struct {
-			u_int8_t	type;
-		} rm_tone;
-		struct {
-			u_int8_t	digit;	/* DTMF: digit  */
-			u_int8_t	port;	/* DTMF: SOUT/ROUT */
-			u_int8_t	type;	/* DTMF: PRESET/STOP */
-		} dtmf;
-		struct {
-			u_int16_t	polarity;
-			u_int16_t	ohttimer;
-		} rm_common;
-		struct{
-			u_int16_t status;
-		} linkstatus;
-	} wp_tdm_api_event_u;
-#define wp_tdm_api_event_type 		type
-#define wp_tdm_api_event_mode 		mode
-#define wp_tdm_api_event_alarm 		wp_tdm_api_event_u.te1_alarm.alarm
-#define wp_tdm_api_event_alarm 		wp_tdm_api_event_u.te1_alarm.alarm
-#define wp_tdm_api_event_rbs_bits 	wp_tdm_api_event_u.te1_rbs.rbs_bits
-#define wp_tdm_api_event_hook_state 	wp_tdm_api_event_u.rm_hook.state
-#define wp_tdm_api_event_hook_sig 	wp_tdm_api_event_u.rm_hook.sig
-#define wp_tdm_api_event_ring_state 	wp_tdm_api_event_u.rm_ring.state
-#define wp_tdm_api_event_tone_type 	wp_tdm_api_event_u.rm_tone.type
-#define wp_tdm_api_event_dtmf_digit 	wp_tdm_api_event_u.dtmf.digit
-#define wp_tdm_api_event_dtmf_type 	wp_tdm_api_event_u.dtmf.type
-#define wp_tdm_api_event_dtmf_port 	wp_tdm_api_event_u.dtmf.port
-#define wp_tdm_api_event_ohttimer 	wp_tdm_api_event_u.rm_common.ohttimer
-#define wp_tdm_api_event_polarity 	wp_tdm_api_event_u.rm_common.polarity
-#define wp_tdm_api_event_link_status	wp_tdm_api_event_u.linkstatus.status
-} wp_tdm_api_event_t;
-
-typedef struct {
-	union {
-		unsigned char	reserved[16];
-	}wp_rx_hdr_u;
-} wp_tdm_api_rx_hdr_t;
-
-typedef struct {
-        wp_tdm_api_rx_hdr_t	hdr;
-        unsigned char  		data[1];
-} wp_tdm_api_rx_element_t;
-
-typedef struct {
-	union {
-		struct {
-			unsigned char	_rbs_rx_bits;
-			unsigned int	_time_stamp;
-		}wp_tx;
-		unsigned char	reserved[16];
-	}wp_tx_hdr_u;
-#define wp_api_time_stamp 	wp_tx_hdr_u.wp_tx._time_stamp
-} wp_tdm_api_tx_hdr_t;
-
-typedef struct {
-        wp_tdm_api_tx_hdr_t	hdr;
-        unsigned char  		data[1];
-} wp_tdm_api_tx_element_t;
-
-
-
-typedef struct wp_tdm_chan_stats
-{
-	unsigned int	rx_packets;		/* total packets received	*/
-	unsigned int	tx_packets;		/* total packets transmitted	*/
-	unsigned int	rx_bytes;		/* total bytes received 	*/
-	unsigned int	tx_bytes;		/* total bytes transmitted	*/
-	unsigned int	rx_errors;		/* bad packets received		*/
-	unsigned int	tx_errors;		/* packet transmit problems	*/
-	unsigned int	rx_dropped;		/* no space in linux buffers	*/
-	unsigned int	tx_dropped;		/* no space available in linux	*/
-	unsigned int	multicast;		/* multicast packets received	*/
-#if !defined(__WINDOWS__)
-	unsigned int	collisions;
-#endif
-	/* detailed rx_errors: */
-	unsigned int	rx_length_errors;
-	unsigned int	rx_over_errors;		/* receiver ring buff overflow	*/
-	unsigned int	rx_crc_errors;		/* recved pkt with crc error	*/
-	unsigned int	rx_frame_errors;	/* recv'd frame alignment error */
-#if !defined(__WINDOWS__)
-	unsigned int	rx_fifo_errors;		/* recv'r fifo overrun		*/
-#endif
-	unsigned int	rx_missed_errors;	/* receiver missed packet	*/
-
-	/* detailed tx_errors */
-#if !defined(__WINDOWS__)
-	unsigned int	tx_aborted_errors;
-	unsigned int	tx_carrier_errors;
-#endif
-	unsigned int	tx_fifo_errors;
-	unsigned int	tx_heartbeat_errors;
-	unsigned int	tx_window_errors;
-	
-}wp_tdm_chan_stats_t;          
-
-
- 
-typedef struct wanpipe_tdm_api_cmd{
-	unsigned int cmd;
-	unsigned int hw_tdm_coding;	/* Set/Get HW TDM coding: uLaw muLaw */
-	unsigned int hw_mtu_mru;	/* Set/Get HW TDM MTU/MRU */
-	unsigned int usr_period;	/* Set/Get User Period in ms */
-	unsigned int tdm_codec;		/* Set/Get TDM Codec: SLinear */
-	unsigned int power_level;	/* Set/Get Power level treshold */
-	unsigned int rx_disable;	/* Enable/Disable Rx */
-	unsigned int tx_disable;	/* Enable/Disable Tx */		
-	unsigned int usr_mtu_mru;	/* Set/Get User TDM MTU/MRU */
-	unsigned int ec_tap;		/* Echo Cancellation Tap */
-	unsigned int rbs_poll;		/* Enable/Disable RBS Polling */
-	unsigned int rbs_rx_bits;	/* Rx RBS Bits */
-	unsigned int rbs_tx_bits;	/* Tx RBS Bits */
-	unsigned int hdlc;			/* HDLC based device */
-	unsigned int idle_flag;		/* IDLE flag to Tx */
-	unsigned int fe_alarms;		/* FE Alarms detected */
-	wp_tdm_chan_stats_t stats;	/* TDM Statistics */
-	/* Do NOT add anything above this! Important for binary backward compatibility. */
-	wp_tdm_api_event_t event;	/* TDM Event */
-	unsigned int data_len;
-        void *data;	
-	unsigned char fe_status;	/* FE status - Connected or Disconnected */
-	unsigned int hw_dtmf;		/* HW DTMF enabled */
-}wanpipe_tdm_api_cmd_t;
-
-typedef struct wanpipe_tdm_api_event{
-	int (*wp_rbs_event)(sng_fd_t fd, unsigned char rbs_bits);
-	int (*wp_dtmf_event)(sng_fd_t fd, unsigned char dtmf, unsigned char type, unsigned char port);
-	int (*wp_rxhook_event)(sng_fd_t fd, unsigned char hook_state);
-	int (*wp_ring_detect_event)(sng_fd_t fd, unsigned char ring_state);
-	int (*wp_ring_trip_detect_event)(sng_fd_t fd, unsigned char ring_state);
-	int (*wp_fe_alarm_event)(sng_fd_t fd, unsigned char fe_alarm_event);
-	int (*wp_link_status_event)(sng_fd_t fd, unsigned char link_status_event);
-}wanpipe_tdm_api_event_t; 
-
-typedef struct wanpipe_tdm_api{
-	wanpipe_tdm_api_cmd_t	wp_tdm_cmd;
-	wanpipe_tdm_api_event_t wp_tdm_event;
-}wanpipe_tdm_api_t;
-
-
-#endif
diff --git a/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c b/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
index ddf7b3ffab..7320934a49 100644
--- a/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
+++ b/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
@@ -35,6 +35,11 @@
 #include "private/ftdm_core.h"
 #include "ftmod_zt.h"
 
+/* used by dahdi to indicate there is no data available, but events to read */
+#ifndef ELAST
+#define ELAST 500
+#endif
+
 /**
  * \brief Zaptel globals
  */
@@ -889,13 +894,18 @@ static FIO_WAIT_FUNCTION(zt_wait)
 		inflags |= POLLPRI;
 	}
 
-
+pollagain:
 	memset(&pfds[0], 0, sizeof(pfds[0]));
 	pfds[0].fd = ftdmchan->sockfd;
 	pfds[0].events = inflags;
 	result = poll(pfds, 1, to);
 	*flags = 0;
 
+	if (result < 0 && errno == EINTR) {
+		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "DAHDI wait got interrupted, trying again\n");
+		goto pollagain;
+	}
+
 	if (pfds[0].revents & POLLERR) {
 		ftdm_log_chan_msg(ftdmchan, FTDM_LOG_ERROR, "DAHDI device got POLLERR\n");
 		result = -1;
@@ -1076,7 +1086,6 @@ FIO_SPAN_NEXT_EVENT_FUNCTION(zt_next_event)
 	}
 
 	return FTDM_FAIL;
-	
 }
 
 /**
@@ -1095,12 +1104,19 @@ static FIO_READ_FUNCTION(zt_read)
 		if ((r = read(ftdmchan->sockfd, data, *datalen)) > 0) {
 			break;
 		}
-		ftdm_sleep(10);
-		if (r == 0) {
-			errs--;
+		else if (r == 0) {
+			ftdm_sleep(10);
+			if (errs) errs--;
+		}
+		else {
+			if (errno == EAGAIN || errno == EINTR)
+				continue;
+			if (errno == ELAST)
+				break;
+
+			ftdm_log(FTDM_LOG_ERROR, "read failed: %s\n", strerror(errno));
 		}
 	}
-
 	if (r > 0) {
 		*datalen = r;
 		if (ftdmchan->type == FTDM_CHAN_TYPE_DQ921) {
@@ -1108,7 +1124,9 @@ static FIO_READ_FUNCTION(zt_read)
 		}
 		return FTDM_SUCCESS;
 	}
-
+	else if (errno == ELAST) {
+		return FTDM_SUCCESS;
+	}
 	return r == 0 ? FTDM_TIMEOUT : FTDM_FAIL;
 }
 
diff --git a/libs/freetdm/src/include/freetdm.h b/libs/freetdm/src/include/freetdm.h
index 31bc88b9ca..4ee6ff5f52 100644
--- a/libs/freetdm/src/include/freetdm.h
+++ b/libs/freetdm/src/include/freetdm.h
@@ -41,6 +41,7 @@
 
 
 #include "ftdm_declare.h"
+#include "ftdm_call_utils.h"
 
 /*! \brief Max number of channels per physical span */
 #define FTDM_MAX_CHANNELS_PHYSICAL_SPAN 32
@@ -62,23 +63,6 @@
 
 #define FTDM_INVALID_INT_PARM 0xFF
 
-/*! \brief FreeTDM APIs possible return codes */
-typedef enum {
-	FTDM_SUCCESS, /*!< Success */
-	FTDM_FAIL, /*!< Failure, generic error return code, use ftdm_channel_get_last_error or ftdm_span_get_last_error for details */
-	FTDM_MEMERR, /*!< Memory error, most likely allocation failure */
-	FTDM_TIMEOUT, /*!< Operation timed out (ie: polling on a device)*/
-	FTDM_NOTIMPL, /*!< Operation not implemented */
-	FTDM_BREAK, /*!< Request the caller to perform a break (context-dependant, ie: stop getting DNIS/ANI) */
-	FTDM_EINVAL /*!< Invalid argument */
-} ftdm_status_t;
-
-/*! \brief FreeTDM bool type. */
-typedef enum {
-	FTDM_FALSE,
-	FTDM_TRUE
-} ftdm_bool_t;
-
 /*! \brief Thread/Mutex OS abstraction API. */
 #include "ftdm_os.h"
 
@@ -220,8 +204,10 @@ typedef enum {
 	FTDM_TON_SUBSCRIBER_NUMBER,
 	FTDM_TON_ABBREVIATED_NUMBER,
 	FTDM_TON_RESERVED,
-	FTDM_TON_INVALID = 255
+	FTDM_TON_INVALID
 } ftdm_ton_t;
+#define TON_STRINGS "unknown", "international", "national", "network-specific", "subscriber-number", "abbreviated-number", "reserved", "invalid"
+FTDM_STR2ENUM_P(ftdm_str2ftdm_ton, ftdm_ton2str, ftdm_ton_t)
 
 /*! Numbering Plan Identification (NPI) */
 typedef enum {
@@ -232,8 +218,52 @@ typedef enum {
 	FTDM_NPI_NATIONAL = 8,
 	FTDM_NPI_PRIVATE = 9,
 	FTDM_NPI_RESERVED = 10,
-	FTDM_NPI_INVALID = 255
+	FTDM_NPI_INVALID
 } ftdm_npi_t;
+#define NPI_STRINGS "unknown", "ISDN", "data", "telex", "national", "private", "reserved", "invalid"
+FTDM_STR2ENUM_P(ftdm_str2ftdm_npi, ftdm_npi2str, ftdm_npi_t)
+
+/*! Presentation Ind */
+typedef enum {
+	FTDM_PRES_ALLOWED,
+	FTDM_PRES_RESTRICTED,
+	FTDM_PRES_NOT_AVAILABLE,
+	FTDM_PRES_RESERVED,
+	FTDM_PRES_INVALID
+} ftdm_presentation_t;
+#define PRESENTATION_STRINGS "presentation-allowed", "presentation-restricted", "number-not-available", "reserved", "Invalid"
+FTDM_STR2ENUM_P(ftdm_str2ftdm_presentation, ftdm_presentation2str, ftdm_presentation_t)
+
+/*! Screening Ind */
+typedef enum {
+	FTDM_SCREENING_NOT_SCREENED,
+	FTDM_SCREENING_VERIFIED_PASSED,
+	FTDM_SCREENING_VERIFIED_FAILED,
+	FTDM_SCREENING_NETWORK_PROVIDED,
+	FTDM_SCREENING_INVALID
+} ftdm_screening_t;
+#define SCREENING_STRINGS "user-provided-not-screened", "user-provided-verified-and-passed", "user-provided-verified-and-failed", "network-provided", "invalid"
+FTDM_STR2ENUM_P(ftdm_str2ftdm_screening, ftdm_screening2str, ftdm_screening_t)
+
+/*! \brief bearer capability */
+typedef enum {
+	FTDM_BEARER_CAP_SPEECH = 0x00,
+	FTDM_BEARER_CAP_64K_UNRESTRICTED = 0x02,
+	FTDM_BEARER_CAP_3_1KHZ_AUDIO = 0x03,
+	FTDM_BEARER_CAP_INVALID
+} ftdm_bearer_cap_t;
+#define BEARER_CAP_STRINGS "speech", "unrestricted-digital-information", "3.1-Khz-audio", "invalid"
+FTDM_STR2ENUM_P(ftdm_str2ftdm_bearer_cap, ftdm_bearer_cap2str, ftdm_bearer_cap_t)
+
+/*! \brief user information layer 1 protocol */
+typedef enum {
+	FTDM_USER_LAYER1_PROT_V110 = 0x01,
+	FTDM_USER_LAYER1_PROT_ULAW = 0x02,
+	FTDM_USER_LAYER1_PROT_ALAW = 0x03,
+	FTDM_USER_LAYER1_PROT_INVALID
+} ftdm_user_layer1_prot_t;
+#define USER_LAYER1_PROT_STRINGS "V.110", "u-law", "a-law", "Invalid"
+FTDM_STR2ENUM_P(ftdm_str2ftdm_usr_layer1_prot, ftdm_user_layer1_prot2str, ftdm_user_layer1_prot_t)
 
 /*! \brief Number abstraction */
 typedef struct {
@@ -242,20 +272,8 @@ typedef struct {
 	uint8_t plan;
 } ftdm_number_t;
 
-/*! \brief bearer capability */
-typedef enum {
-	FTDM_BEARER_CAP_SPEECH = 0x00,
-	FTDM_BEARER_CAP_64K_UNRESTRICTED = 0x02,
-	FTDM_BEARER_CAP_3_1KHZ_AUDIO = 0x03
-} ftdm_bearer_cap_t;
-
-/*! \brief user information layer 1 protocol */
-typedef enum {
-	FTDM_USER_LAYER1_PROT_V110 = 0x01,
-	FTDM_USER_LAYER1_PROT_ULAW = 0x02,
-	FTDM_USER_LAYER1_PROT_ALAW = 0x03,
-} ftdm_user_layer1_prot_t;
-
+typedef void * ftdm_variable_container_t; 
+									 
 /*! \brief Caller information */
 typedef struct ftdm_caller_data {
 	char cid_date[8]; /*!< Caller ID date */
@@ -270,12 +288,13 @@ typedef struct ftdm_caller_data {
 	char collected[25]; /*!< Collected digits so far */
 	int hangup_cause; /*!< Hangup cause */
 	char raw_data[1024]; /*!< Protocol specific raw caller data */
-	uint32_t raw_data_len; /* !< Raw data length */
+	uint32_t raw_data_len; /*!< Raw data length */
 	/* these 2 are undocumented right now, only used by boost: */
 	/* bearer capability */
 	ftdm_bearer_cap_t bearer_capability;
 	/* user information layer 1 protocol */
 	ftdm_user_layer1_prot_t bearer_layer1;
+	ftdm_variable_container_t variables; /*!<variables attached to this call */
 } ftdm_caller_data_t;
 
 /*! \brief Tone type */
@@ -285,10 +304,12 @@ typedef enum {
 
 /*! \brief Signaling messages sent by the stacks */
 typedef enum {
-	FTDM_SIGEVENT_START, /*!< Incoming call (ie: incoming SETUP msg or Ring) */
+	FTDM_SIGEVENT_START,/*!< Incoming call (ie: incoming SETUP msg or Ring) */
 	FTDM_SIGEVENT_STOP, /*!< Hangup */
+	FTDM_SIGEVENT_RELEASED, /*!< Channel is completely released and available */
 	FTDM_SIGEVENT_UP, /*!< Outgoing call has been answered */
-	FTDM_SIGEVENT_FLASH, /*< Flash event  (typically on-hook/off-hook for analog devices) */
+	FTDM_SIGEVENT_FLASH, /*!< Flash event  (typically on-hook/off-hook for analog devices) */
+ 	FTDM_SIGEVENT_PROCEED, /*!< Outgoing call got a response */
 	FTDM_SIGEVENT_PROGRESS, /*!< Outgoing call is making progress */
 	FTDM_SIGEVENT_PROGRESS_MEDIA, /*!< Outgoing call is making progress and there is media available */
 	FTDM_SIGEVENT_ALARM_TRAP, /*!< Hardware alarm ON */
@@ -298,11 +319,12 @@ typedef enum {
 	FTDM_SIGEVENT_RESTART, /*!< Restart has been requested. Typically you hangup your call resources here */
 	FTDM_SIGEVENT_SIGSTATUS_CHANGED, /*!< Signaling protocol status changed (ie: D-chan up), see new status in raw_data ftdm_sigmsg_t member */
 	FTDM_SIGEVENT_COLLISION, /*!< Outgoing call was dropped because an incoming call arrived at the same time */
+	FTDM_SIGEVENT_FACILITY, /* !< In call facility event */
 	FTDM_SIGEVENT_INVALID
 } ftdm_signal_event_t;
-#define SIGNAL_STRINGS "START", "STOP", "UP", "FLASH", "PROGRESS", \
+#define SIGNAL_STRINGS "START", "STOP", "RELEASED", "UP", "FLASH", "PROCEED", "PROGRESS", \
 		"PROGRESS_MEDIA", "ALARM_TRAP", "ALARM_CLEAR", \
-		"COLLECTED_DIGIT", "ADD_CALL", "RESTART", "SIGSTATUS_CHANGED", "COLLISION", "INVALID"
+		"COLLECTED_DIGIT", "ADD_CALL", "RESTART", "SIGSTATUS_CHANGED", "COLLISION", "MSG", "INVALID"
 
 /*! \brief Move from string to ftdm_signal_event_t and viceversa */
 FTDM_STR2ENUM_P(ftdm_str2ftdm_signal_event, ftdm_signal_event2str, ftdm_signal_event_t)
@@ -332,6 +354,7 @@ typedef struct ftdm_channel_config {
 	ftdm_chan_type_t type;
 	float rxgain;
 	float txgain;
+	uint8_t debugdtmf;
 } ftdm_channel_config_t;
 
 /*!
@@ -358,7 +381,7 @@ struct ftdm_sigmsg {
 	ftdm_channel_t *channel; /*!< Related channel */
 	uint32_t chan_id; /*!< easy access to chan id */
 	uint32_t span_id; /*!< easy access to span_id */
-	ftdm_signaling_status_t sigstatus; /*!< Signaling status (valid if event_id is FTDM_SIGEVENT_SIGSTATUS_CHANGED) */
+	ftdm_signaling_status_t sigstatus; /*!< Signaling status (valid if event_id is FTDM_SIGEVENT_SIGSTATUS_CHANGED) */	
 	void *raw_data; /*!< Message specific data if any */
 	uint32_t raw_data_len; /*!< Data len in case is needed */
 };
@@ -412,9 +435,38 @@ typedef enum {
 	FTDM_COMMAND_WINK,
 	FTDM_COMMAND_ENABLE_PROGRESS_DETECT,
 	FTDM_COMMAND_DISABLE_PROGRESS_DETECT,
+
+	/*!< Start tracing input and output from channel to the given file */
 	FTDM_COMMAND_TRACE_INPUT,
 	FTDM_COMMAND_TRACE_OUTPUT,
+
+	/*!< Stop both Input and Output trace, closing the files */
 	FTDM_COMMAND_TRACE_END_ALL,
+
+	/*!< Enable DTMF debugging */
+	FTDM_COMMAND_ENABLE_DEBUG_DTMF,
+
+	/*!< Disable DTMF debugging (if not disabled explicitly, it is disabled automatically when calls hangup) */
+	FTDM_COMMAND_DISABLE_DEBUG_DTMF,
+
+	/*!< Start dumping all input to a circular buffer. The size of the circular buffer can be specified, default used otherwise */
+	FTDM_COMMAND_ENABLE_INPUT_DUMP,
+
+	/*!< Stop dumping all input to a circular buffer. */
+	FTDM_COMMAND_DISABLE_INPUT_DUMP,
+
+	/*!< Start dumping all output to a circular buffer. The size of the circular buffer can be specified, default used otherwise */
+	FTDM_COMMAND_ENABLE_OUTPUT_DUMP,
+
+	/*!< Stop dumping all output to a circular buffer. */
+	FTDM_COMMAND_DISABLE_OUTPUT_DUMP,
+
+	/*!< Dump the current input circular buffer to the specified FILE* structure */
+	FTDM_COMMAND_DUMP_INPUT,
+
+	/*!< Dump the current output circular buffer to the specified FILE* structure */
+	FTDM_COMMAND_DUMP_OUTPUT,
+
 	FTDM_COMMAND_ENABLE_CALLERID_DETECT,
 	FTDM_COMMAND_DISABLE_CALLERID_DETECT,
 	FTDM_COMMAND_ENABLE_ECHOCANCEL,
@@ -430,12 +482,15 @@ typedef enum {
 	FTDM_COMMAND_FLUSH_TX_BUFFERS,
 	FTDM_COMMAND_FLUSH_RX_BUFFERS,
 	FTDM_COMMAND_FLUSH_BUFFERS,
+	FTDM_COMMAND_FLUSH_IOSTATS,
 	FTDM_COMMAND_SET_PRE_BUFFER_SIZE,
 	FTDM_COMMAND_SET_LINK_STATUS,
 	FTDM_COMMAND_GET_LINK_STATUS,
 	FTDM_COMMAND_ENABLE_LOOP,
 	FTDM_COMMAND_DISABLE_LOOP,
-	FTDM_COMMAND_COUNT
+	FTDM_COMMAND_COUNT,
+	FTDM_COMMAND_SET_RX_QUEUE_SIZE,
+	FTDM_COMMAND_SET_TX_QUEUE_SIZE,
 } ftdm_command_t;
 
 /*! \brief Custom memory handler hooks. Not recommended to use unless you need memory allocation customizations */
@@ -455,12 +510,14 @@ struct ftdm_memory_handler {
  * You don't need these unless your implementing an I/O interface module (most users don't) */
 #define FIO_CHANNEL_REQUEST_ARGS (ftdm_span_t *span, uint32_t chan_id, ftdm_direction_t direction, ftdm_caller_data_t *caller_data, ftdm_channel_t **ftdmchan)
 #define FIO_CHANNEL_OUTGOING_CALL_ARGS (ftdm_channel_t *ftdmchan)
+#define FIO_CHANNEL_SEND_MSG_ARGS (ftdm_channel_t *ftdmchan, ftdm_sigmsg_t *sigmsg)
 #define FIO_CHANNEL_SET_SIG_STATUS_ARGS (ftdm_channel_t *ftdmchan, ftdm_signaling_status_t status)
 #define FIO_CHANNEL_GET_SIG_STATUS_ARGS (ftdm_channel_t *ftdmchan, ftdm_signaling_status_t *status)
 #define FIO_SPAN_SET_SIG_STATUS_ARGS (ftdm_span_t *span, ftdm_signaling_status_t status)
 #define FIO_SPAN_GET_SIG_STATUS_ARGS (ftdm_span_t *span, ftdm_signaling_status_t *status)
 #define FIO_SPAN_POLL_EVENT_ARGS (ftdm_span_t *span, uint32_t ms, short *poll_events)
 #define FIO_SPAN_NEXT_EVENT_ARGS (ftdm_span_t *span, ftdm_event_t **event)
+#define FIO_CHANNEL_NEXT_EVENT_ARGS (ftdm_channel_t *ftdmchan, ftdm_event_t **event)
 #define FIO_SIGNAL_CB_ARGS (ftdm_sigmsg_t *sigmsg)
 #define FIO_EVENT_CB_ARGS (ftdm_channel_t *ftdmchan, ftdm_event_t *event)
 #define FIO_CONFIGURE_SPAN_ARGS (ftdm_span_t *span, const char *str, ftdm_chan_type_t type, char *name, char *number)
@@ -486,12 +543,14 @@ struct ftdm_memory_handler {
  * You don't need these unless your implementing an I/O interface module (most users don't) */
 typedef ftdm_status_t (*fio_channel_request_t) FIO_CHANNEL_REQUEST_ARGS ;
 typedef ftdm_status_t (*fio_channel_outgoing_call_t) FIO_CHANNEL_OUTGOING_CALL_ARGS ;
+typedef ftdm_status_t (*fio_channel_send_msg_t) FIO_CHANNEL_SEND_MSG_ARGS;
 typedef ftdm_status_t (*fio_channel_set_sig_status_t) FIO_CHANNEL_SET_SIG_STATUS_ARGS;
 typedef ftdm_status_t (*fio_channel_get_sig_status_t) FIO_CHANNEL_GET_SIG_STATUS_ARGS;
 typedef ftdm_status_t (*fio_span_set_sig_status_t) FIO_SPAN_SET_SIG_STATUS_ARGS;
 typedef ftdm_status_t (*fio_span_get_sig_status_t) FIO_SPAN_GET_SIG_STATUS_ARGS;
 typedef ftdm_status_t (*fio_span_poll_event_t) FIO_SPAN_POLL_EVENT_ARGS ;
 typedef ftdm_status_t (*fio_span_next_event_t) FIO_SPAN_NEXT_EVENT_ARGS ;
+typedef ftdm_status_t (*fio_channel_next_event_t) FIO_CHANNEL_NEXT_EVENT_ARGS ;
 typedef ftdm_status_t (*fio_signal_cb_t) FIO_SIGNAL_CB_ARGS ;
 typedef ftdm_status_t (*fio_event_cb_t) FIO_EVENT_CB_ARGS ;
 typedef ftdm_status_t (*fio_configure_span_t) FIO_CONFIGURE_SPAN_ARGS ;
@@ -518,12 +577,14 @@ typedef ftdm_status_t (*fio_api_t) FIO_API_ARGS ;
  * You don't need these unless your implementing an I/O interface module (most users don't) */
 #define FIO_CHANNEL_REQUEST_FUNCTION(name) ftdm_status_t name FIO_CHANNEL_REQUEST_ARGS
 #define FIO_CHANNEL_OUTGOING_CALL_FUNCTION(name) ftdm_status_t name FIO_CHANNEL_OUTGOING_CALL_ARGS
+#define FIO_CHANNEL_SEND_MSG_FUNCTION(name) ftdm_status_t name FIO_CHANNEL_SEND_MSG_ARGS
 #define FIO_CHANNEL_SET_SIG_STATUS_FUNCTION(name) ftdm_status_t name FIO_CHANNEL_SET_SIG_STATUS_ARGS
 #define FIO_CHANNEL_GET_SIG_STATUS_FUNCTION(name) ftdm_status_t name FIO_CHANNEL_GET_SIG_STATUS_ARGS
 #define FIO_SPAN_SET_SIG_STATUS_FUNCTION(name) ftdm_status_t name FIO_SPAN_SET_SIG_STATUS_ARGS
 #define FIO_SPAN_GET_SIG_STATUS_FUNCTION(name) ftdm_status_t name FIO_SPAN_GET_SIG_STATUS_ARGS
 #define FIO_SPAN_POLL_EVENT_FUNCTION(name) ftdm_status_t name FIO_SPAN_POLL_EVENT_ARGS
 #define FIO_SPAN_NEXT_EVENT_FUNCTION(name) ftdm_status_t name FIO_SPAN_NEXT_EVENT_ARGS
+#define FIO_CHANNEL_NEXT_EVENT_FUNCTION(name) ftdm_status_t name FIO_CHANNEL_NEXT_EVENT_ARGS
 #define FIO_SIGNAL_CB_FUNCTION(name) ftdm_status_t name FIO_SIGNAL_CB_ARGS
 #define FIO_EVENT_CB_FUNCTION(name) ftdm_status_t name FIO_EVENT_CB_ARGS
 #define FIO_CONFIGURE_SPAN_FUNCTION(name) ftdm_status_t name FIO_CONFIGURE_SPAN_ARGS
@@ -562,6 +623,7 @@ struct ftdm_io_interface {
 	fio_write_t write; /*!< Write data to the channel */
 	fio_span_poll_event_t poll_event; /*!< Poll for events on the whole span */
 	fio_span_next_event_t next_event; /*!< Retrieve an event from the span */
+	fio_channel_next_event_t channel_next_event; /*!< Retrieve an event from channel */
 	fio_api_t api; /*!< Execute a text command */
 };
 
@@ -577,7 +639,7 @@ typedef enum {
  * This is used during incoming calls when you want to request the signaling stack
  * to notify about indications occurring locally */
 typedef enum {
-	FTDM_CHANNEL_INDICATE_RING,
+	FTDM_CHANNEL_INDICATE_RINGING,
 	FTDM_CHANNEL_INDICATE_PROCEED,
 	FTDM_CHANNEL_INDICATE_PROGRESS,
 	FTDM_CHANNEL_INDICATE_PROGRESS_MEDIA,
@@ -616,6 +678,12 @@ FT_DECLARE(ftdm_status_t) _ftdm_channel_call_place(const char *file, const char
 /*! \brief Indicate a new condition in an incoming call recording the source code point where it was called (see ftdm_channel_call_indicate for an easy to use macro) */
 FT_DECLARE(ftdm_status_t) _ftdm_channel_call_indicate(const char *file, const char *func, int line, ftdm_channel_t *ftdmchan, ftdm_channel_indication_t indication);
 
+/*! \brief Send a message on a call */
+#define ftdm_channel_call_send_msg(ftdmchan, sigmsg) _ftdm_channel_call_send_msg(__FILE__, __FUNCTION__, __LINE__, (ftdmchan), (sigmsg))
+
+/*! \brief Send a signal on a call recording the source code point where it was called (see ftdm_channel_call_send_msg for an easy to use macro) */
+FT_DECLARE(ftdm_status_t) _ftdm_channel_call_send_msg(const char *file, const char *func, int line, ftdm_channel_t *ftdmchan, ftdm_sigmsg_t *sigmsg);
+
 /*! \brief Hangup the call without cause */
 #define ftdm_channel_call_hangup(ftdmchan) _ftdm_channel_call_hangup(__FILE__, __FUNCTION__, __LINE__, (ftdmchan))
 
@@ -880,6 +948,23 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_add_to_group(const char* name, ftdm_chann
 /*! \brief Remove the channel from a hunt group */
 FT_DECLARE(ftdm_status_t) ftdm_channel_remove_from_group(ftdm_group_t* group, ftdm_channel_t* ftdmchan);
 
+/*! 
+ * \brief Retrieves an event from the span
+ *
+ * \note
+ * 	This function is non-reentrant and not thread-safe. 
+ * 	The event returned may be modified if the function is called again 
+ * 	from a different thread or even the same. It is recommended to
+ * 	handle events from the same span in a single thread.
+ *
+ * \param ftdmchan The channel to retrieve the event from
+ * \param event Pointer to store the pointer to the event
+ *
+ * \retval FTDM_SUCCESS success (at least one event available)
+ * \retval FTDM_FAIL failure
+ */
+FT_DECLARE(ftdm_status_t) ftdm_channel_read_event(ftdm_channel_t *ftdmchan, ftdm_event_t **event);
+
 /*! \brief Find a hunt group by id */
 FT_DECLARE(ftdm_status_t) ftdm_group_find(uint32_t id, ftdm_group_t **group);
 
@@ -1055,6 +1140,45 @@ FT_DECLARE(ftdm_iterator_t *) ftdm_iterator_next(ftdm_iterator_t *iter);
  */
 FT_DECLARE(ftdm_status_t) ftdm_iterator_free(ftdm_iterator_t *iter);
 
+/*! \brief Add a custom variable to the call
+ *  \note This variables may be used by signaling modules to override signaling parameters
+ *  \todo Document which signaling variables are available
+ * */
+FT_DECLARE(ftdm_status_t) ftdm_call_add_var(ftdm_caller_data_t *caller_data, const char *var_name, const char *value);
+
+/*! \brief Get a custom variable from the call.
+ *  \note The variable pointer returned is only valid during the callback receiving SIGEVENT. */
+FT_DECLARE(const char *) ftdm_call_get_var(ftdm_caller_data_t *caller_data, const char *var_name);
+
+/*! \brief Get an iterator to iterate over the channel variables
+ *  \param caller_data The signal msg structure containing the variables
+ *  \param iter Optional iterator. You can reuse an old iterator (not previously freed) to avoid the extra allocation of a new iterator.
+ *  \note The iterator pointer returned is only valid while the signal message and it'll be destroyed when the signal message is processed.
+ *        This iterator is completely non-thread safe, if you are adding variables or removing variables while iterating
+ *        results are unpredictable
+ */
+FT_DECLARE(ftdm_iterator_t *) ftdm_call_get_var_iterator(const ftdm_caller_data_t *caller_data, ftdm_iterator_t *iter);
+
+/*! \brief Get variable name and value for the current iterator position */
+FT_DECLARE(ftdm_status_t) ftdm_call_get_current_var(ftdm_iterator_t *iter, const char **var_name, const char **var_val);
+
+/*! \brief Clear all variables  attached to the call
+ *  \note Variables are cleared at the end of each call back, so it is not necessary for the user to call this function.
+ *  \todo Document which signaling variables are available
+ * */
+FT_DECLARE(ftdm_status_t) ftdm_call_clear_vars(ftdm_caller_data_t *caller_data);
+
+/*! \brief Remove a variable attached to the call
+ *  \note Removes a variable that was attached to the call.
+ *  \todo Document which call variables are available
+ * */
+FT_DECLARE(ftdm_status_t) ftdm_call_remove_var(ftdm_caller_data_t *caller_data, const char *var_name);
+
+/*! \brief Clears all the temporary data attached to this call
+ *  \note Clears caller_data->variables and caller_data->raw_data.
+ * */
+FT_DECLARE(void) ftdm_call_clear_data(ftdm_caller_data_t *caller_data);
+		
 /*! \brief Get the span pointer associated to the channel */
 FT_DECLARE(ftdm_span_t *) ftdm_channel_get_span(const ftdm_channel_t *ftdmchan);
 
diff --git a/libs/freetdm/src/include/ftdm_call_utils.h b/libs/freetdm/src/include/ftdm_call_utils.h
new file mode 100644
index 0000000000..835a5c6cdc
--- /dev/null
+++ b/libs/freetdm/src/include/ftdm_call_utils.h
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2010, Sangoma Technologies
+ * David Yat Sin <dyatsin@sangoma.com>
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * * Neither the name of the original author; nor the names of any contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ * 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __FTDM_CALL_UTILS_H__
+#define __FTDM_CALL_UTILS_H__
+
+/*! 
+ * \brief Set the Numbering Plan Identification from a string
+ *
+ * \param npi_string string value
+ * \param target the target to set value to
+ *
+ * \retval FTDM_SUCCESS success
+ * \retval FTDM_FAIL failure
+ */
+FT_DECLARE(ftdm_status_t) ftdm_set_npi(const char *npi_string, uint8_t *target);
+
+
+/*! 
+ * \brief Set the Type of number from a string
+ *
+ * \param ton_string string value
+ * \param target the target to set value to
+ *
+ * \retval FTDM_SUCCESS success
+ * \retval FTDM_FAIL failure
+ */
+FT_DECLARE(ftdm_status_t) ftdm_set_ton(const char *ton_string, uint8_t *target);
+
+/*! 
+ * \brief Set the Bearer Capability from a string
+ *
+ * \param bc_string string value
+ * \param target the target to set value to
+ *
+ * \retval FTDM_SUCCESS success
+ * \retval FTDM_FAIL failure
+ */
+FT_DECLARE(ftdm_status_t) ftdm_set_bearer_capability(const char *bc_string, uint8_t *target);
+
+/*! 
+ * \brief Set the Bearer Capability - Layer 1 from a string
+ *
+ * \param bc_string string value
+ * \param target the target to set value to
+ *
+ * \retval FTDM_SUCCESS success
+ * \retval FTDM_FAIL failure
+ */
+FT_DECLARE(ftdm_status_t) ftdm_set_bearer_layer1(const char *bc_string, uint8_t *target);
+
+/*! 
+ * \brief Set the Screening Ind from a string
+ *
+ * \param screen_string string value
+ * \param target the target to set value to
+ *
+ * \retval FTDM_SUCCESS success
+ * \retval FTDM_FAIL failure
+ */
+FT_DECLARE(ftdm_status_t) ftdm_set_screening_ind(const char *string, uint8_t *target);
+
+
+/*! 
+ * \brief Set the Presentation Ind from an enum
+ *
+ * \param screen_string string value
+ * \param target the target to set value to
+ *
+ * \retval FTDM_SUCCESS success
+ * \retval FTDM_FAIL failure
+ */
+FT_DECLARE(ftdm_status_t) ftdm_set_presentation_ind(const char *string, uint8_t *target);
+
+
+/*! 
+ * \brief Checks whether a string contains only numbers
+ *
+ * \param number string value
+ *
+ * \retval FTDM_SUCCESS success
+ * \retval FTDM_FAIL failure
+ */
+FT_DECLARE(ftdm_status_t) ftdm_is_number(const char *number);
+
+#endif /* __FTDM_CALL_UTILS_H__ */
+
diff --git a/libs/freetdm/src/include/ftdm_declare.h b/libs/freetdm/src/include/ftdm_declare.h
index ab3b5c8966..4aba703f28 100644
--- a/libs/freetdm/src/include/ftdm_declare.h
+++ b/libs/freetdm/src/include/ftdm_declare.h
@@ -171,6 +171,23 @@ typedef int ftdm_socket_t;
 #include <stdarg.h>
 #endif
 
+/*! \brief FreeTDM APIs possible return codes */
+typedef enum {
+	FTDM_SUCCESS, /*!< Success */
+	FTDM_FAIL, /*!< Failure, generic error return code, use ftdm_channel_get_last_error or ftdm_span_get_last_error for details */
+	FTDM_MEMERR, /*!< Memory error, most likely allocation failure */
+	FTDM_TIMEOUT, /*!< Operation timed out (ie: polling on a device)*/
+	FTDM_NOTIMPL, /*!< Operation not implemented */
+	FTDM_BREAK, /*!< Request the caller to perform a break (context-dependant, ie: stop getting DNIS/ANI) */
+	FTDM_EINVAL /*!< Invalid argument */
+} ftdm_status_t;
+
+/*! \brief FreeTDM bool type. */
+typedef enum {
+	FTDM_FALSE,
+	FTDM_TRUE
+} ftdm_bool_t;
+
 /*! 
  * \brief FreeTDM channel.
  *        This is the basic data structure used to place calls and I/O operations
diff --git a/libs/freetdm/src/include/private/ftdm_call_utils.h b/libs/freetdm/src/include/private/ftdm_call_utils.h
deleted file mode 100644
index 782abde927..0000000000
--- a/libs/freetdm/src/include/private/ftdm_call_utils.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2010, Sangoma Technologies
- * David Yat Sin <dyatsin@sangoma.com>
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 
- * * Neither the name of the original author; nor the names of any contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- * 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __FTDM_CALL_UTILS_H__
-#define __FTDM_CALL_UTILS_H__
-
-#include "freetdm.h"
-
-FT_DECLARE(ftdm_status_t) ftdm_span_set_npi(const char *npi_string, uint8_t *target);
-FT_DECLARE(ftdm_status_t) ftdm_span_set_ton(const char *ton_string, uint8_t *target);
-FT_DECLARE(ftdm_status_t) ftdm_span_set_bearer_capability(const char *bc_string, ftdm_bearer_cap_t *target);
-FT_DECLARE(ftdm_status_t) ftdm_span_set_bearer_layer1(const char *bc_string, ftdm_user_layer1_prot_t *target);
-FT_DECLARE(ftdm_status_t) ftdm_is_number(char *number);
-
-#endif /* __FTDM_CALL_UTILS_H__ */
-
diff --git a/libs/freetdm/src/include/private/ftdm_core.h b/libs/freetdm/src/include/private/ftdm_core.h
index ab20ef8171..deabafd537 100644
--- a/libs/freetdm/src/include/private/ftdm_core.h
+++ b/libs/freetdm/src/include/private/ftdm_core.h
@@ -222,8 +222,7 @@ extern "C" {
 
 #define ftdm_is_dtmf(key)  ((key > 47 && key < 58) || (key > 64 && key < 69) || (key > 96 && key < 101) || key == 35 || key == 42 || key == 87 || key == 119)
 
-#define FTDM_SPAN_IS_BRI(x)     ((x)->trunk_type == FTDM_TRUNK_BRI || (x)->trunk_type == FTDM_TRUNK_BRI_PTMP)
-
+#define FTDM_SPAN_IS_BRI(x)	((x)->trunk_type == FTDM_TRUNK_BRI || (x)->trunk_type == FTDM_TRUNK_BRI_PTMP)
 /*!
   \brief Copy flags from one arbitrary object to another
   \command dest the object to copy the flags to
@@ -343,20 +342,24 @@ typedef enum {
 	FTDM_TYPE_CHANNEL
 } ftdm_data_type_t;
 
-#ifdef FTDM_DEBUG_DTMF
-/* number of bytes for the circular buffer (5 seconds worth of audio) */
-#define DTMF_DEBUG_SIZE 8 * 5000
-/* number of 20ms cycles before timeout and close the debug dtmf file (5 seconds) */
-#define DTMF_DEBUG_TIMEOUT 250
+/* number of bytes for the IO dump circular buffer (5 seconds worth of audio by default) */
+#define FTDM_IO_DUMP_DEFAULT_BUFF_SIZE 8 * 5000
 typedef struct {
-	FILE *file;
-	char buffer[DTMF_DEBUG_SIZE];
+	char *buffer;
+	ftdm_size_t size;
 	int windex;
 	int wrapped;
-	int closetimeout;
+} ftdm_io_dump_t;
+
+/* number of interval cycles before timeout and close the debug dtmf file (5 seconds if interval is 20) */
+#define DTMF_DEBUG_TIMEOUT 250
+typedef struct {
+	uint8_t enabled;
+	uint8_t requested;
+	FILE *file;
+	int32_t closetimeout;
 	ftdm_mutex_t *mutex;
 } ftdm_dtmf_debug_t;
-#endif
 
 typedef struct {
 	const char *file;
@@ -367,6 +370,35 @@ typedef struct {
 	ftdm_time_t time;
 } ftdm_channel_history_entry_t;
 
+typedef enum {
+	FTDM_IOSTATS_ERROR_CRC		= (1 << 0),
+	FTDM_IOSTATS_ERROR_FRAME	= (1 << 1),
+	FTDM_IOSTATS_ERROR_ABORT 	= (1 << 2),
+	FTDM_IOSTATS_ERROR_FIFO 	= (1 << 3),
+	FTDM_IOSTATS_ERROR_DMA		= (1 << 4),
+	FTDM_IOSTATS_ERROR_QUEUE_THRES	= (1 << 5), /* Queue reached high threshold */
+	FTDM_IOSTATS_ERROR_QUEUE_FULL	= (1 << 6), /* Queue is full */
+} ftdm_iostats_error_type_t;
+
+typedef struct {
+	struct {
+		uint32_t errors;
+		uint16_t flags;
+		uint8_t	 queue_size;	/* max queue size configured */
+		uint8_t	 queue_len;	/* Current number of elements in queue */
+		uint64_t packets;
+	} rx;
+
+	struct {
+		uint32_t errors;
+		uint16_t flags;
+		uint8_t  idle_packets;
+		uint8_t	 queue_size;	/* max queue size configured */
+		uint8_t	 queue_len;	/* Current number of elements in queue */
+		uint64_t packets;
+	} tx;
+} ftdm_channel_iostats_t;
+
 /* 2^8 table size, one for each byte (sample) value */
 #define FTDM_GAINS_TABLE_SIZE 256
 struct ftdm_channel {
@@ -441,9 +473,12 @@ struct ftdm_channel {
 	int availability_rate;
 	void *user_private;
 	ftdm_timer_id_t hangup_timer;
-#ifdef FTDM_DEBUG_DTMF
+	ftdm_channel_iostats_t iostats;
 	ftdm_dtmf_debug_t dtmfdbg;
-#endif
+	ftdm_io_dump_t rxdump;
+	ftdm_io_dump_t txdump;
+	int32_t txdrops;
+	int32_t rxdrops;
 };
 
 struct ftdm_span {
@@ -468,6 +503,7 @@ struct ftdm_span {
 	teletone_multi_tone_t tone_finder[FTDM_TONEMAP_INVALID+1];
 	ftdm_channel_t *channels[FTDM_MAX_CHANNELS_SPAN+1];
 	fio_channel_outgoing_call_t outgoing_call;
+	fio_channel_send_msg_t send_msg;
 	fio_channel_set_sig_status_t set_channel_sig_status;
 	fio_channel_get_sig_status_t get_channel_sig_status;
 	fio_span_set_sig_status_t set_span_sig_status;
@@ -476,6 +512,7 @@ struct ftdm_span {
 	ftdm_span_start_t start;
 	ftdm_span_stop_t stop;
 	ftdm_channel_sig_read_t sig_read;
+	ftdm_channel_sig_write_t sig_write;
 	/* Private I/O data per span. Do not touch unless you are an I/O module */
 	void *io_data;
 	char *type;
@@ -637,10 +674,21 @@ FT_DECLARE(void) ftdm_channel_clear_detected_tones(ftdm_channel_t *ftdmchan);
 
 #define ftdm_channel_lock(chan) ftdm_mutex_lock(chan->mutex)
 #define ftdm_channel_unlock(chan) ftdm_mutex_unlock(chan->mutex)
+
+#define ftdm_log_throttle(level, ...) \
+	time_current_throttle_log = ftdm_current_time_in_ms(); \
+	if (time_current_throttle_log - time_last_throttle_log > FTDM_THROTTLE_LOG_INTERVAL) {\
+		ftdm_log(level, __VA_ARGS__); \
+		time_last_throttle_log = time_current_throttle_log; \
+	} 
+
 #define ftdm_log_chan_ex(fchan, file, func, line, level, format, ...) ftdm_log(file, func, line, level, "[s%dc%d][%d:%d] " format, fchan->span_id, fchan->chan_id, fchan->physical_span_id, fchan->physical_chan_id, __VA_ARGS__)
 #define ftdm_log_chan(fchan, level, format, ...) ftdm_log(level, "[s%dc%d][%d:%d] " format, fchan->span_id, fchan->chan_id, fchan->physical_span_id, fchan->physical_chan_id, __VA_ARGS__)
 #define ftdm_log_chan_msg(fchan, level, msg) ftdm_log(level, "[s%dc%d][%d:%d] " msg, fchan->span_id, fchan->chan_id, fchan->physical_span_id, fchan->physical_chan_id)
 
+#define ftdm_log_chan_throttle(fchan, level, format, ...) ftdm_log_throttle(level, "[s%dc%d][%d:%d] " format, fchan->span_id, fchan->chan_id, fchan->physical_span_id, fchan->physical_chan_id, __VA_ARGS__)
+#define ftdm_log_chan_msg_throttle(fchan, level, format, ...) ftdm_log_throttle(level, "[s%dc%d][%d:%d] " format, fchan->span_id, fchan->chan_id, fchan->physical_span_id, fchan->physical_chan_id, __VA_ARGS__)
+
 #define ftdm_span_lock(span) ftdm_mutex_lock(span->mutex)
 #define ftdm_span_unlock(span) ftdm_mutex_unlock(span->mutex)
 
diff --git a/libs/freetdm/src/include/private/ftdm_types.h b/libs/freetdm/src/include/private/ftdm_types.h
index 78ac8f63eb..313044abc4 100644
--- a/libs/freetdm/src/include/private/ftdm_types.h
+++ b/libs/freetdm/src/include/private/ftdm_types.h
@@ -58,6 +58,7 @@ typedef int ftdm_filehandle_t;
 extern "C" {
 #endif
 
+#define FTDM_COMMAND_OBJ_SIZE *((ftdm_size_t *)obj)
 #define FTDM_COMMAND_OBJ_INT *((int *)obj)
 #define FTDM_COMMAND_OBJ_CHAR_P (char *)obj
 #define FTDM_COMMAND_OBJ_FLOAT *(float *)obj
@@ -181,6 +182,11 @@ typedef enum {
 	 * after having called ftdm_send_span_signal(), which with this flag it will just enqueue the signal
 	 * for later delivery */
 	FTDM_SPAN_USE_SIGNALS_QUEUE = (1 << 10),
+	/* If this flag is set, channel will be moved to proceed state when calls goes to routing */
+	FTDM_SPAN_USE_PROCEED_STATE = (1 << 11),
+	/* If this flag is set, the signalling module supports jumping directly to state up, without
+		going through PROGRESS/PROGRESS_MEDIA */
+	FTDM_SPAN_USE_SKIP_STATES = (1 << 12),
 } ftdm_span_flag_t;
 
 /*! \brief Channel supported features */
@@ -194,6 +200,7 @@ typedef enum {
 	FTDM_CHANNEL_FEATURE_CALLWAITING = (1 << 6), /*!< Channel will allow call waiting (ie: FXS devices) (read/write) */
 	FTDM_CHANNEL_FEATURE_HWEC = (1<<7), /*!< Channel has a hardware echo canceller */
 	FTDM_CHANNEL_FEATURE_HWEC_DISABLED_ON_IDLE  = (1<<8), /*!< hardware echo canceller is disabled when there are no calls on this channel */
+	FTDM_CHANNEL_FEATURE_IO_STATS = (1<<9), /*!< Channel supports IO statistics (HDLC channels only) */
 } ftdm_channel_feature_t;
 
 typedef enum {
@@ -203,6 +210,7 @@ typedef enum {
 	FTDM_CHANNEL_STATE_DIALTONE,
 	FTDM_CHANNEL_STATE_COLLECT,
 	FTDM_CHANNEL_STATE_RING,
+	FTDM_CHANNEL_STATE_RINGING,
 	FTDM_CHANNEL_STATE_BUSY,
 	FTDM_CHANNEL_STATE_ATTN,
 	FTDM_CHANNEL_STATE_GENRING,
@@ -210,6 +218,7 @@ typedef enum {
 	FTDM_CHANNEL_STATE_GET_CALLERID,
 	FTDM_CHANNEL_STATE_CALLWAITING,
 	FTDM_CHANNEL_STATE_RESTART,
+	FTDM_CHANNEL_STATE_PROCEED,
 	FTDM_CHANNEL_STATE_PROGRESS,
 	FTDM_CHANNEL_STATE_PROGRESS_MEDIA,
 	FTDM_CHANNEL_STATE_UP,
@@ -222,8 +231,8 @@ typedef enum {
 	FTDM_CHANNEL_STATE_INVALID
 } ftdm_channel_state_t;
 #define CHANNEL_STATE_STRINGS "DOWN", "HOLD", "SUSPENDED", "DIALTONE", "COLLECT", \
-		"RING", "BUSY", "ATTN", "GENRING", "DIALING", "GET_CALLERID", "CALLWAITING", \
-		"RESTART", "PROGRESS", "PROGRESS_MEDIA", "UP", "IDLE", "TERMINATING", "CANCEL", \
+		"RING", "RINGING", "BUSY", "ATTN", "GENRING", "DIALING", "GET_CALLERID", "CALLWAITING", \
+		"RESTART", "PROCEED", "PROGRESS", "PROGRESS_MEDIA", "UP", "IDLE", "TERMINATING", "CANCEL", \
 		"HANGUP", "HANGUP_COMPLETE", "IN_LOOP", "INVALID"
 FTDM_STR2ENUM_P(ftdm_str2ftdm_channel_state, ftdm_channel_state2str, ftdm_channel_state_t)
 
@@ -258,6 +267,9 @@ typedef enum {
 	FTDM_CHANNEL_IN_ALARM = (1 << 27),
 	FTDM_CHANNEL_SIG_UP = (1 << 28),
 	FTDM_CHANNEL_USER_HANGUP = (1 << 29),
+	FTDM_CHANNEL_RX_DISABLED = (1 << 30),
+	FTDM_CHANNEL_TX_DISABLED = (1 << 31),
+	/* ok, when we reach 32, we need to move to uint64_t all the flag stuff */
 } ftdm_channel_flag_t;
 #if defined(__cplusplus) && defined(WIN32) 
     // fix C2676 
@@ -374,6 +386,7 @@ typedef struct ftdm_fsk_modulator ftdm_fsk_modulator_t;
 typedef ftdm_status_t (*ftdm_span_start_t)(ftdm_span_t *span);
 typedef ftdm_status_t (*ftdm_span_stop_t)(ftdm_span_t *span);
 typedef ftdm_status_t (*ftdm_channel_sig_read_t)(ftdm_channel_t *ftdmchan, void *data, ftdm_size_t size);
+typedef ftdm_status_t (*ftdm_channel_sig_write_t)(ftdm_channel_t *ftdmchan, void *data, ftdm_size_t size);
 
 typedef enum {
 	FTDM_ITERATOR_VARS = 1,
diff --git a/libs/freetdm/src/testanalog.c b/libs/freetdm/src/testanalog.c
index 84d09f73c9..326bb5aec5 100644
--- a/libs/freetdm/src/testanalog.c
+++ b/libs/freetdm/src/testanalog.c
@@ -50,7 +50,7 @@ static FIO_SIGNAL_CB_FUNCTION(on_signal)
 
 	switch(sigmsg->event_id) {
 	case FTDM_SIGEVENT_START:
-		ftdm_channel_call_indicate(sigmsg->channel, FTDM_CHANNEL_INDICATE_RING);
+		ftdm_channel_call_indicate(sigmsg->channel, FTDM_CHANNEL_INDICATE_RINGING);
 		ftdm_log(FTDM_LOG_DEBUG, "launching thread and indicating ring\n");
 		ftdm_thread_create_detached(test_call, sigmsg->channel);
 		break;
diff --git a/libs/freetdm/src/testsangomaboost.c b/libs/freetdm/src/testsangomaboost.c
index 38eac3c190..01e5a6be22 100644
--- a/libs/freetdm/src/testsangomaboost.c
+++ b/libs/freetdm/src/testsangomaboost.c
@@ -45,10 +45,14 @@
 
 #include <signal.h>
 
-#include "freetdm.h"
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#if defined(__linux__) && !defined(__USE_BSD)
+#define __USE_BSD
+#endif
+#include <unistd.h>
+#include "freetdm.h"
 
 
 /* arbitrary limit for max calls in this sample program */
@@ -338,9 +342,9 @@ int main(int argc, char *argv[])
 		exit(-1);
 	}
 
-	if (!strcasecmp(argv[2], "cpe")) {
+	if (!strcmp(argv[2], "cpe")) {
 		sigtype = "pri_cpe";
-	} else if (!strcasecmp(argv[2], "net")) {
+	} else if (!strcmp(argv[2], "net")) {
 		sigtype = "pri_net";
 	} else {
 		fprintf(stderr, "Valid signaling types are cpe and net only\n");
diff --git a/libs/js/nsprpub/pr/src/io/prmwait.c b/libs/js/nsprpub/pr/src/io/prmwait.c
index 1a2e1cd77b..afdcddf215 100644
--- a/libs/js/nsprpub/pr/src/io/prmwait.c
+++ b/libs/js/nsprpub/pr/src/io/prmwait.c
@@ -235,7 +235,7 @@ void _PR_InitMW(void)
      * We use NT 4's InterlockedCompareExchange() to operate
      * on PRMWStatus variables.
      */
-    PR_ASSERT(sizeof(PVOID) == sizeof(PRMWStatus));
+    //PR_ASSERT(sizeof(PVOID) == sizeof(PRMWStatus));
     TimerInit();
 #endif
     mw_lock = PR_NewLock();
diff --git a/libs/js/src/jscpucfg.h b/libs/js/src/jscpucfg.h
index 7b8b2add45..f8b25d1ef7 100644
--- a/libs/js/src/jscpucfg.h
+++ b/libs/js/src/jscpucfg.h
@@ -44,11 +44,62 @@
 
 #if defined(XP_WIN) || defined(XP_OS2) || defined(WINCE)
 
+#if defined(_WIN64)
+
+#if defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_)
+#define IS_LITTLE_ENDIAN 1
+#undef  IS_BIG_ENDIAN
+
+#define JS_BYTES_PER_BYTE   1Ll
+#define JS_BYTES_PER_SHORT  2L
+#define JS_BYTES_PER_INT    4L
+#define JS_BYTES_PER_INT64  8L
+#define JS_BYTES_PER_LONG   4L
+#define JS_BYTES_PER_FLOAT  4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD   8L
+#define JS_BYTES_PER_DWORD  8L
+
+#define JS_BITS_PER_BYTE    8L
+#define JS_BITS_PER_SHORT   16L
+#define JS_BITS_PER_INT     32L
+#define JS_BITS_PER_INT64   64L
+#define JS_BITS_PER_LONG    32L
+#define JS_BITS_PER_FLOAT   32L
+#define JS_BITS_PER_DOUBLE  64L
+#define JS_BITS_PER_WORD    64L
+
+#define JS_BITS_PER_BYTE_LOG2   3L
+#define JS_BITS_PER_SHORT_LOG2  4L
+#define JS_BITS_PER_INT_LOG2    5L
+#define JS_BITS_PER_INT64_LOG2  6L
+#define JS_BITS_PER_LONG_LOG2   5L
+#define JS_BITS_PER_FLOAT_LOG2  5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2   6L
+
+#define JS_ALIGN_OF_SHORT   2L
+#define JS_ALIGN_OF_INT     4L
+#define JS_ALIGN_OF_LONG    4L
+#define JS_ALIGN_OF_INT64   8L
+#define JS_ALIGN_OF_FLOAT   4L
+#define JS_ALIGN_OF_DOUBLE  8L
+#define JS_ALIGN_OF_POINTER 8L
+#define JS_ALIGN_OF_WORD    8L
+
+#define JS_BYTES_PER_WORD_LOG2   3L
+#define JS_BYTES_PER_DWORD_LOG2  3L
+#define PR_WORDS_PER_DWORD_LOG2  0L
+#else  /* !(defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_)) */
+#error "CPU type is unknown"
+#endif /* !(defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_)) */
+
+#elif defined(_WIN32) || defined(XP_OS2) || defined(WINCE)
+
 #ifdef __WATCOMC__
 #define HAVE_VA_LIST_AS_ARRAY
 #endif
 
-#if defined(_WIN32) || defined(XP_OS2) || defined(WINCE)
 #define IS_LITTLE_ENDIAN 1
 #undef  IS_BIG_ENDIAN
 
@@ -95,6 +146,7 @@
 #endif /* _WIN32 || XP_OS2 || WINCE*/
 
 #if defined(_WINDOWS) && !defined(_WIN32) /* WIN16 */
+
 #define IS_LITTLE_ENDIAN 1
 #undef  IS_BIG_ENDIAN
 
@@ -138,6 +190,7 @@
 #define JS_BYTES_PER_WORD_LOG2   2L
 #define JS_BYTES_PER_DWORD_LOG2  3L
 #define PR_WORDS_PER_DWORD_LOG2  1L
+
 #endif /* defined(_WINDOWS) && !defined(_WIN32) */
 
 #elif defined(XP_UNIX) || defined(XP_BEOS)
diff --git a/libs/js/src/jstypes.h b/libs/js/src/jstypes.h
index 0a76d478cf..e5d9544413 100644
--- a/libs/js/src/jstypes.h
+++ b/libs/js/src/jstypes.h
@@ -77,35 +77,25 @@
 **
 ***********************************************************************/
 #ifdef WIN32
+
 /* These also work for __MWERKS__ */
-#define JS_EXTERN_API(__type) extern __declspec(dllexport) __type
-#define JS_EXPORT_API(__type) __declspec(dllexport) __type
-#define JS_EXTERN_DATA(__type) extern __declspec(dllexport) __type
-#define JS_EXPORT_DATA(__type) __declspec(dllexport) __type
+# define JS_EXTERN_API(__type)  extern __declspec(dllexport) __type
+# define JS_EXPORT_API(__type)  __declspec(dllexport) __type
+# define JS_EXTERN_DATA(__type) extern __declspec(dllexport) __type
+# define JS_EXPORT_DATA(__type) __declspec(dllexport) __type
 
-#define JS_DLL_CALLBACK
-#define JS_STATIC_DLL_CALLBACK(__x) static __x
+# define JS_DLL_CALLBACK
+# define JS_STATIC_DLL_CALLBACK(__x)    static __x
 
-#elif defined(WIN16)
+#elif defined(XP_OS2) && defined(__declspec)
 
-#ifdef _WINDLL
-#define JS_EXTERN_API(__type) extern __type _cdecl _export _loadds
-#define JS_EXPORT_API(__type) __type _cdecl _export _loadds
-#define JS_EXTERN_DATA(__type) extern __type _export
-#define JS_EXPORT_DATA(__type) __type _export
+# define JS_EXTERN_API(__type)  extern __declspec(dllexport) __type
+# define JS_EXPORT_API(__type)  __declspec(dllexport) __type
+# define JS_EXTERN_DATA(__type) extern __declspec(dllexport) __type
+# define JS_EXPORT_DATA(__type) __declspec(dllexport) __type
 
-#define JS_DLL_CALLBACK             __cdecl __loadds
-#define JS_STATIC_DLL_CALLBACK(__x) static __x CALLBACK
-
-#else /* this must be .EXE */
-#define JS_EXTERN_API(__type) extern __type _cdecl _export
-#define JS_EXPORT_API(__type) __type _cdecl _export
-#define JS_EXTERN_DATA(__type) extern __type _export
-#define JS_EXPORT_DATA(__type) __type _export
-
-#define JS_DLL_CALLBACK             __cdecl __loadds
-#define JS_STATIC_DLL_CALLBACK(__x) __x JS_DLL_CALLBACK
-#endif /* _WINDLL */
+# define JS_DLL_CALLBACK
+# define JS_STATIC_DLL_CALLBACK(__x)    static __x
 
 #else /* Unix */
 
@@ -126,44 +116,57 @@
 #endif
 
 #ifdef _WIN32
-#  if defined(__MWERKS__) || defined(__GNUC__)
-#    define JS_IMPORT_API(__x)      __x
-#  else
-#    define JS_IMPORT_API(__x)      __declspec(dllimport) __x
-#  endif
+# if defined(__MWERKS__) || defined(__GNUC__)
+#  define JS_IMPORT_API(__x)    __x
+# else
+#  define JS_IMPORT_API(__x)    __declspec(dllimport) __x
+# endif
+#elif defined(XP_OS2) && defined(__declspec)
+# define JS_IMPORT_API(__x)     __declspec(dllimport) __x
 #else
-#    define JS_IMPORT_API(__x)      JS_EXPORT_API (__x)
+# define JS_IMPORT_API(__x)     JS_EXPORT_API (__x)
 #endif
 
 #if defined(_WIN32) && !defined(__MWERKS__)
-#    define JS_IMPORT_DATA(__x)      __declspec(dllimport) __x
+# define JS_IMPORT_DATA(__x)      __declspec(dllimport) __x
+#elif defined(XP_OS2) && defined(__declspec)
+# define JS_IMPORT_DATA(__x)      __declspec(dllimport) __x
 #else
-#    define JS_IMPORT_DATA(__x)     JS_EXPORT_DATA (__x)
+# define JS_IMPORT_DATA(__x)     JS_EXPORT_DATA (__x)
 #endif
 
 /*
  * The linkage of JS API functions differs depending on whether the file is
- * used within the JS library or not.  Any source file within the JS
+ * used within the JS library or not. Any source file within the JS
  * interpreter should define EXPORT_JS_API whereas any client of the library
- * should not.
+ * should not. STATIC_JS_API is used to build JS as a static library.
  */
-#ifdef EXPORT_JS_API
-#define JS_PUBLIC_API(t)    JS_EXPORT_API(t)
-#define JS_PUBLIC_DATA(t)   JS_EXPORT_DATA(t)
+#if defined(STATIC_JS_API)
+
+# define JS_PUBLIC_API(t)   t
+# define JS_PUBLIC_DATA(t)  t
+
+#elif defined(EXPORT_JS_API)
+
+# define JS_PUBLIC_API(t)   JS_EXPORT_API(t)
+# define JS_PUBLIC_DATA(t)  JS_EXPORT_DATA(t)
+
 #else
-#define JS_PUBLIC_API(t)    JS_IMPORT_API(t)
-#define JS_PUBLIC_DATA(t)   JS_IMPORT_DATA(t)
+
+# define JS_PUBLIC_API(t)   JS_IMPORT_API(t)
+# define JS_PUBLIC_DATA(t)  JS_IMPORT_DATA(t)
+
 #endif
 
 #define JS_FRIEND_API(t)    JS_PUBLIC_API(t)
 #define JS_FRIEND_DATA(t)   JS_PUBLIC_DATA(t)
 
-#ifdef _WIN32
-#   define JS_INLINE __inline
+#if defined(_MSC_VER)
+# define JS_INLINE __forceinline
 #elif defined(__GNUC__)
 #   define JS_INLINE
 #else
-#   define JS_INLINE
+# define JS_INLINE
 #endif
 
 /***********************************************************************
@@ -174,7 +177,14 @@
 **      behave syntactically more like functions when called.
 ***********************************************************************/
 #define JS_BEGIN_MACRO  do {
-#define JS_END_MACRO    } while (0)
+
+#if defined(_MSC_VER) && _MSC_VER >= 1400
+# define JS_END_MACRO                                                         \
+    } __pragma(warning(push)) __pragma(warning(disable:4127))                 \
+    while (0) __pragma(warning(pop))
+#else
+# define JS_END_MACRO   } while (0)
+#endif
 
 /***********************************************************************
 ** MACROS:      JS_BEGIN_EXTERN_C
@@ -183,11 +193,15 @@
 **      Macro shorthands for conditional C++ extern block delimiters.
 ***********************************************************************/
 #ifdef __cplusplus
-#define JS_BEGIN_EXTERN_C       extern "C" {
-#define JS_END_EXTERN_C         }
+
+# define JS_BEGIN_EXTERN_C      extern "C" {
+# define JS_END_EXTERN_C        }
+
 #else
-#define JS_BEGIN_EXTERN_C
-#define JS_END_EXTERN_C
+
+# define JS_BEGIN_EXTERN_C
+# define JS_END_EXTERN_C
+
 #endif
 
 /***********************************************************************
@@ -226,12 +240,12 @@
 #define JS_MAX(x,y)     ((x)>(y)?(x):(y))
 
 #if (defined(XP_WIN) && !defined(CROSS_COMPILE)) || defined (WINCE)
-#    include "jscpucfg.h"        /* Use standard Mac or Windows configuration */
+# include "jscpucfg.h"      /* Use standard Mac or Windows configuration */
 #elif defined(XP_UNIX) || defined(XP_BEOS) || defined(XP_OS2) || defined(CROSS_COMPILE)
-#    include "jsautocfg.h"       /* Use auto-detected configuration */
+# include "jsautocfg.h"     /* Use auto-detected configuration */
 #    include "jsosdep.h"         /* ...and platform-specific flags */
 #else
-#    error "Must define one of XP_BEOS, XP_OS2, XP_WIN or XP_UNIX"
+# error "Must define one of XP_BEOS, XP_OS2, XP_WIN or XP_UNIX"
 #endif
 
 JS_BEGIN_EXTERN_C
@@ -247,7 +261,7 @@ JS_BEGIN_EXTERN_C
 typedef unsigned char JSUint8;
 typedef signed char JSInt8;
 #else
-#error No suitable type for JSInt8/JSUint8
+# error No suitable type for JSInt8/JSUint8
 #endif
 
 /************************************************************************
@@ -260,7 +274,7 @@ typedef signed char JSInt8;
 typedef unsigned short JSUint16;
 typedef short JSInt16;
 #else
-#error No suitable type for JSInt16/JSUint16
+# error No suitable type for JSInt16/JSUint16
 #endif
 
 /************************************************************************
@@ -272,15 +286,15 @@ typedef short JSInt16;
 #if JS_BYTES_PER_INT == 4
 typedef unsigned int JSUint32;
 typedef int JSInt32;
-#define JS_INT32(x)  x
-#define JS_UINT32(x) x ## U
+# define JS_INT32(x)    x
+# define JS_UINT32(x)   x ## U
 #elif JS_BYTES_PER_LONG == 4
 typedef unsigned long JSUint32;
 typedef long JSInt32;
-#define JS_INT32(x)  x ## L
-#define JS_UINT32(x) x ## UL
+# define JS_INT32(x)    x ## L
+# define JS_UINT32(x)   x ## UL
 #else
-#error No suitable type for JSInt32/JSUint32
+# error No suitable type for JSInt32/JSUint32
 #endif
 
 /************************************************************************
@@ -294,28 +308,32 @@ typedef long JSInt32;
 **      the JSLL_ macros (see jslong.h).
 ************************************************************************/
 #ifdef JS_HAVE_LONG_LONG
-#if JS_BYTES_PER_LONG == 8
+
+# if JS_BYTES_PER_LONG == 8
 typedef long JSInt64;
 typedef unsigned long JSUint64;
-#elif defined(WIN16)
+# elif defined(WIN16)
 typedef __int64 JSInt64;
 typedef unsigned __int64 JSUint64;
-#elif defined(WIN32) && !defined(__GNUC__)
+# elif defined(WIN32) && !defined(__GNUC__)
 typedef __int64  JSInt64;
 typedef unsigned __int64 JSUint64;
-#else
+# else
 typedef long long JSInt64;
 typedef unsigned long long JSUint64;
-#endif /* JS_BYTES_PER_LONG == 8 */
+# endif /* JS_BYTES_PER_LONG == 8 */
+
 #else  /* !JS_HAVE_LONG_LONG */
+
 typedef struct {
-#ifdef IS_LITTLE_ENDIAN
+# ifdef IS_LITTLE_ENDIAN
     JSUint32 lo, hi;
-#else
+# else
     JSUint32 hi, lo;
 #endif
 } JSInt64;
 typedef JSInt64 JSUint64;
+
 #endif /* !JS_HAVE_LONG_LONG */
 
 /************************************************************************
@@ -331,7 +349,7 @@ typedef JSInt64 JSUint64;
 typedef int JSIntn;
 typedef unsigned int JSUintn;
 #else
-#error 'sizeof(int)' not sufficient for platform use
+# error 'sizeof(int)' not sufficient for platform use
 #endif
 
 /************************************************************************
@@ -362,7 +380,11 @@ typedef ptrdiff_t JSPtrdiff;
 **  A type for pointer difference. Variables of this type are suitable
 **      for storing a pointer or pointer sutraction.
 ************************************************************************/
+#if JS_BYTES_PER_WORD == 8 && JS_BYTES_PER_LONG != 8
+typedef JSUint64 JSUptrdiff;
+#else
 typedef unsigned long JSUptrdiff;
+#endif
 
 /************************************************************************
 ** TYPES:       JSBool
@@ -380,15 +402,20 @@ typedef JSIntn JSBool;
 ** TYPES:       JSPackedBool
 ** DESCRIPTION:
 **  Use JSPackedBool within structs where bitfields are not desireable
-**      but minimum and consistant overhead matters.
+**      but minimum and consistent overhead matters.
 ************************************************************************/
 typedef JSUint8 JSPackedBool;
 
 /*
 ** A JSWord is an integer that is the same size as a void*
 */
+#if JS_BYTES_PER_WORD == 8 && JS_BYTES_PER_LONG != 8
+typedef JSInt64 JSWord;
+typedef JSUint64 JSUword;
+#else
 typedef long JSWord;
 typedef unsigned long JSUword;
+#endif
 
 #include "jsotypes.h"
 
@@ -409,13 +436,37 @@ typedef unsigned long JSUword;
 **
 ***********************************************************************/
 #if defined(__GNUC__) && (__GNUC__ > 2)
-#define JS_LIKELY(x)    (__builtin_expect((x), 1))
-#define JS_UNLIKELY(x)  (__builtin_expect((x), 0))
+
+# define JS_LIKELY(x)   (__builtin_expect((x), 1))
+# define JS_UNLIKELY(x) (__builtin_expect((x), 0))
+
 #else
-#define JS_LIKELY(x)    (x)
-#define JS_UNLIKELY(x)  (x)
+
+# define JS_LIKELY(x)   (x)
+# define JS_UNLIKELY(x) (x)
+
 #endif
 
+/***********************************************************************
+** MACROS:      JS_ARRAY_LENGTH
+**              JS_ARRAY_END
+** DESCRIPTION:
+**      Macros to get the number of elements and the pointer to one past the
+**      last element of a C array. Use them like this:
+**
+**      jschar buf[10], *s;
+**      JSString *str;
+**      ...
+**      for (s = buf; s != JS_ARRAY_END(buf); ++s) *s = ...;
+**      ...
+**      str = JS_NewStringCopyN(cx, buf, JS_ARRAY_LENGTH(buf));
+**      ...
+**
+***********************************************************************/
+
+#define JS_ARRAY_LENGTH(array) (sizeof (array) / sizeof (array)[0])
+#define JS_ARRAY_END(array)    ((array) + JS_ARRAY_LENGTH(array))
+
 JS_END_EXTERN_C
 
 #endif /* jstypes_h___ */
diff --git a/libs/libsndfile/M4/lt~obsolete.m4 b/libs/libsndfile/M4/lt~obsolete.m4
deleted file mode 100644
index c573da90c5..0000000000
--- a/libs/libsndfile/M4/lt~obsolete.m4
+++ /dev/null
@@ -1,98 +0,0 @@
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 5 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else.  This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-
-m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
-m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
-m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
-m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
-m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
-m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
-m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
-m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
-m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
-m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
-m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
-m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
-m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
-m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
-m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
-m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
-m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
-m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
diff --git a/libs/stfu/stfu.c b/libs/stfu/stfu.c
index 7c30ab2ad4..0422cd2081 100644
--- a/libs/stfu/stfu.c
+++ b/libs/stfu/stfu.c
@@ -47,6 +47,7 @@ struct stfu_instance {
 	struct stfu_queue *in_queue;
 	struct stfu_queue *out_queue;
     struct stfu_frame *last_frame;
+	uint32_t cur_ts;
 	uint32_t last_wr_ts;
 	uint32_t last_rd_ts;
 	uint32_t interval;
@@ -267,27 +268,26 @@ static int stfu_n_find_frame(stfu_queue_t *queue, uint32_t ts, stfu_frame_t **r_
 stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i)
 {
 	uint32_t index;
-	uint32_t should_have = 0;
 	stfu_frame_t *rframe = NULL;
-
+    
 	if (((i->out_queue->wr_len == i->out_queue->array_len) || !i->out_queue->array_len)) {
 		return NULL;
 	}
 
-	if (i->last_wr_ts) {
-		should_have = i->last_wr_ts + i->interval;
-	} else {
-		should_have = i->out_queue->array[0].ts;
-	}
+    if (i->cur_ts == 0) {
+		i->cur_ts = i->out_queue->array[0].ts;
+    } else {
+		i->cur_ts += i->interval;
+    }
+    
 
-    if (stfu_n_find_frame(i->out_queue, should_have, &rframe, &index) || stfu_n_find_frame(i->in_queue, should_have, &rframe, &index)) {
+    if (stfu_n_find_frame(i->out_queue, i->cur_ts, &rframe, &index) || stfu_n_find_frame(i->in_queue, i->cur_ts, &rframe, &index)) {
         i->last_frame = rframe;
 		i->out_queue->wr_len++;
 		i->last_wr_ts = rframe->ts;
-		rframe->was_read = 1;
 		i->miss_count = 0;
     } else {
-        i->last_wr_ts = should_have;
+        i->last_wr_ts = i->cur_ts;
         rframe = &i->out_queue->int_frame;
 
         if (i->last_frame && i->last_frame != rframe) {
@@ -296,12 +296,11 @@ stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i)
             memcpy(rframe->data, i->last_frame->data, rframe->dlen);
         }
 
-        rframe->ts = should_have;
+        rframe->ts = i->cur_ts;
 
         if (++i->miss_count > i->max_plc) {
-            i->interval = 0;
             i->out_queue->wr_len = i->out_queue->array_size;
-            i->last_wr_ts = 0;
+            i->cur_ts = 0;
             rframe = NULL;
         }
     }
diff --git a/libs/unimrcp/libs/apr-toolkit/src/apt_consumer_task.c b/libs/unimrcp/libs/apr-toolkit/src/apt_consumer_task.c
index 3b96373a74..ceb9320d98 100644
--- a/libs/unimrcp/libs/apr-toolkit/src/apt_consumer_task.c
+++ b/libs/unimrcp/libs/apr-toolkit/src/apt_consumer_task.c
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <apr_time.h>
 #include <apr_queue.h>
 #include "apt_consumer_task.h"
 #include "apt_log.h"
diff --git a/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.2010.vcxproj b/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.2010.vcxproj
index c6aaba5cd6..b3931497c7 100644
--- a/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.2010.vcxproj
+++ b/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.2010.vcxproj
@@ -127,6 +127,11 @@
     <ClCompile Include="src\mrcp_sofiasip_client_agent.c" />
     <ClCompile Include="src\mrcp_sofiasip_server_agent.c" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\win32\sofia\libsofia_sip_ua_static.2010.vcxproj">
+      <Project>{70a49bc2-7500-41d0-b75d-edcc5be987a0}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/scripts/perl/add_user b/scripts/perl/add_user
new file mode 100755
index 0000000000..d16ebb5efe
--- /dev/null
+++ b/scripts/perl/add_user
@@ -0,0 +1,306 @@
+#!/usr/bin/perl
+#
+# add_user
+#
+# Add one or more users to the XML directory
+#
+#
+
+use strict;
+use warnings;
+use Getopt::Long;
+use Data::Dumper;
+
+## Useful items
+my $path_sep;
+my $config_path;
+my @dir_elem;
+my $user_template = &get_user_template;
+my $new_user_count = 0;
+
+## Command line args
+my $users;
+my $domain;
+my $dirpath;
+my $help;
+
+## Misc items somewhat related to cmd line args
+my $start;
+my $end; 
+my $user;
+
+## Check for Windows vs. *nix
+if ( $^O =~ m/^win/i ) {
+  ## Detected Windows (probably)
+  $path_sep = "\\";  # single backslash (\)
+  use File::Spec::Win32;
+} else {
+  $path_sep = '/';   # single slash (/)
+  use File::Spec;
+}
+
+GetOptions(
+		   'h'           => \$help,
+		   'help'        => \$help,
+		   'domain=s'    => \$domain,
+		   'users=s'     => \$users,
+		   'confpath=s'  => \$config_path,
+);
+
+if ( $help ) { 
+  usage();
+  exit(0);
+}
+
+if ( ! $domain ) {
+  $domain='default';
+}
+
+## Validate users if specified on command line
+if ( $users ) {
+  ($start,$end) = split /-/,$users;
+  if ( ! $start && ! $end ) {
+	die "Please specify both a start and end range, separated by a hyphen:\n add_user --users=xxxx-yyyy\n";
+  }
+
+  unless ( $start =~ m/[1-9]\d+/ ) {
+	die "Start of range '$start' is not numeric or is too short\n";
+  }
+
+  unless ( $end =~ m/[1-9]\d+/ ) {
+	die "End of range '$end' is not numberic or is too short\n";
+  }
+
+  if ( $end <= $start ) {
+	die "End of range needs to be greater than start of range\n";
+  }
+} else {
+  ## Look for user id in $ARGV[0]
+  if ( ! $ARGV[0] ) {
+	die "You must specify user id as a command line argument to add user, or use the --users option.\n";
+  }
+  unless ( $ARGV[0] =~ m/^[1-9]\d+$/ ) {
+	die "User id must be numeric, be at least 2 digits long, and cannot begin with the digit zero.\n"
+  }
+  $user = $ARGV[0];
+}
+
+if ( ! $config_path ) {
+  $config_path = '/usr/local/freeswitch/conf';
+} 
+
+## Check to make sure the directories in question exists
+unless ( -d $config_path ) {
+  die "Configuration path '$config_path' does not exist.\n";
+}
+
+my $directory_path = $config_path . $path_sep . 'directory';
+unless ( -d $directory_path ) {
+  die "Directory path '$directory_path' does not exist.\n";
+}
+
+## Now check domain pathname and test existence
+if ( ! $domain ) {
+  $domain = 'default';
+}
+
+## Full directory path includes the domain name 
+my $full_dir_path = $directory_path . $path_sep . $domain;
+unless ( -d $full_dir_path ) {
+  die "Full path to directory and domain '$full_dir_path' does not exist. \n";
+}
+
+unless ( -w $full_dir_path ) {
+  die "This user does not have write access to '$full_dir_path'.\n";
+}
+print "\n";
+
+## Regexp assemble items to show user what a PCRE might look like for his new users
+my $ra_present;
+my $ra_new;
+my $ra_all;
+eval { require Regexp::Assemble; };
+if ( ! $@ ) {
+  ## If Regexp::Assemble is available flag it for later building regexes
+  $ra_present = 'true';
+  $ra_new = Regexp::Assemble->new(    # new user regex
+								  reduce => 1,
+								  flags  => 0,
+);  
+  $ra_all = Regexp::Assemble->new(    # all users regex w/ new users thrown in
+								  reduce => 1,
+								  flags  => 0,
+);
+}
+
+## If we're this far then we can read in the existing users and put them in a hash
+##  Later we can check hash to avoid adding duplicate users
+my %current_users;
+my @CURRENT_USER_FILES = glob($full_dir_path . $path_sep . '*.xml');
+foreach ( @CURRENT_USER_FILES ) {
+  #print "User: $_\n";
+  open(FILEIN,'<',$_);
+  while(<FILEIN>) {
+	next unless  m/user id|number-alias/;
+	m/user id="(\d+)"/;
+	my $user_id = $1;
+	if ( ! $user_id ) {
+	  m/alias="(\d+)"/;
+	  $user_id = $1;
+	}
+
+	next unless $user_id;
+	$current_users{$user_id}++;
+
+	if ( $ra_present && $user_id =~ m/^\d+$/ ) {
+	  #print "Adding $user_id to \$re_all...\n";
+	  $ra_all->add($user_id)->anchor_line_begin->anchor_line_end;
+	}
+	last;
+  }
+  close(FILEIN);
+}
+
+#print Dumper(%current_users) . "\n";
+if ( $start && $end ) {
+  ## Add range of users
+  foreach $user ($start .. $end) {
+	&add_user($user);
+  }
+} else {
+  ## Add single user
+  &add_user($user);
+}
+
+print "\nOperation complete. ";
+if ( $new_user_count == 0 ) {
+  print "No users added.\n";
+  exit(0);
+} else {
+  printf "%d user%s added.\n", $new_user_count, $new_user_count==1 ? "" : "s";
+  print "Be sure to reloadxml.\n\n";
+}
+
+if ( $ra_present ) {
+  print "Regular expression information:\n\n";
+  ## Regexp::Assemble adds some stuff we really don't need
+  ## These lines just make the regexp pattern a bit more readable
+  my $tmp = $ra_new->as_string;
+  $tmp =~ s/\?://g;
+  $tmp =~ s/^\(\?\-xism:\^/^(/;
+  $tmp =~ s/\$\)$/)\$/;
+  $tmp =~ s/\\d/[0-9]/g;  # [0-9] is sometimes easier to read than \d
+  print "            Sample regex for all new users: " . $tmp . "\n";
+  $tmp = $ra_all->as_string;
+  $tmp =~ s/\?://g;
+  $tmp =~ s/^\(\?\-xism:\^/^(/;
+  $tmp =~ s/\$\)$/)\$/;
+  $tmp =~ s/\\d/[0-9]/g;  # [0-9] is sometimes easier to read than \d
+  print "Sample regex for all new AND current users: " . $tmp . "\n\n";
+  print "In the default configuration you can modify the expression in the condition for 'Local_Extension'.\n";
+  print ""
+} else {
+  print "If CPAN module Regexp::Assemble were installed this program would be able to suggest a regex for your new users.\n"
+}
+
+exit(0);
+
+sub add_user {
+  my $user_id = shift;
+  if ( exists( $current_users{$user_id} ) ) {
+	warn "User id $user_id already exists, skipping...\n";
+  } else {
+	my $new_user = $user_template;
+	$new_user =~ s/__USERID__/$user_id/g;
+	#print "Adding user id '$user_id' with this XML:\n";
+	#print $new_user . "\n";
+
+	## Attempt to create the user file
+	my $user_file_name = $full_dir_path . $path_sep . $user_id . '.xml';
+
+	## Does it already exist?
+	if ( -f $user_file_name ) {
+	  warn "$user_file_name exists, skipping...\n";
+	}
+	my $fh;
+	open($fh,'>',$user_file_name);
+	if ( ! $fh ) {
+	  warn "Unable to open '$user_file_name' - $!\n";
+	  warn "Skipping...\n";
+	  next;
+	}
+
+	print $fh $new_user;
+	close($fh);
+	print "Added $user_id in file $user_file_name \n";
+	$new_user_count++;
+	if ( $ra_present ) {
+	  $ra_new->add($user_id)->anchor_line_begin->anchor_line_end;
+	  $ra_all->add($user_id)->anchor_line_begin->anchor_line_end;
+	}
+  }
+
+}
+
+sub get_user_template {
+  my $templ = <<ENDUSERTEMPLATE;
+<include>
+  <user id="__USERID__">
+    <params>
+      <param name="password" value="\$\${default_password}"/>
+      <param name="vm-password" value="__USERID__"/>
+    </params>
+    <variables>
+      <variable name="toll_allow" value="domestic,international,local"/>
+      <variable name="accountcode" value="__USERID__"/>
+      <variable name="user_context" value="default"/>
+      <variable name="effective_caller_id_name" value="Extension __USERID__"/>
+      <variable name="effective_caller_id_number" value="__USERID__"/>
+      <variable name="outbound_caller_id_name" value="\$\${outbound_caller_name}"/>
+      <variable name="outbound_caller_id_number" value="\$\${outbound_caller_id}"/>
+      <variable name="callgroup" value="techsupport"/>
+    </variables>
+  </user>
+</include>
+
+ENDUSERTEMPLATE
+
+  return $templ;
+}
+
+sub usage {
+  print <<ENDUSAGE;
+
+            FreeSWITCH add user utility
+
+Adds one or more users to the FreeSWITCH directory using XML files.
+
+
+ Syntax:
+
+ add_user <user_id> [--domain=<domain_name>] [--confpath=<configuration_path>]
+ add_user --users=<start_user_id>-<end_user_id> [--domain=<domain_name>] [--confpath=<configuration_path>]
+
+In its simplest form, add_user will simply add the user_id specified at the command line.
+By default, users are added to the "default" domain. Use the --domain option to specify
+a different domain for the user(s) that are added.
+
+To specify a range of user IDs use the --users option. Separate the beginning and
+end of the range with a hyphen (-) character.
+
+By default add_user will look for the XML directory in its default location of
+/usr/local/freeswitch/conf/directory. Use the --confpath (configuration path)
+option to specify an alternate directory location.
+
+
+ NOTES: 
+
+add_user assumes
+User IDs must be numeric and cannot begin with zero.
+User IDs must be at least two digits long and have no specific length limit.
+If a user ID exists it will be skipped.
+If a domain specified does not exist no users will be created.
+
+ENDUSAGE
+
+}
diff --git a/scripts/perl/blacklist.pl b/scripts/perl/blacklist.pl
index f434669f36..a2834b62bf 100755
--- a/scripts/perl/blacklist.pl
+++ b/scripts/perl/blacklist.pl
@@ -17,13 +17,17 @@ my @netblocks = split(/\n/, get("http://www.infiltrated.net/voipabuse/netblocks.
 
 print "<list name=\"voip-abuse-addresses\" default=\"deny\">\n";
 foreach $addr (@addresses) {
-  print "  <node type=\"allow\" cidr=\"$addr/32\"/>\n";
+    $addr =~ s/\s//g;                            # strip whitespace
+    next unless $addr =~ m/\d+\.\d+\.\d+\.\d+/;  # imperfect but useful IP addr check 
+    print "  <node type=\"allow\" cidr=\"$addr/32\"/>\n";
 }
 print "</list>\n";
 
 
 print "<list name=\"voip-abuse-netblocks\" default=\"deny\">\n";
 foreach $netb (@netblocks) {
-  print "  <node type=\"allow\" cidr=\"$netb\"/>\n";
+    $netb =~ s/\s//g;                            # strip whitespace
+    next unless $netb =~ m/\d+\.\d+\.\d+\.\d+/;  # imperfect but useful IP addr check
+    print "  <node type=\"allow\" cidr=\"$netb\"/>\n";
 }
 print "</list>\n";
diff --git a/src/include/private/switch_core_pvt.h b/src/include/private/switch_core_pvt.h
index 3df9001b0c..13410a00ae 100644
--- a/src/include/private/switch_core_pvt.h
+++ b/src/include/private/switch_core_pvt.h
@@ -135,6 +135,7 @@ struct switch_core_session {
 	switch_mutex_t *frame_read_mutex;
 
 	switch_thread_rwlock_t *rwlock;
+	switch_thread_rwlock_t *io_rwlock;
 
 	void *streams[SWITCH_MAX_STREAMS];
 	int stream_count;
diff --git a/src/include/switch_apr.h b/src/include/switch_apr.h
index b049c05d40..8a4928d14a 100644
--- a/src/include/switch_apr.h
+++ b/src/include/switch_apr.h
@@ -592,6 +592,22 @@ SWITCH_DECLARE(switch_status_t) switch_queue_create(switch_queue_t ** queue, uns
  */
 SWITCH_DECLARE(switch_status_t) switch_queue_pop(switch_queue_t *queue, void **data);
 
+/**
+ * pop/get an object from the queue, blocking if the queue is already empty
+ *
+ * @param queue the queue
+ * @param data the data
+ * @param timeout The amount of time in microseconds to wait. This is
+ *        a maximum, not a minimum. If the condition is signaled, we
+ *        will wake up before this time, otherwise the error APR_TIMEUP
+ *        is returned.
+ * @returns APR_TIMEUP the request timed out
+ * @returns APR_EINTR the blocking was interrupted (try again)
+ * @returns APR_EOF if the queue has been terminated
+ * @returns APR_SUCCESS on a successfull pop
+ */
+SWITCH_DECLARE(switch_status_t) switch_queue_pop_timeout(switch_queue_t *queue, void **data, switch_interval_time_t timeout);
+
 /**
  * push/add a object to the queue, blocking if the queue is already full
  *
diff --git a/src/include/switch_channel.h b/src/include/switch_channel.h
index a1f13edd85..d6bce5e8bf 100644
--- a/src/include/switch_channel.h
+++ b/src/include/switch_channel.h
@@ -179,8 +179,8 @@ SWITCH_DECLARE(void) switch_channel_uninit(switch_channel_t *channel);
 SWITCH_DECLARE(void) switch_channel_set_caller_profile(switch_channel_t *channel, switch_caller_profile_t *caller_profile);
 
 /*!
-  \brief Retrive the given channel's caller profile
-  \param channel channel to retrive the profile from
+  \brief Retrieve the given channel's caller profile
+  \param channel channel to retrieve the profile from
   \return the requested profile
 */
 SWITCH_DECLARE(switch_caller_profile_t *) switch_channel_get_caller_profile(switch_channel_t *channel);
@@ -195,8 +195,8 @@ SWITCH_DECLARE(void) switch_channel_set_originator_caller_profile(switch_channel
 SWITCH_DECLARE(void) switch_channel_set_hunt_caller_profile(switch_channel_t *channel, switch_caller_profile_t *caller_profile);
 
 /*!
-  \brief Retrive the given channel's originator caller profile
-  \param channel channel to retrive the profile from
+  \brief Retrieve the given channel's originator caller profile
+  \param channel channel to retrieve the profile from
   \return the requested profile
 */
 SWITCH_DECLARE(switch_caller_profile_t *) switch_channel_get_originator_caller_profile(switch_channel_t *channel);
@@ -209,8 +209,8 @@ SWITCH_DECLARE(switch_caller_profile_t *) switch_channel_get_originator_caller_p
 SWITCH_DECLARE(void) switch_channel_set_originatee_caller_profile(switch_channel_t *channel, switch_caller_profile_t *caller_profile);
 
 /*!
-  \brief Retrive the given channel's originatee caller profile
-  \param channel channel to retrive the profile from
+  \brief Retrieve the given channel's originatee caller profile
+  \param channel channel to retrieve the profile from
   \return the requested profile
 */
 SWITCH_DECLARE(switch_caller_profile_t *) switch_channel_get_originatee_caller_profile(switch_channel_t *channel);
@@ -223,16 +223,16 @@ SWITCH_DECLARE(switch_caller_profile_t *) switch_channel_get_originatee_caller_p
 SWITCH_DECLARE(void) switch_channel_set_origination_caller_profile(switch_channel_t *channel, switch_caller_profile_t *caller_profile);
 
 /*!
-  \brief Retrive the given channel's origination caller profile
-  \param channel channel to retrive the profile from
+  \brief Retrieve the given channel's origination caller profile
+  \param channel channel to retrieve the profile from
   \return the requested profile
 */
 SWITCH_DECLARE(switch_caller_profile_t *) switch_channel_get_origination_caller_profile(switch_channel_t *channel);
 
 
 /*!
-  \brief Retrive the given channel's unique id
-  \param channel channel to retrive the unique id from
+  \brief Retrieve the given channel's unique id
+  \param channel channel to retrieve the unique id from
   \return the unique id
 */
 SWITCH_DECLARE(char *) switch_channel_get_uuid(switch_channel_t *channel);
@@ -241,7 +241,7 @@ SWITCH_DECLARE(char *) switch_channel_get_uuid(switch_channel_t *channel);
   \brief Set a variable on a given channel
   \param channel channel to set variable on
   \param varname the name of the variable
-  \param value the vaule of the variable
+  \param value the value of the variable
   \returns SWITCH_STATUS_SUCCESS if successful
 */
 
diff --git a/src/include/switch_core.h b/src/include/switch_core.h
index 3f636d00c4..840a06c204 100644
--- a/src/include/switch_core.h
+++ b/src/include/switch_core.h
@@ -354,6 +354,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_destroy(void);
 ///\ingroup core1
 ///\{
 
+
+SWITCH_DECLARE(switch_status_t) switch_core_session_io_read_lock(switch_core_session_t *session);
+SWITCH_DECLARE(switch_status_t) switch_core_session_io_write_lock(switch_core_session_t *session);
+SWITCH_DECLARE(switch_status_t) switch_core_session_io_rwunlock(switch_core_session_t *session);
+
 #ifdef SWITCH_DEBUG_RWLOCKS
 SWITCH_DECLARE(switch_status_t) switch_core_session_perform_read_lock(_In_ switch_core_session_t *session, const char *file, const char *func, int line);
 #endif
@@ -882,6 +887,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_exec(_In_ switch_core_sessio
 SWITCH_DECLARE(switch_status_t) switch_core_session_execute_application_get_flags(_In_ switch_core_session_t *session,
 																				  _In_ const char *app, _In_opt_z_ const char *arg, _Out_opt_ int32_t *flags);
 
+SWITCH_DECLARE(switch_status_t) switch_core_session_execute_application_async(switch_core_session_t *session, const char *app, const char *arg);
+
 SWITCH_DECLARE(switch_status_t) switch_core_session_get_app_flags(const char *app, int32_t *flags);
 
 /*! 
@@ -1024,6 +1031,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_queue_event(_In_ switch_core
 */
 SWITCH_DECLARE(uint32_t) switch_core_session_event_count(_In_ switch_core_session_t *session);
 
+/*
+  Number of parsable messages waiting on the session. 
+ */
+SWITCH_DECLARE(uint32_t) switch_core_session_messages_waiting(switch_core_session_t *session);
+
 /*! 
   \brief DE-Queue an event on a given session
   \param session the session to de-queue the message on
diff --git a/src/include/switch_ivr.h b/src/include/switch_ivr.h
index 249ac63a58..da366c5b8d 100644
--- a/src/include/switch_ivr.h
+++ b/src/include/switch_ivr.h
@@ -874,6 +874,12 @@ SWITCH_DECLARE(void) switch_ivr_dmachine_set_input_timeout_ms(switch_ivr_dmachin
 SWITCH_DECLARE(switch_status_t) switch_ivr_dmachine_clear_realm(switch_ivr_dmachine_t *dmachine, const char *realm);
 SWITCH_DECLARE(switch_status_t) switch_ivr_dmachine_set_realm(switch_ivr_dmachine_t *dmachine, const char *realm);
 
+
+SWITCH_DECLARE(switch_status_t) switch_ivr_get_file_handle(switch_core_session_t *session, switch_file_handle_t **fh);
+SWITCH_DECLARE(switch_status_t) switch_ivr_release_file_handle(switch_core_session_t *session, switch_file_handle_t **fh);
+SWITCH_DECLARE(switch_status_t) switch_ivr_process_fh(switch_core_session_t *session, const char *cmd, switch_file_handle_t *fhp);
+SWITCH_DECLARE(switch_status_t) switch_ivr_insert_file(switch_core_session_t *session, const char *file, const char *insert_file, switch_size_t sample_point);
+
 /** @} */
 
 SWITCH_END_EXTERN_C
diff --git a/src/mod/.gitignore b/src/mod/.gitignore
index 47cdbafa70..b6e7842a50 100644
--- a/src/mod/.gitignore
+++ b/src/mod/.gitignore
@@ -7,6 +7,7 @@
 /applications/mod_spandsp/mod_spandsp.log
 /applications/mod_commands/Makefile
 /applications/mod_conference/Makefile
+/applications/mod_db/Makefile
 /applications/mod_dptools/Makefile
 /applications/mod_enum/Makefile
 /applications/mod_enum/Makefile.in
diff --git a/src/mod/applications/mod_callcenter/mod_callcenter.c b/src/mod/applications/mod_callcenter/mod_callcenter.c
index 1b0ba1331a..ca92b17fa4 100644
--- a/src/mod/applications/mod_callcenter/mod_callcenter.c
+++ b/src/mod/applications/mod_callcenter/mod_callcenter.c
@@ -1346,6 +1346,7 @@ static void *SWITCH_THREAD_FUNC outbound_agent_thread_run(switch_thread_t *threa
 	switch_time_t t_agent_called = 0;
 	switch_time_t t_agent_answered = 0;
 	switch_time_t t_member_called = atoi(h->member_joined_epoch);
+	switch_event_t *event = NULL;
 
 	switch_mutex_lock(globals.mutex);
 	globals.threads++;
@@ -1360,6 +1361,21 @@ static void *SWITCH_THREAD_FUNC outbound_agent_thread_run(switch_thread_t *threa
 		switch_safe_free(sql);
 		goto done;
 	}
+
+	/* Proceed contact the agent to offer the member */
+	if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CALLCENTER_EVENT) == SWITCH_STATUS_SUCCESS) {
+		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "CC-Queue", h->queue_name);
+		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "CC-Action", "agent-offering");
+		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "CC-Agent", h->agent_name);
+		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "CC-Agent-Type", h->agent_type);
+		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "CC-Agent-System", h->agent_system);
+		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "CC-Caller-UUID", h->member_uuid);
+		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "CC-Caller-CID-Name", h->member_caller_name);
+		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "CC-Caller-CID-Number", h->member_caller_number);
+		switch_event_fire(&event);
+	}
+
+	/* CallBack Mode */
 	if (!strcasecmp(h->agent_type, CC_AGENT_TYPE_CALLBACK)) {
 		switch_event_create(&ovars, SWITCH_EVENT_REQUEST_PARAMS);
 		switch_event_add_header(ovars, SWITCH_STACK_BOTTOM, "cc_queue", "%s", h->queue_name);
@@ -1375,6 +1391,7 @@ static void *SWITCH_THREAD_FUNC outbound_agent_thread_run(switch_thread_t *threa
 		switch_safe_free(dialstr);
 
 		switch_event_destroy(&ovars);
+	/* UUID Standby Mode */
 	} else if (!strcasecmp(h->agent_type, CC_AGENT_TYPE_UUID_STANDBY)) {
 		agent_session = switch_core_session_locate(h->agent_uuid);
 		if (agent_session) {
@@ -1400,14 +1417,17 @@ static void *SWITCH_THREAD_FUNC outbound_agent_thread_run(switch_thread_t *threa
 			cc_agent_update("status", cc_agent_status2str(CC_AGENT_STATUS_LOGGED_OUT), h->agent_name);
 			cc_agent_update("uuid", "", h->agent_name);
 		}
+	} else {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Invalid agent type '%s' for agent '%s', aborting member offering", h->agent_type, h->agent_name);
+		status = SWITCH_CAUSE_USER_NOT_REGISTERED;
 	}
 
+	/* Originate/Bridge is not finished, processing the return value */
 	if (status == SWITCH_STATUS_SUCCESS) {
 		/* Agent Answered */
 		const char *agent_uuid = switch_core_session_get_uuid(agent_session);
 		switch_channel_t *member_channel = switch_core_session_get_channel(member_session);
 		switch_channel_t *agent_channel = switch_core_session_get_channel(agent_session);
-		switch_event_t *event;
 
 		switch_channel_set_variable(agent_channel, "cc_member_pre_answer_uuid", NULL);
 
diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
index 40ec1ee2f6..a99c884529 100644
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@ -2491,24 +2491,47 @@ SWITCH_STANDARD_API(uuid_display_function)
 #define SIMPLIFY_SYNTAX "<uuid>"
 SWITCH_STANDARD_API(uuid_simplify_function)
 {
+	char *mydata = NULL, *argv[2] = { 0 };
+	int argc = 0;
+
 	switch_status_t status = SWITCH_STATUS_FALSE;
 
 	if (zstr(cmd)) {
-		stream->write_function(stream, "-USAGE: %s\n", SIMPLIFY_SYNTAX);
-	} else {
+		goto error;
+	}
+
+	mydata = strdup(cmd);
+	switch_assert(mydata);
+
+	argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
+
+	if (argc < 1) {
+		goto error;
+	}
+	if (argv[0]) {
 		switch_core_session_message_t msg = { 0 };
 		switch_core_session_t *lsession = NULL;
 
 		msg.message_id = SWITCH_MESSAGE_INDICATE_SIMPLIFY;
-		msg.string_arg = cmd;
+		msg.string_arg = argv[0];
 		msg.from = __FILE__;
 
-		if ((lsession = switch_core_session_locate(cmd))) {
+		if ((lsession = switch_core_session_locate(argv[0]))) {
 			status = switch_core_session_receive_message(lsession, &msg);
 			switch_core_session_rwunlock(lsession);
 		}
+		goto ok;
+	} else {
+		goto error;
 	}
 
+  error:
+	stream->write_function(stream, "-USAGE: %s\n", SIMPLIFY_SYNTAX);
+	switch_safe_free(mydata);
+	return SWITCH_STATUS_SUCCESS;
+  ok:
+	switch_safe_free(mydata);
+
 	if (status == SWITCH_STATUS_SUCCESS) {
 		stream->write_function(stream, "+OK Success\n");
 	} else {
@@ -3968,6 +3991,47 @@ SWITCH_STANDARD_API(uuid_getvar_function)
 	return SWITCH_STATUS_SUCCESS;
 }
 
+
+#define FILEMAN_SYNTAX "<uuid> <cmd>:<val>"
+SWITCH_STANDARD_API(uuid_fileman_function)
+{
+	switch_core_session_t *psession = NULL;
+	char *mycmd = NULL, *argv[4] = { 0 };
+	int argc = 0;
+
+	if (!zstr(cmd) && (mycmd = strdup(cmd))) {
+		argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
+		if (argc >= 2 && !zstr(argv[0])) {
+			char *uuid = argv[0];
+			char *cmd = argv[1];
+
+			if ((psession = switch_core_session_locate(uuid))) {
+				switch_channel_t *channel;
+				switch_file_handle_t *fh = NULL;
+				
+				channel = switch_core_session_get_channel(psession);
+				
+				if (switch_ivr_get_file_handle(psession, &fh) == SWITCH_STATUS_SUCCESS) {
+					switch_ivr_process_fh(psession, cmd, fh);
+					switch_ivr_release_file_handle(psession, &fh);
+				}
+
+				switch_core_session_rwunlock(psession);
+
+			} else {
+				stream->write_function(stream, "-ERR No Such Channel!\n");
+			}
+			goto done;
+		}
+	}
+
+	stream->write_function(stream, "-USAGE: %s\n", GETVAR_SYNTAX);
+
+  done:
+	switch_safe_free(mycmd);
+	return SWITCH_STATUS_SUCCESS;
+}
+
 #define UUID_SEND_DTMF_SYNTAX "<uuid> <dtmf_data>"
 SWITCH_STANDARD_API(uuid_send_dtmf_function)
 {
@@ -4674,6 +4738,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_commands_load)
 	SWITCH_ADD_API(commands_api_interface, "uuid_display", "change display", uuid_display_function, DISPLAY_SYNTAX);
 	SWITCH_ADD_API(commands_api_interface, "uuid_dump", "uuid_dump", uuid_dump_function, DUMP_SYNTAX);
 	SWITCH_ADD_API(commands_api_interface, "uuid_exists", "see if a uuid exists", uuid_exists_function, EXISTS_SYNTAX);
+	SWITCH_ADD_API(commands_api_interface, "uuid_fileman", "uuid_fileman", uuid_fileman_function, FILEMAN_SYNTAX);
 	SWITCH_ADD_API(commands_api_interface, "uuid_flush_dtmf", "Flush dtmf on a given uuid", uuid_flush_dtmf_function, "<uuid>");
 	SWITCH_ADD_API(commands_api_interface, "uuid_getvar", "uuid_getvar", uuid_getvar_function, GETVAR_SYNTAX);
 	SWITCH_ADD_API(commands_api_interface, "uuid_hold", "hold", uuid_hold_function, HOLD_SYNTAX);
@@ -4785,6 +4850,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_commands_load)
 	switch_console_set_complete("add uuid_display ::console::list_uuid");
 	switch_console_set_complete("add uuid_dump ::console::list_uuid");
 	switch_console_set_complete("add uuid_exists ::console::list_uuid");
+	switch_console_set_complete("add uuid_fileman ::console::list_uuid");
 	switch_console_set_complete("add uuid_flush_dtmf ::console::list_uuid");
 	switch_console_set_complete("add uuid_getvar ::console::list_uuid");
 	switch_console_set_complete("add uuid_hold ::console::list_uuid");
@@ -4810,6 +4876,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_commands_load)
 	switch_console_set_complete("add uuid_session_heartbeat ::console::list_uuid");
 	switch_console_set_complete("add uuid_setvar_multi ::console::list_uuid");
 	switch_console_set_complete("add uuid_setvar ::console::list_uuid");
+	switch_console_set_complete("add uuid_simplify ::console::list_uuid");
 	switch_console_set_complete("add uuid_transfer ::console::list_uuid");
 	switch_console_set_complete("add uuid_dual_transfer ::console::list_uuid");
 	switch_console_set_complete("add version");
diff --git a/src/mod/applications/mod_hash/mod_hash.c b/src/mod/applications/mod_hash/mod_hash.c
index 29a056104f..2609b6cb87 100644
--- a/src/mod/applications/mod_hash/mod_hash.c
+++ b/src/mod/applications/mod_hash/mod_hash.c
@@ -130,7 +130,7 @@ SWITCH_LIMIT_INCR(limit_incr_hash)
 {
 	switch_channel_t *channel = switch_core_session_get_channel(session);
 	char *hashkey = NULL;
-	switch_bool_t status = SWITCH_STATUS_SUCCESS;
+	switch_status_t status = SWITCH_STATUS_SUCCESS;
 	limit_hash_item_t *item = NULL;
 	time_t now = switch_epoch_time_now(NULL);
 	limit_hash_private_t *pvt = NULL;
diff --git a/src/mod/applications/mod_lcr/mod_lcr.c b/src/mod/applications/mod_lcr/mod_lcr.c
index cc93707367..5f70e0ab77 100644
--- a/src/mod/applications/mod_lcr/mod_lcr.c
+++ b/src/mod/applications/mod_lcr/mod_lcr.c
@@ -1387,7 +1387,6 @@ SWITCH_STANDARD_DIALPLAN(lcr_dialplan_hunt)
 	switch_channel_t *channel = switch_core_session_get_channel(session);
 	callback_t routes = { 0 };
 	lcr_route cur_route = { 0 };
-	char *lcr_profile = NULL;
 	switch_memory_pool_t *pool = NULL;
 	switch_event_t *event = NULL;
 	const char *intrastate = NULL;
@@ -1403,11 +1402,6 @@ SWITCH_STANDARD_DIALPLAN(lcr_dialplan_hunt)
 	}
 	routes.pool = pool;
 
-	if (!(routes.profile = locate_profile(lcr_profile))) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Unknown profile: %s\n", lcr_profile);
-		goto end;
-	}
-
 	intrastate = switch_channel_get_variable(channel, "intrastate");
 	intralata = switch_channel_get_variable(channel, "intralata");
 	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "intrastate channel var is [%s]\n", intrastate);
@@ -1427,7 +1421,12 @@ SWITCH_STANDARD_DIALPLAN(lcr_dialplan_hunt)
 		caller_profile = switch_channel_get_caller_profile(channel);
 	}
 
-	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "LCR Lookup on %s using profile %s\n", caller_profile->destination_number, lcr_profile);
+	if (!(routes.profile = locate_profile(caller_profile->context))) {
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Unknown profile: %s\n", caller_profile->context);
+		goto end;
+	}
+
+	switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "LCR Lookup on %s using profile %s\n", caller_profile->destination_number, caller_profile->context);
 	routes.lookup_number = caller_profile->destination_number;
 	routes.cid = (char *) caller_profile->caller_id_number;
 	if (lcr_do_lookup(&routes) == SWITCH_STATUS_SUCCESS) {
@@ -1465,7 +1464,7 @@ SWITCH_STANDARD_DIALPLAN(lcr_dialplan_hunt)
 			switch_caller_extension_add_application(session, extension, app, argc);
 		}
 	} else {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "LCR lookup failed for %s using profile %s\n", caller_profile->destination_number, lcr_profile);
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "LCR lookup failed for %s using profile %s\n", caller_profile->destination_number, caller_profile->context);
 	}
 
 end:
diff --git a/src/mod/applications/mod_spandsp/mod_spandsp_dsp.c b/src/mod/applications/mod_spandsp/mod_spandsp_dsp.c
index 005924194f..f576b7dd01 100644
--- a/src/mod/applications/mod_spandsp/mod_spandsp_dsp.c
+++ b/src/mod/applications/mod_spandsp/mod_spandsp_dsp.c
@@ -495,7 +495,7 @@ switch_status_t callprogress_detector_stop(switch_core_session_t *session)
 	switch_channel_t *channel = switch_core_session_get_channel(session);
 	switch_media_bug_t *bug = switch_channel_get_private(channel, TONE_PRIVATE);
 	if (bug) {
-		switch_core_media_bug_close(&bug);
+		switch_core_media_bug_remove(session, &bug);
 		switch_channel_set_private(channel, TONE_PRIVATE, NULL);
 	}
 	return SWITCH_STATUS_SUCCESS;
diff --git a/src/mod/applications/mod_valet_parking/mod_valet_parking.2010.vcxproj b/src/mod/applications/mod_valet_parking/mod_valet_parking.2010.vcxproj
index 5e006e13f9..29c0c4a742 100644
--- a/src/mod/applications/mod_valet_parking/mod_valet_parking.2010.vcxproj
+++ b/src/mod/applications/mod_valet_parking/mod_valet_parking.2010.vcxproj
@@ -63,10 +63,6 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/src/mod/asr_tts/mod_cepstral/WinReadme.txt b/src/mod/asr_tts/mod_cepstral/WinReadme.txt
new file mode 100644
index 0000000000..56b4e79a39
--- /dev/null
+++ b/src/mod/asr_tts/mod_cepstral/WinReadme.txt
@@ -0,0 +1,4 @@
+The Cepstral SDK for Windows should be placed in c:\dev\cepstral
+ex. C:\dev\cepstral\sdk\include
+This SDK can be obtained from http://cepstral.com/
+If you want a prebuilt version you may download one from http://files.freeswitch.org/windows/installer/
\ No newline at end of file
diff --git a/src/mod/asr_tts/mod_cepstral/mod_cepstral.2010.vcxproj b/src/mod/asr_tts/mod_cepstral/mod_cepstral.2010.vcxproj
index 2bc46efdca..b7e42eb850 100644
--- a/src/mod/asr_tts/mod_cepstral/mod_cepstral.2010.vcxproj
+++ b/src/mod/asr_tts/mod_cepstral/mod_cepstral.2010.vcxproj
@@ -66,13 +66,13 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>C:\Program Files\Cepstral\sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\dev\cepstral\sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
     <Link>
       <AdditionalDependencies>swift.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\Program Files\Cepstral\sdk\lib\winnt;C:\Program Files\Cepstral\sdk\lib\windows;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>C:\dev\cepstral\sdk\lib\lib-windows;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -83,13 +83,13 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>C:\Program Files\Cepstral\sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\dev\cepstral\sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
     <Link>
       <AdditionalDependencies>swift.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\Program Files\Cepstral\sdk\lib\winnt;C:\Program Files\Cepstral\sdk\lib\windows;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>C:\dev\cepstral\sdk\lib\lib-windows_x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -98,13 +98,13 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>C:\Program Files\Cepstral\sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\dev\cepstral\sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
     <Link>
       <AdditionalDependencies>swift.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\Program Files\Cepstral\sdk\lib\winnt;C:\Program Files\Cepstral\sdk\lib\windows;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>C:\dev\cepstral\sdk\lib\lib-windows;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -115,13 +115,13 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>C:\Program Files\Cepstral\sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\dev\cepstral\sdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
     <Link>
       <AdditionalDependencies>swift.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>C:\Program Files\Cepstral\sdk\lib\winnt;C:\Program Files\Cepstral\sdk\lib\windows;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>C:\dev\cepstral\sdk\lib\lib-windows_x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -132,9 +132,8 @@
     <ClCompile Include="mod_cepstral.c" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2008.vcxproj">
+    <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2010.vcxproj">
       <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/mod/codecs/mod_celt/mod_celt.vcxproj b/src/mod/codecs/mod_celt/mod_celt.vcxproj
index 01c55d4217..ee8a70ca3f 100644
--- a/src/mod/codecs/mod_celt/mod_celt.vcxproj
+++ b/src/mod/codecs/mod_celt/mod_celt.vcxproj
@@ -62,10 +62,6 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c b/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c
index 6e6fe58af6..97d9f6de9e 100644
--- a/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c
+++ b/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c
@@ -40,7 +40,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_sangoma_codec_load);
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_sangoma_codec_shutdown);
 SWITCH_MODULE_DEFINITION(mod_sangoma_codec, mod_sangoma_codec_load, mod_sangoma_codec_shutdown, NULL);
 
-#define IANA_LINEAR 10 
 #define SANGOMA_SESS_HASH_KEY_FORMAT "sngtc%lu"
 
 /* it seemed we need higher PTIME than the calling parties, so we assume nobody will use higher ptime than 40 */
@@ -83,26 +82,26 @@ typedef struct vocallo_codec_s {
 	int autoinit; /* initialize on start loop or manually */
 } vocallo_codec_t;
 
-#define ILBC_133_PAYLOAD  97
-#define ILBC_152_PAYLOAD 98
 vocallo_codec_t g_codec_map[] =
 {
 	/* auto-init codecs */
-	{ SNGTC_CODEC_PCMU,    0,   "PCMU",    "Sangoma PCMU",      40, 64000,  10000, 80,  160, 80,  8000,  8000,  1 },
-	{ SNGTC_CODEC_PCMA,    8,   "PCMA",    "Sangoma PCMA",      40, 64000,  10000, 80,  160, 80,  8000,  8000,  1 },
-	{ SNGTC_CODEC_L16_1,   10,  "L16",     "Sangoma L16",       40, 120000, 10000, 80,  160, 160, 8000,  8000,  0 },
-	{ SNGTC_CODEC_L16_2,   10,  "L16",     "Sangoma L16 2",     40, 320000, 10000, 80,  320, 320, 16000, 16000, 0 },
-	{ SNGTC_CODEC_G729AB,  18,  "G729",    "Sangoma G729",      40, 8000,   10000, 80,  160, 10,  8000,  8000,  1 },
-	{ SNGTC_CODEC_G726_32, 122, "G726-32", "Sangoma G.726 32k", 40, 32000,  10000, 80,  160, 40,  8000,  8000,  1 },
-	{ SNGTC_CODEC_G722,    9,   "G722",    "Sangoma G722",      20, 64000,  10000, 80,  160, 80,  8000,  8000, 1 },
+	{ SNGTC_CODEC_PCMU,      IANA_PCMU_A_8000_1,  "PCMU",    "Sangoma PCMU",      40, 64000,  10000, 80,  160, 80,  8000,  8000,  1 },
+	{ SNGTC_CODEC_PCMA,      IANA_PCMA_A_8000_1,  "PCMA",    "Sangoma PCMA",      40, 64000,  10000, 80,  160, 80,  8000,  8000,  1 },
+	{ SNGTC_CODEC_L16_1,     IANA_L16_A_8000_1,   "L16",     "Sangoma L16",       40, 120000, 10000, 80,  160, 160, 8000,  8000,  0 },
+	{ SNGTC_CODEC_L16_2,     IANA_L16_A_16000_1,  "L16",     "Sangoma L16 2",     40, 320000, 10000, 160, 320, 320, 16000, 16000, 0 },
+	{ SNGTC_CODEC_G729AB,    IANA_G729_AB_8000_1, "G729",    "Sangoma G729",      40, 8000,   10000, 80,  160, 10,  8000,  8000,  1 },
+	{ SNGTC_CODEC_G726_32,   IANA_G726_32_8000_1, "G726-32", "Sangoma G.726 32k", 40, 32000,  10000, 80,  160, 40,  8000,  8000,  1 },
+	{ SNGTC_CODEC_G722,      IANA_G722_A_8000_1,  "G722",    "Sangoma G722",      20, 64000,  10000, 80,  160, 80,  8000,  8000, 1  },
 
 	/* manually initialized */
-	{ SNGTC_CODEC_GSM_FR,    3,                "GSM",  "Sangoma GSM",  20, 13200, 20000, 160, 320, 33, 8000, 8000, 0 },
-	{ SNGTC_CODEC_G723_1_63, 4,                "G723", "Sangoma G723", 90, 6300,  30000, 240, 480, 24, 8000, 8000, 0 },
-	{ SNGTC_CODEC_AMR_1220,  96,               "AMR",  "Sangoma AMR",  20, 12200, 20000, 160, 320, 0,  8000, 8000, 0 },
-	{ SNGTC_CODEC_ILBC_133,  ILBC_133_PAYLOAD, "iLBC", "Sangoma iLBC", -1, -1,    -1,    -1,  -1,  -1, -1,   -1,   0 },
-	{ SNGTC_CODEC_ILBC_152,  ILBC_152_PAYLOAD, "iLBC", "Sangoma iLBC", -1, -1,    -1,    -1,  -1,  -1, -1,   -1,   0 },
-	{ -1,                    -1,               NULL,   NULL,           -1, -1,    -1,    -1,  -1,  -1, -1,   -1,   0 },
+	{ SNGTC_CODEC_GSM_FR,    IANA_GSM_A_8000_1,    "GSM",   "Sangoma GSM",    20, 13200, 20000, 160, 320, 33, 8000,  8000,  0 },
+	{ SNGTC_CODEC_G723_1_63, IANA_G723_A_8000_1,   "G723",  "Sangoma G723",   90, 6300,  30000, 240, 480, 24, 8000,  8000,  0 },
+	{ SNGTC_CODEC_AMR_1220,  IANA_AMR_WB_16000_1,  "AMR",   "Sangoma AMR",    20, 12200, 20000, 160, 320, 0,  8000,  8000,  0 },
+	{ SNGTC_CODEC_SIREN7_24, IANA_SIREN7,          "G7221", "Sangoma G722.1", 20, 24000, 20000, 320, 640, 60, 16000, 16000, 0 },
+	{ SNGTC_CODEC_SIREN7_32, IANA_SIREN7,          "G7221", "Sangoma G722.1", 20, 32000, 20000, 320, 640, 80, 16000, 16000, 0 },
+	{ SNGTC_CODEC_ILBC_133,  IANA_ILBC_133_8000_1, "iLBC",  "Sangoma iLBC",   30, 13300, 30000, 240, 480, 50, 8000,  8000,  0 },
+	{ SNGTC_CODEC_ILBC_152,  IANA_ILBC_152_8000_1, "iLBC",  "Sangoma iLBC",   20, 15200, 20000, 160, 320, 38, 8000,  8000,  0 },
+	{ -1,                    -1,                   NULL,    NULL,             -1, -1,    -1,    -1,  -1,  -1, -1,    -1,    0 },
 };
 
 /* RFC3389 RTP Payload for Comfort Noise */
@@ -181,11 +180,14 @@ static int codec_id_to_iana(int codec_id)
 	return -1;
 }
 
-static vocallo_codec_t *get_codec_from_iana(int iana)
+static vocallo_codec_t *get_codec_from_iana(int iana, int bitrate)
 {
 	int i;
 	for (i = 0; g_codec_map[i].codec_id != -1; i++) {
-		if (iana == g_codec_map[i].iana) {
+		if (iana == g_codec_map[i].iana && !bitrate) {
+			return &g_codec_map[i];
+		}
+		if (iana == g_codec_map[i].iana && bitrate == g_codec_map[i].bps) {
 			return &g_codec_map[i];
 		}
 	}
@@ -319,7 +321,7 @@ static switch_status_t switch_sangoma_init(switch_codec_t *codec, switch_codec_f
 	sess->pool = codec->memory_pool;
 	sess->impl = codec->implementation;
 
-	vcodec = get_codec_from_iana(codec->implementation->ianacode);
+	vcodec = get_codec_from_iana(codec->implementation->ianacode, codec->implementation->bits_per_second);
 	
 	switch_mutex_lock(g_sessions_lock);
 
@@ -386,6 +388,12 @@ static switch_status_t switch_sangoma_init_ilbc(switch_codec_t *codec, switch_co
 	return switch_sangoma_init(codec, flags, codec_settings);
 }
 
+static switch_status_t switch_sangoma_init_siren7(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings)
+{
+	int bit_rate = codec->implementation->bits_per_second;
+	codec->fmtp_out = switch_core_sprintf(codec->memory_pool, "bitrate=%d", bit_rate);
+	return switch_sangoma_init(codec, flags, codec_settings);
+}
 
 static void flush_rtp(switch_rtp_t *rtp)
 {
@@ -435,6 +443,7 @@ static switch_status_t switch_sangoma_encode(switch_codec_t *codec, switch_codec
 	switch_time_t func_start_time = 0, func_end_time = 0;
 	int i = 0;
 	int res = 0;
+	int linear_payload = codec->implementation->actual_samples_per_second == 8000 ? IANA_L16_A_8000_1 : IANA_L16_A_16000_1;
 	struct sangoma_transcoding_session *sess = codec->private_info;
 
 	if (sess->encoder.debug_timing) {
@@ -473,7 +482,7 @@ static switch_status_t switch_sangoma_encode(switch_codec_t *codec, switch_codec
 	linear_frame.source = __FUNCTION__;
 	linear_frame.data = decoded_byteswapped_data;
 	linear_frame.datalen = decoded_data_len;
-	linear_frame.payload = IANA_LINEAR;
+	linear_frame.payload = linear_payload;
 
 	/* copy and byte-swap */
 	for (i = 0; i < decoded_data_len/2; i++) {
@@ -531,9 +540,9 @@ static switch_status_t switch_sangoma_encode(switch_codec_t *codec, switch_codec
 			if (sess->encoder.request.b.codec_id == SNGTC_CODEC_ILBC_152 || sess->encoder.request.b.codec_id == SNGTC_CODEC_ILBC_133) {
 				/* since we moved to SOAP based communications, the mapping between vocallo IANA and our IANA does not work, 
 				 * some codecs checks cannot be completely done, like iLBC */
-				if (encoded_frame.payload != ILBC_152_PAYLOAD && encoded_frame.payload != ILBC_133_PAYLOAD) {
+				if (encoded_frame.payload != IANA_ILBC_152_8000_1 && encoded_frame.payload != IANA_ILBC_133_8000_1) {
 					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Read unexpected payload %d in Sangoma encoder RTP session, expecting either %d or %d\n",
-							encoded_frame.payload, ILBC_152_PAYLOAD, ILBC_133_PAYLOAD);
+							encoded_frame.payload, IANA_ILBC_152_8000_1, IANA_ILBC_133_8000_1);
 					break;
 				}
 			} else {
@@ -633,6 +642,7 @@ static switch_status_t switch_sangoma_decode(switch_codec_t *codec,	/* codec ses
 	uint16_t *rtp_data_linear;
 	int res = 0;
 	int i = 0;
+	int linear_payload = codec->implementation->actual_samples_per_second == 8000 ? IANA_L16_A_8000_1 : IANA_L16_A_16000_1;
 	struct sangoma_transcoding_session *sess = codec->private_info;
 
 	if (sess->decoder.debug_timing) {
@@ -722,9 +732,9 @@ static switch_status_t switch_sangoma_decode(switch_codec_t *codec,	/* codec ses
 			continue;
 		}
 
-		if (linear_frame.payload != IANA_LINEAR) {
+		if (linear_frame.payload != linear_payload) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Read unexpected payload %d in Sangoma decoder RTP session, expecting %d\n",
-					linear_frame.payload, IANA_LINEAR);
+					linear_frame.payload, linear_payload);
 			break;
 		}
 
@@ -1156,7 +1166,9 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_sangoma_codec_load)
 	switch_api_interface_t *api_interface = NULL;
 	int i = 0, c = 0;
 	int ilbc_done = 0;
+	int siren_done = 0;
 	vocallo_codec_t *ilbc_codec = NULL;
+	vocallo_codec_t *siren_codec = NULL;
 	int detected = 0, activated = 0;
 
 	/* make sure we have valid configuration */
@@ -1214,17 +1226,18 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_sangoma_codec_load)
 			continue;
 		}
 
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Registering implementations for codec %s\n", g_codec_map[c].iana_name);
-
-		/* let know the library which iana to use */
-		sngtc_set_iana_code_based_on_codec_id(g_codec_map[c].codec_id, g_codec_map[c].iana);
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Mapped codec %d to IANA %d\n", g_codec_map[c].codec_id, g_codec_map[c].iana);
-
 		/* special check for iLBC to add a single codec interface for both ILBC bitrate versions */
 		if ((g_codec_map[c].codec_id == SNGTC_CODEC_ILBC_152 || g_codec_map[c].codec_id == SNGTC_CODEC_ILBC_133) && ilbc_done) {
 			continue;
 		}
 
+		/* special check for siren to add a single codec interface for all siren bitrate versions */
+		if ((g_codec_map[c].codec_id == SNGTC_CODEC_SIREN7_24 || g_codec_map[c].codec_id == SNGTC_CODEC_SIREN7_32) && siren_done) {
+			continue;
+		}
+
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Registering implementations for codec %s\n", g_codec_map[c].iana_name);
+
 		/* SWITCH_ADD_CODEC allocates a codec interface structure from the pool the core gave us and adds it to the internal interface 
 		 * list the core keeps, gets a codec id and set the given codec name to it.
 		 * At this point there is an empty shell codec interface registered, but not yet implementations */
@@ -1322,7 +1335,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_sangoma_codec_load)
 								 50, /* number of bytes per frame compressed */
 								 1,	/* number of channels represented */
 								 1, /* number of frames per network packet (I dont think this is used at all) */
-								 switch_sangoma_init,	/* function to initialize a codec session using this implementation */
+								 switch_sangoma_init_ilbc, /* function to initialize a codec session using this implementation */
 								 switch_sangoma_encode,	/* function to encode slinear data into encoded data */
 								 switch_sangoma_decode,	/* function to decode encoded data into slinear data */
 								 switch_sangoma_destroy); /* deinitalize a codec handle using this implementation */
@@ -1353,6 +1366,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_sangoma_codec_load)
 				}
 
 				break;
+
 			case SNGTC_CODEC_AMR_1220:
 				switch_core_codec_add_implementation(pool, codec_interface,	/* the codec interface we allocated and we want to register with the core */
 								 SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
@@ -1374,6 +1388,51 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_sangoma_codec_load)
 								 switch_sangoma_destroy); /* deinitalize a codec handle using this implementation */
 				break;
 
+			case SNGTC_CODEC_SIREN7_24:
+			case SNGTC_CODEC_SIREN7_32:
+
+				siren_codec = get_codec_from_id(SNGTC_CODEC_SIREN7_24);
+				switch_core_codec_add_implementation(pool, codec_interface,	/* the codec interface we allocated and we want to register with the core */
+								 SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
+								 siren_codec->iana,	/* the IANA code number, ie http://www.iana.org/assignments/rtp-parameters */
+								 siren_codec->iana_name, /* the IANA code name */
+								 "bitrate=24000",	/* default fmtp to send (can be overridden by the init function), fmtp is used in SDP for format specific parameters */
+								 siren_codec->sampling_rate,	/* samples transferred per second */
+								 siren_codec->actual_sampling_rate, /* actual samples transferred per second */
+								 siren_codec->bps,	/* bits transferred per second */
+								 siren_codec->mpf, /* microseconds per frame */
+								 siren_codec->spf, /* samples per frame */
+								 siren_codec->bpfd, /* number of bytes per frame decompressed */
+								 siren_codec->bpfc, /* number of bytes per frame compressed */
+								 1,	/* number of channels represented */
+								 siren_codec->spf, /* number of frames per network packet (I dont think this is used at all) */
+								 switch_sangoma_init_siren7,	/* function to initialize a codec session using this implementation */
+								 switch_sangoma_encode,	/* function to encode slinear data into encoded data */
+								 switch_sangoma_decode,	/* function to decode encoded data into slinear data */
+								 switch_sangoma_destroy); /* deinitalize a codec handle using this implementation */
+
+				siren_codec = get_codec_from_id(SNGTC_CODEC_SIREN7_32);
+				switch_core_codec_add_implementation(pool, codec_interface,	/* the codec interface we allocated and we want to register with the core */
+								 SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
+								 siren_codec->iana,	/* the IANA code number, ie http://www.iana.org/assignments/rtp-parameters */
+								 siren_codec->iana_name, /* the IANA code name */
+								 "bitrate=32000",	/* default fmtp to send (can be overridden by the init function), fmtp is used in SDP for format specific parameters */
+								 siren_codec->sampling_rate,	/* samples transferred per second */
+								 siren_codec->actual_sampling_rate, /* actual samples transferred per second */
+								 siren_codec->bps,	/* bits transferred per second */
+								 siren_codec->mpf, /* microseconds per frame */
+								 siren_codec->spf, /* samples per frame */
+								 siren_codec->bpfd, /* number of bytes per frame decompressed */
+								 siren_codec->bpfc, /* number of bytes per frame compressed */
+								 1,	/* number of channels represented */
+								 siren_codec->spf, /* number of frames per network packet (I dont think this is used at all) */
+								 switch_sangoma_init_siren7,	/* function to initialize a codec session using this implementation */
+								 switch_sangoma_encode,	/* function to encode slinear data into encoded data */
+								 switch_sangoma_decode,	/* function to decode encoded data into slinear data */
+								 switch_sangoma_destroy); /* deinitalize a codec handle using this implementation */
+				siren_done = 1;
+				break;
+
 			default:
 				break;
 			}
diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.c b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
index 7558e1b1b8..75329a0848 100644
--- a/src/mod/endpoints/mod_dingaling/mod_dingaling.c
+++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
@@ -514,13 +514,19 @@ static switch_status_t chat_send(const char *proto, const char *from, const char
 				from = hint;
 			} else {
 				char *p;
-				ffrom = switch_mprintf("%s+%s", proto, from);
-				from = ffrom;
+				
+				if (!(profile->user_flags & LDL_FLAG_COMPONENT)) {
+					from = ffrom = strdup(profile->login);
+				} else {
+					from = ffrom = switch_mprintf("%s+%s", proto, from);
+				}
+				
 				if ((p = strchr(from, '/'))) {
 					*p = '\0';
 				}
 			}
 			ldl_handle_send_msg(profile->handle, (char *) from, (char *) to, NULL, switch_str_nil(body));
+			switch_safe_free(ffrom);
 		} else {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Profile %s\n", f_host ? f_host : "NULL");
 			return SWITCH_STATUS_FALSE;
@@ -602,7 +608,7 @@ static void ipchanged_event_handler(switch_event_t *event)
 			for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) {
 				switch_hash_this(hi, NULL, NULL, &val);
 				profile = (mdl_profile_t *) val;
-				if (old_ip4 && !strcmp(profile->extip, old_ip4)) {
+				if (old_ip4 && profile->extip && !strcmp(profile->extip, old_ip4)) {
 					tmp = profile->extip;
 					profile->extip = strdup(new_ip4);
 					switch_safe_free(tmp);
diff --git a/src/mod/endpoints/mod_gsmopen/gsmopen.h b/src/mod/endpoints/mod_gsmopen/gsmopen.h
index fd94bccc2a..05ef1641bf 100644
--- a/src/mod/endpoints/mod_gsmopen/gsmopen.h
+++ b/src/mod/endpoints/mod_gsmopen/gsmopen.h
@@ -158,7 +158,7 @@ typedef enum {
 #define WARNINGA(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, 		"rev "GSMOPEN_SVN_VERSION "[%p|%-7lx][WARNINGA  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
 #define NOTICA(...)  switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, 		"rev "GSMOPEN_SVN_VERSION "[%p|%-7lx][NOTICA  %-5d][%-10s][%2d,%2d,%2d] " __VA_ARGS__ );
 
-#define GSMOPEN_P_LOG NULL, (unsigned long)55, __LINE__, tech_pvt ? tech_pvt->name ? tech_pvt->name : "none" : "none", -1, tech_pvt ? tech_pvt->interface_state : -1, tech_pvt ? tech_pvt->phone_callflow : -1
+#define GSMOPEN_P_LOG (void *)NULL, (unsigned long)55, __LINE__, tech_pvt ? tech_pvt->name ? tech_pvt->name : "none" : "none", -1, tech_pvt ? tech_pvt->interface_state : -1, tech_pvt ? tech_pvt->phone_callflow : -1
 
 /*********************************/
 #define GSMOPEN_CAUSE_NORMAL		1
diff --git a/src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp b/src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp
index e4bb6b9200..76d32ac3f0 100644
--- a/src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp
+++ b/src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp
@@ -3294,12 +3294,18 @@ int alsa_write(private_t * tech_pvt, short *data, int datalen)
 	time_t now_timestamp;
 	/* size_t frames = 0; */
 	snd_pcm_state_t state;
-	snd_pcm_sframes_t delayp1;
-	snd_pcm_sframes_t delayp2;
+	snd_pcm_sframes_t delayp1=0;
+	snd_pcm_sframes_t delayp2=0;
 
 	if(tech_pvt->no_sound==1){
 		return res;
 	}
+
+
+	memset(sizbuf, 255, sizeof(sizbuf));
+	memset(sizbuf2, 255, sizeof(sizbuf));
+	memset(silencebuf, 255, sizeof(sizbuf));
+
 	//ERRORA("data=%p, datalen=%d\n", GSMOPEN_P_LOG, (void *)data, datalen);
 	/* We have to digest the frame in 160-byte portions */
 	if (datalen > sizeof(sizbuf) - sizpos) {
@@ -3307,8 +3313,11 @@ int alsa_write(private_t * tech_pvt, short *data, int datalen)
 		res = -1;
 	} else {
 		memcpy(sizbuf + sizpos, data, datalen);
+		memset(data, 255, datalen);
 		len += datalen;
 		pos = 0;
+
+
 #ifdef ALSA_MONITOR
 		alsa_monitor_write(sizbuf, len);
 #endif
@@ -3456,6 +3465,7 @@ int alsa_write(private_t * tech_pvt, short *data, int datalen)
 			if (res == -ESTRPIPE) {
 				ERRORA("You've got some big problems\n", GSMOPEN_P_LOG);
 			} else if (res == -EAGAIN) {
+				DEBUGA_GSMOPEN("Momentarily busy\n", GSMOPEN_P_LOG);
 				res = 0;
 			} else if (res < 0) {
 				ERRORA("Error %d on audio write: \"%s\"\n", GSMOPEN_P_LOG, res, snd_strerror(res));
@@ -3572,9 +3582,11 @@ int alsa_read(private_t * tech_pvt, short *data, int datalen)
 		return r;
 
 	} else if (r == -EAGAIN) {
-		DEBUGA_GSMOPEN("ALSA read -EAGAIN, the soundcard is not ready to be read by gsmopen\n", GSMOPEN_P_LOG);
+		int count=0;
 		while (r == -EAGAIN) {
-			gsmopen_sleep(1000);
+			gsmopen_sleep(10000);
+			DEBUGA_GSMOPEN("%d ALSA read -EAGAIN, the soundcard is not ready to be read by gsmopen\n", GSMOPEN_P_LOG, count);
+			count++;
 
 			if (tech_pvt->alsa_capture_is_mono) {
 				r = snd_pcm_readi(tech_pvt->alsac, buf + readpos, left);
diff --git a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
index cb440d3bcb..7e20b7c25e 100644
--- a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
+++ b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
@@ -1904,14 +1904,25 @@ static switch_status_t load_config(int reload_type)
 				if (globals.GSMOPEN_INTERFACES[interface_id].controldevprotocol != PROTOCOL_NO_SERIAL) {
 					res = gsmopen_serial_config(&globals.GSMOPEN_INTERFACES[interface_id]);
 					if (res) {
-						ERRORA("gsmopen_serial_config failed\n", GSMOPEN_P_LOG);
-						ERRORA("STARTING interface_id=%d FAILED\n", GSMOPEN_P_LOG, interface_id);
-						//return SWITCH_STATUS_FALSE;
-						globals.GSMOPEN_INTERFACES[interface_id].running=0;
-						alarm_event(&globals.GSMOPEN_INTERFACES[interface_id], ALARM_FAILED_INTERFACE, "gsmopen_serial_config failed");
-						globals.GSMOPEN_INTERFACES[interface_id].active=0;
-						globals.GSMOPEN_INTERFACES[interface_id].name[0]='\0';
-						continue;
+						int count = 0;
+						ERRORA("gsmopen_serial_config failed, let's try again\n", GSMOPEN_P_LOG);
+						while(res && count < 5){
+							switch_sleep(100000); //0.1 seconds
+							res = gsmopen_serial_config(&globals.GSMOPEN_INTERFACES[interface_id]);
+							count++;
+							if (res) {
+								ERRORA("%d: gsmopen_serial_config failed, let's try again\n", GSMOPEN_P_LOG, count);
+							}
+						}
+						if (res) {
+							ERRORA("STARTING interface_id=%d FAILED\n", GSMOPEN_P_LOG, interface_id);
+							//return SWITCH_STATUS_FALSE;
+							globals.GSMOPEN_INTERFACES[interface_id].running=0;
+							alarm_event(&globals.GSMOPEN_INTERFACES[interface_id], ALARM_FAILED_INTERFACE, "gsmopen_serial_config failed");
+							globals.GSMOPEN_INTERFACES[interface_id].active=0;
+							globals.GSMOPEN_INTERFACES[interface_id].name[0]='\0';
+							continue;
+						}
 					}
 				}
 
diff --git a/src/mod/endpoints/mod_h323/changes.txt b/src/mod/endpoints/mod_h323/changes.txt
index 19aca46dc8..4f75aef8b4 100644
--- a/src/mod/endpoints/mod_h323/changes.txt
+++ b/src/mod/endpoints/mod_h323/changes.txt
@@ -1,3 +1,6 @@
+Adds an extra switch_rtp_destroy or switch_rtp_release_port when a session ends 
+    - to make sure the port is returned to FS. thx to Peter Olsson.
+fix issues with Progress message type if pre_answer enabled
 fix crashes on FSH323Connection calls in on_hangup routine in different threads.
 move PTrace level set to FSH323EndPoint::Initialise
 partially apply patch from from Peter Olsson, Remove UnLock() when TryLock() failed and DEBUG_RTP_PACKETS directive.
diff --git a/src/mod/endpoints/mod_h323/mod_h323.cpp b/src/mod/endpoints/mod_h323/mod_h323.cpp
index 142506dd92..74fb6ae11a 100644
--- a/src/mod/endpoints/mod_h323/mod_h323.cpp
+++ b/src/mod/endpoints/mod_h323/mod_h323.cpp
@@ -343,7 +343,7 @@ PString GetH245CodecName(const H323Capability* cap)
 }
 
 FSProcess::FSProcess()
-	: PLibraryProcess("Test", "mod_h323", 1, 0, AlphaCode, 1)
+	: PLibraryProcess("FreeSWITCH", "mod_h323", 1, 0, AlphaCode, 1)
 	, m_h323endpoint(NULL){
 }
 
@@ -742,6 +742,14 @@ FSH323Connection::~FSH323Connection()
 		switch_core_session_unlock_codec_write(m_fsSession);
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"------------->switch_core_session_unlock_codec_write [%p]\n",m_fsSession);
 	}
+
+	if (tech_pvt->rtp_session) {
+		switch_rtp_destroy(&tech_pvt->rtp_session);
+		tech_pvt->rtp_session = NULL;
+	} else if (m_RTPlocalPort) {
+		switch_rtp_release_port((const char *)m_RTPlocalIP.AsString(), m_RTPlocalPort);
+	}
+
 	tech_pvt->me = NULL;
 //	switch_mutex_unlock(tech_pvt->h323_mutex);
 //	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"------------->h323_mutex_unlock\n");
@@ -1148,7 +1156,7 @@ void FSH323Connection::AnsweringCall(AnswerCallResponse response)
 			if (!mediaWaitForConnect) {
 				// create a new facility PDU if doing AnswerDeferredWithMedia
 				H323SignalPDU want245PDU;
-				//H225_Progress_UUIE & prog = want245PDU.BuildProgress(*this);
+				want245PDU.BuildProgress(*this);
 				PBoolean sendPDU = TRUE;
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE,"mediaWaitForConnect = FALSE\n");
 /*				if (SendFastStartAcknowledge(prog.m_fastStart)){
diff --git a/src/mod/endpoints/mod_khomp/Install/files/khomp.conf.xml b/src/mod/endpoints/mod_khomp/Install/files/khomp.conf.xml
index 45268f304b..79c00516b9 100644
--- a/src/mod/endpoints/mod_khomp/Install/files/khomp.conf.xml
+++ b/src/mod/endpoints/mod_khomp/Install/files/khomp.conf.xml
@@ -95,16 +95,6 @@ should be opened for the channel. Limited to 25ms min, 500ms max.
 <param name="r2-preconnect-wait" value="250"/>
 -->
 
-<!--
-Enable/disable native bridge mode (known in pt_BR as "trombone") for calls
-in the Khomp channel, passing the audio inside the board when both channels
-(incoming and outgoing) are of type Khomp. This reduces the echo and the
-audio delay, and frees the host from most audio processing.
-(default = yes)
-
-<param name="native-bridge" value="yes"/>
--->
-
 <!--
 Defines the incoming context for calls on E1 channels. Some wildcards are
 accepted, and described in the bottom of this file.
@@ -239,48 +229,30 @@ is enabled on the board configuration. Possible values:
 <param name="input-volume" value="0"/>
 -->
 
-<!--
-Sets the default AMA flags, affecting the categorization of entries in 
-the call detail records.
-(default = default)
-
-<param name="amaflags" value="default"/>
--->
-
 <!--
 Sets the account code for calls placed on the channel. The account code may
 be any alphanumeric string
-(default = KhompBoard)
+default = <empty>)
 
-<param name="accountcode" value="KhompBoard"/>
+<param name="accountcode" value=""/>
 -->
 
 <!--
 Set the language of the channel (useful for selecting audio messages of a
 specific language on answer).
+
 (default = <empty>)
 
 <param name="language" value="pt_BR"/>
 -->
 
-<!--
-Set the music on hold class of the channel (useful for selecting a group of
-songs to play on hold).
-(default = default)
-
-<param name="mohclass" value="default"/>
--->
-
 <!--
 Sets the global orig (CALLERID) base for FXS boards. This number is added
 to a sequencial number, which is incremented for each FXS board and FXS
 channel in the system.
-
-For more example of how to use this option, see channel README file,
-section 'Opcoes do application Bridge', item '<action application="bridge" data="Khomp/r304" />'.
 (default = 0)
 
-<param name="fxs-global-orig" value="0200"/>
+<param name="fxs-global-orig" value="0"/>
 -->
 
 <!--
@@ -300,14 +272,6 @@ a FXS branch.
 <param name="fxs-bina" value="yes"/>
 -->
 
-<!--
-Enable/disable using CTbus for Khomp CTI boards in native bridge.
-(WARNING: just used for internal testings!)
-(default = no)
-
-<param name="has-ctbus" value="no"/>
--->
-
 <!--
 This is the delay time to really disconnect a channel after the disconnect
 event arrive. If a connect event comes up in this interval, then the 
@@ -337,18 +301,6 @@ not have any tone. Values are in milliseconds.
 <param name="delay-ringback-pbx" value="2500"/>
 -->
 
-<!--
-Defines if the channel should optimize audio delay by droping longstanding
-packets from audio buffer. This guarantees the minimal audio delay for the
-user, and avoid delays associated with miscoded SIP clients. However,
-depending on the system's scheduling policy (some 2.6 kernel releases),
-this may result on excessive drop of packets, and audible audio skipping.
-This should not be changed naively.
-(default = no)
-
-<param name="optimize-audio-path" value="no"/>
--->
-
 <!--
 Defines if the channel should ignore some uncommon DTMF digits detected by
 the board (A, B, C and D). This reduces the number of false positives which
@@ -526,9 +478,8 @@ In the example above, the branch numbered 804 will have specific
 configuration for default output volume set to +2.
 
 Possible values to options is:
-context, input-volume, output-volume language,
-mohclass, amaflags, accountcode, calleridnum, 
-calleridname, mailbox, flash-to-digits.
+context, input-volume, output-volume, language,
+accountcode, calleridnum, calleridname, flash-to-digits.
 -->
 </fxs-options>
 
diff --git a/src/mod/endpoints/mod_khomp/Makefile b/src/mod/endpoints/mod_khomp/Makefile
index 94923c7cda..db1a6fe4e4 100644
--- a/src/mod/endpoints/mod_khomp/Makefile
+++ b/src/mod/endpoints/mod_khomp/Makefile
@@ -1,6 +1,9 @@
 MODNAME := mod_khomp
 VERBOSE := 1
 
+#FreeSWITCH source PATH is needed: 
+# Set FREESWITCH_PATH
+
 ifeq ($(strip $(FREESWITCH_PATH)),)
 	BASE := ../../../../
 else
@@ -11,12 +14,12 @@ curr_dir := $(shell pwd)
 
 versions := -DFS_VERSION_MAJOR=$(shell bash $(curr_dir)/tools/getversion.sh "SWITCH_VERSION_MAJOR" $(BASE)) -DFS_VERSION_MINOR=$(shell bash $(curr_dir)/tools/getversion.sh "SWITCH_VERSION_MINOR" $(BASE)) -DFS_VERSION_MICRO=$(shell bash $(curr_dir)/tools/getversion.sh "SWITCH_VERSION_MICRO" $(BASE))
 
-LOCAL_CFLAGS = -I./ -I./include -I./commons -I./support -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM -DCOMMONS_LIBRARY_USING_FREESWITCH -g -ggdb #-DDEBUG_FLAGS
+LOCAL_CFLAGS = -I./ -I./include -I./commons -I./commons/base -I./support -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM -DCOMMONS_LIBRARY_USING_FREESWITCH -g -ggdb #-DDEBUG_FLAGS
 LOCAL_CFLAGS += $(versions)
 
 LOCAL_LDFLAGS = -lk3l
 
-LOCAL_OBJS = ./commons/k3lapi.o ./commons/k3lutil.o ./commons/config_options.o ./commons/format.o ./commons/strings.o ./commons/ringbuffer.o ./commons/verbose.o ./commons/saved_condition.o ./commons/regex.o ./commons/timer.o ./commons/configurator/configfile.o ./commons/configurator/option.o ./commons/configurator/section.o ./commons/configurator/restriction.o
+LOCAL_OBJS = ./commons/base/k3lapi.o ./commons/base/k3lutil.o ./commons/base/config_options.o ./commons/base/format.o ./commons/base/strings.o ./commons/base/ringbuffer.o ./commons/base/verbose.o ./commons/base/saved_condition.o ./commons/base/regex.o ./commons/base/timer.o ./commons/base/configurator/configfile.o ./commons/base/configurator/option.o ./commons/base/configurator/section.o ./commons/base/configurator/restriction.o ./commons/base/verbose_traits.o 
 LOCAL_OBJS += ./support/klog-config.o ./support/klog-options.o ./support/config_defaults.o
 LOCAL_OBJS += ./src/globals.o ./src/opt.o ./src/frame.o ./src/utils.o ./src/lock.o ./src/spec.o ./src/applications.o ./src/khomp_pvt_fxo.o ./src/khomp_pvt_gsm.o ./src/khomp_pvt_kxe1.o ./src/khomp_pvt_passive.o ./src/khomp_pvt.o ./src/logger.o ./src/cli.o
 
@@ -27,7 +30,20 @@ conf_file_install = $(sysconfdir)/autoload_configs
 
 include $(BASE)/build/modmake.rules
 
+local_depend:
+	@if test ! -f $(curr_dir)/commons/base/verbose_traits.hpp || test ! -f $(curr_dir)/commons/base/verbose_traits.cpp ; then \
+		echo "Generating verbose_traits" ;\
+		bash $(curr_dir)/commons/tools/generate-verbose-headers.sh commons/base/ include/k3l.h ;\
+	fi;
+
 depend_install:
+	@if test "w`kserver --version 2>/dev/null | grep 2.1`" == "w" ; then \
+		echo "###############################################################################" ;\
+		echo "Install k3l from KHOMP." ;\
+		echo "Run: $(curr_dir)/tools/getk3l.sh" ;\
+		echo "###############################################################################" ;\
+		exit 1;\
+	fi;
 	@echo "Copy $(conf_file_name)"
 	@if test -d  $(conf_file_install) ; then \
 		if test -f $(conf_file_dir)/$(conf_file_name) ; then \
diff --git a/src/mod/endpoints/mod_khomp/commons/atomic.hpp b/src/mod/endpoints/mod_khomp/commons/base/atomic.hpp
similarity index 90%
rename from src/mod/endpoints/mod_khomp/commons/atomic.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/atomic.hpp
index daa598c9b4..02278b390c 100644
--- a/src/mod/endpoints/mod_khomp/commons/atomic.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/atomic.hpp
@@ -64,17 +64,31 @@ namespace Atomic
         PunnedType pval; pval.valtype = VAL;               \
         unsigned long long vexp = *(pexp.podtype);         \
         unsigned long long vval = *(pval.podtype);         \
-        unsigned long long res = (unsigned long long)exp;  \
+        unsigned long vval32 = (unsigned long)vval;        \
         unsigned char chg = 0;                             \
-        asm volatile("lock; cmpxchg8b %2; sete %1;"        \
+        asm volatile(                                      \
+            "xchgl %%ebx, %4;"                             \
+            "lock; cmpxchg8b %2; sete %1;"                 \
+            "movl %4, %%ebx;   "                           \
         : "+A" (vexp),                    /* 0 (result) */ \
-        "=q" (chg)                        /* 1 */          \
+          "=c" (chg)                      /* 1 */          \
         : "m" (*(unsigned char**)(PTR)),  /* 2 */          \
-        "b" ((unsigned long)(vval)),                       \
-        "c" ((unsigned long)(vval >> 32)));                \
+          "c" ((unsigned long)(vval >> 32)),               \
+          "m" (vval32));                                   \
         *(pexp.podtype) = vexp;                            \
         return (chg != 0 ? true : false);
 
+//            "movl %%ecx, %4;"
+//
+//          "m" (*((unsigned long*)(*(pval.podtype)))),
+//          "m" ((unsigned long)(vval >> 32))
+//
+//          "m" (*((unsigned long*)(&vval))),
+//          "m" ((unsigned long)(vval >> 32))
+//
+//        unsigned long long vval = *(pval.podtype);
+//        unsigned long long res = (unsigned long long)exp;
+//
     // Types used for making CMPXCHG instructions independent from base type.
 
     template < typename ValType, typename PodType >
diff --git a/src/mod/endpoints/mod_khomp/commons/config_commons.hpp b/src/mod/endpoints/mod_khomp/commons/base/config_commons.hpp
similarity index 92%
rename from src/mod/endpoints/mod_khomp/commons/config_commons.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/config_commons.hpp
index de8f327df4..dad16f4e92 100644
--- a/src/mod/endpoints/mod_khomp/commons/config_commons.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/config_commons.hpp
@@ -63,7 +63,12 @@
  #error Unknown implementation selected. Please define COMMONS_LIBRARY_USING_* correctly.
 #endif
 
-#define COMMONS_INCLUDE(file) <COMMONS_IMPLEMENTATION/file>
+#define COMMONS_INCLUDE(file) <system/COMMONS_IMPLEMENTATION/file>
+
+#define COMMONS_VERSION_MAJOR 1
+#define COMMONS_VERSION_MINOR 1
+
+#define COMMONS_AT_LEAST(x,y) \
+    (COMMONS_VERSION_MAJOR > x || (COMMONS_VERSION_MAJOR == x && COMMONS_VERSION_MINOR >= y))
 
 #endif  /* _CONFIG_COMMONS_HPP_ */
-
diff --git a/src/mod/endpoints/mod_khomp/commons/base/config_options.cpp b/src/mod/endpoints/mod_khomp/commons/base/config_options.cpp
new file mode 100644
index 0000000000..7412b4b1a0
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/base/config_options.cpp
@@ -0,0 +1,302 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  The contents of this file are subject to the Mozilla Public License Version 1.1
+  (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.mozilla.org/MPL/
+
+  Software distributed under the License is distributed on an "AS IS" basis,
+  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+  the specific language governing rights and limitations under the License.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <config_options.hpp>
+
+void Config::Restriction::checkRange(const std::string & name, const SIntType value, const Range < SIntType > & range)
+{
+    if (value < range.minimum)
+        throw Failure(STG(FMT("value '%d' out-of-range for option '%s' (too low)") % value % name));
+
+    if (value > range.maximum)
+        throw Failure(STG(FMT("value '%d' out-of-range for option '%s' (too high)") % value % name));
+
+    if (((value - range.minimum) % range.step) != 0)
+        throw Failure(STG(FMT("value '%d' out-of-range for option '%s' (outside allowed step)") % value % name));
+}
+
+void Config::Restriction::checkRange(const std::string & name, const UIntType value, const Range < UIntType > & range)
+{
+    if (value < range.minimum)
+        throw Failure(STG(FMT("value '%d' out-of-range for option '%s' (too low)") % value % name));
+
+    if (value > range.maximum)
+        throw Failure(STG(FMT("value '%d' out-of-range for option '%s' (too high)") % value % name));
+
+    if (((value - range.minimum) % range.step) != 0)
+        throw Failure(STG(FMT("value '%d' out-of-range for option '%s' (outside allowed step)") % value % name));
+}
+
+void Config::Restriction::checkStringSet(const std::string & name, const StringType & value, const StringSet & allowed)
+{
+    if (allowed.empty())
+        return;
+
+    if (allowed.find(value) != allowed.end())
+        return;
+
+    std::string strlist;
+
+    for (StringSet::const_iterator i = allowed.begin(); i != allowed.end(); i++)
+    {
+        strlist += " '";
+        strlist += (*i);
+        strlist += "'";
+    }
+
+    throw Failure(STG(FMT("value '%s' not allowed for option '%s' (allowed values:%s)")
+        % value % name % strlist));
+}
+
+Config::Option::Option(std::string name, Config::Option::StringMemberType value, const StringType defvalue, StringSet & allowed, bool listme)
+: _myname(name), _option(InnerStringType(name, value, defvalue, allowed)), _listme(listme), _values(NULL)
+{};
+
+Config::Option::Option(std::string name, Config::Option::StringMemberType value, const StringType defvalue, bool listme)
+: _myname(name), _option(InnerStringType(name, value, defvalue)), _listme(listme), _values(NULL)
+{};
+
+Config::Option::Option(std::string name, Config::Option::BooleanMemberType value, const BooleanType defvalue, bool listme)
+: _myname(name), _option(InnerBooleanType(name, value, defvalue)), _listme(listme), _values(NULL)
+{};
+
+Config::Option::Option(std::string name, Config::Option::SIntMemberType value, const SIntType defvalue,
+                       SIntType min, SIntType max, SIntType step, bool listme)
+: _myname(name), _option(InnerSIntType(name, value, defvalue, min, max, step)), _listme(listme), _values(NULL)
+{};
+
+Config::Option::Option(std::string name, Config::Option::UIntMemberType value, const UIntType defvalue,
+                       UIntType min, UIntType max, UIntType step, bool listme)
+: _myname(name), _option(InnerUIntType(name, value, defvalue, min, max, step)), _listme(listme), _values(NULL)
+{};
+
+Config::Option::Option(const Config::Option & o)
+: _myname(o._myname), _option(o._option), _listme(o._listme), _values(o._values)
+{};
+
+Config::Option::Option(std::string name, Config::Option::FunctionMemberType value, const StringType defvalue, StringSet & allowed, bool listme)
+: _myname(name), _option(InnerFunctionType(name, value, defvalue, allowed)), _listme(listme), _values(NULL)
+{};
+
+Config::Option::Option(std::string name, Config::Option::FunctionMemberType value, const StringType defvalue, bool listme)
+: _myname(name), _option(InnerFunctionType(name, value, defvalue)), _listme(listme), _values(NULL)
+{};
+
+Config::Option::~Option(void)
+{
+    if (_values)
+    {
+        for (unsigned int i = 0; _values[i] != NULL; i++)
+            delete _values[i];
+
+        delete[] _values;
+        _values = NULL;
+    }
+};
+
+const char ** Config::Option::values(void)
+{
+    if (_values != NULL)
+        return _values;
+
+    /**/ if (_option.check<InnerBooleanType>())
+    {
+        _values = new const char*[3];
+
+        _values[0] = strdup("yes");
+        _values[1] = strdup("no");
+        _values[2] = NULL;
+
+    }
+    else if (_option.check<InnerSIntType>())
+    {
+        const InnerSIntType & tmp = _option.get<InnerSIntType>();
+
+        unsigned int count = ((tmp._range.maximum - tmp._range.minimum) / tmp._range.step) + 1;
+        unsigned int index = 0;
+
+        _values = new const char*[count + 1];
+
+        for (SIntType i = tmp._range.minimum; i <= tmp._range.maximum; i += tmp._range.step, ++index)
+            _values[index] = strdup(STG(FMT("%d") % i).c_str());
+
+        _values[index] = NULL;
+    }
+    else if (_option.check<InnerUIntType>())
+    {
+        const InnerUIntType & tmp = _option.get<InnerUIntType>();
+
+        unsigned int count = ((tmp._range.maximum - tmp._range.minimum) / tmp._range.step) + 1;
+        unsigned int index = 0;
+
+        _values = new const char*[count + 1];
+
+        for (UIntType i = tmp._range.minimum; i <= tmp._range.maximum; i += tmp._range.step, ++index)
+            _values[index] = strdup(STG(FMT("%d") % i).c_str());
+
+        _values[index] = NULL;
+    }
+    else if (_option.check<InnerStringType>())
+    {
+        const InnerStringType & tmp = _option.get<InnerStringType>();
+
+        _values = new const char*[ tmp._allowed.size() + 1 ];
+
+        unsigned int index = 0;
+
+        for (StringSet::iterator i = tmp._allowed.begin(); i != tmp._allowed.end(); ++i, ++index)
+            _values[index] = strdup((*i).c_str());
+
+        _values[index] = NULL;
+    }
+    else if (_option.check<InnerFunctionType>())
+    {
+        const InnerFunctionType & tmp = _option.get<InnerFunctionType>();
+
+        _values = new const char*[ tmp._allowed.size() + 1 ];
+
+        unsigned int index = 0;
+
+        for (StringSet::iterator i = tmp._allowed.begin(); i != tmp._allowed.end(); ++i, ++index)
+            _values[index] = strdup((*i).c_str());
+
+        _values[index] = NULL;
+    }
+    else
+    {
+        throw Failure(STG(FMT("values() not implemented for type used in option '%s'") % _myname));
+    }
+
+    return _values;
+};
+
+/*********************************/
+
+Config::Options::Options(void)
+: _values(NULL)
+{};
+
+Config::Options::~Options()
+{
+    if (_values)
+    {
+        for (unsigned int i = 0; _values[i] != NULL; i++)
+            free((void*)(_values[i]));
+
+        delete[] _values;
+        _values = NULL;
+    }
+};
+
+bool Config::Options::add(Config::Option option)
+{
+    std::pair<OptionMap::iterator, bool> ret = _map.insert(OptionPair(option.name(), option));
+
+    return ret.second;
+}
+
+bool Config::Options::synonym(std::string equiv_opt, std::string main_opt)
+{
+    std::pair<SynOptionMap::iterator, bool> ret = _syn_map.insert(SynOptionPair(equiv_opt, main_opt));
+
+    return ret.second;
+}
+
+Config::StringSet Config::Options::options(void)
+{
+    StringSet res;
+
+    for (OptionMap::iterator i = _map.begin(); i != _map.end(); i++)
+        res.insert(i->first);
+
+    return res;
+}
+
+const char ** Config::Options::values(const char * name)
+{
+    OptionMap::iterator iter = find_option(name);
+
+    if (iter == _map.end())
+        throw Failure(STG(FMT("unknown option '%s'") % name));
+
+    return iter->second.values();
+}
+
+const char ** Config::Options::values(void)
+{
+    if (_values != NULL)
+        return _values;
+
+    unsigned int count = 0;
+
+    for (OptionMap::iterator i = _map.begin(); i != _map.end(); ++i)
+        if (i->second.listme())
+            ++count;
+
+    _values = new const char*[ count + 1 ];
+
+    unsigned int index = 0;
+
+    for (OptionMap::iterator i = _map.begin(); i != _map.end(); ++i)
+    {
+        if (i->second.listme())
+        {
+            _values[index] = strdup(i->first.c_str());
+            ++index;
+        }
+    }
+
+    _values[index] = NULL;
+
+    return _values;
+}
+
+Config::Options::OptionMap::iterator Config::Options::find_option(std::string name)
+{
+    SynOptionMap::iterator syn_iter = _syn_map.find(name);
+
+    if (syn_iter != _syn_map.end())
+        name = syn_iter->second;
+
+    OptionMap::iterator iter = _map.find(name);
+
+    return iter;
+}
diff --git a/src/mod/endpoints/mod_khomp/commons/base/config_options.hpp b/src/mod/endpoints/mod_khomp/commons/base/config_options.hpp
new file mode 100644
index 0000000000..59e381f893
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/base/config_options.hpp
@@ -0,0 +1,772 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  The contents of this file are subject to the Mozilla Public License Version 1.1
+  (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.mozilla.org/MPL/
+
+  Software distributed under the License is distributed on an "AS IS" basis,
+  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+  the specific language governing rights and limitations under the License.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#ifndef _CONFIG_OPTIONS_HPP_
+#define _CONFIG_OPTIONS_HPP_
+
+#include <set>
+#include <map>
+#include <vector>
+#include <stdexcept>
+
+#include <strings.hpp>
+#include <format.hpp>
+#include <tagged_union.hpp>
+#include <function.hpp>
+#include <variable.hpp>
+
+namespace Config
+{
+    /* exceptions */
+
+    struct Failure: public std::runtime_error
+    {
+        Failure(const std::string & msg) : std::runtime_error(msg) {};
+    };
+
+    struct EmptyValue: public std::runtime_error
+    {
+        EmptyValue(): std::runtime_error("accessed option still not loaded from configuration") {};
+    };
+
+    /* types */
+
+    typedef int          SIntType;
+    typedef unsigned int UIntType;
+    typedef bool         BooleanType;
+    typedef std::string  StringType;
+
+    template < typename Type >
+    struct Value;
+
+    template < typename Type >
+    struct InnerOptionBase;
+
+    template < typename Type >
+    struct InnerOption;
+
+    struct Option;
+
+    /* here we go! */
+
+    template < typename Type >
+    struct Range
+    {
+        Range(const Type _minimum, const Type _maximum, const Type _step)
+        : minimum(_minimum), maximum(_maximum), step(_step) {};
+
+        const Type minimum, maximum, step;
+    };
+
+    typedef std::set < std::string > StringSet;
+
+    template < typename Type >
+    struct Value: COUNTER_SUPER(Value < Type >)
+    {
+        friend class COUNTER_CLASS(Value < Type >);
+        friend class InnerOptionBase< Type >;
+        friend class InnerOption < Type >;
+        friend class Option;
+
+        Value()
+        : _tmpval(0), _stored(0), _loaded(false), _inited(false)
+        {};
+
+        Value(const Value & o)
+        : COUNTER_REFER(o, Value < Type >),
+          _tmpval(o._tmpval), _stored(o._stored),
+          _loaded(o._loaded), _inited(o._inited)
+        {};
+
+        const Type & operator()(void) const
+        {
+            if (!_inited)
+                throw EmptyValue();
+
+            if (!_stored)
+                return *_tmpval;
+
+            return *_stored;
+        };
+
+        const Type &     get(void) const { return operator()(); };
+        bool          loaded(void) const { return _loaded;      };
+
+        void store(const Type val)
+        {
+            if (_tmpval)
+            {
+                delete _tmpval;
+                _tmpval = 0;
+            }
+
+            _tmpval = new Type(val);
+
+            _loaded = true;
+            _inited = true;
+        }
+
+    protected:
+        void unreference(void)
+        {
+            _inited = false;
+            _loaded = false;
+
+            if (_tmpval)
+            {
+                delete _tmpval;
+                _tmpval = 0;
+            }
+
+            if (_stored)
+            {
+                delete _stored;
+                _stored = 0;
+            }
+        };
+
+    protected:
+        void commit(Type def)
+        {
+            if (_tmpval)
+            {
+                {
+                    delete _stored;
+                    _stored = 0;
+                }
+
+                _stored = _tmpval;
+                _tmpval = 0;
+            }
+            else
+            {
+                if (!_stored)
+                    _stored = new Type(def);
+            }
+
+            _loaded = true;
+            _inited = true;
+        };
+
+        void reset(void)
+        {
+            _loaded = false;
+        }
+
+    protected:
+        const Type * _tmpval;
+        const Type * _stored;
+        bool _loaded;
+        bool _inited;
+    };
+
+    struct FunctionValue
+    {
+        friend class InnerFunctionType;
+        friend class Option;
+
+        FunctionValue()
+        : _loaded(false), _inited(false) {};
+
+        virtual ~FunctionValue() {};
+
+    public:
+        virtual void operator()(const StringType & val)
+        {
+            throw Failure("undefined operator() for value");
+        }
+
+        const StringType &     get(void) const
+        {
+            if (!_inited)
+                throw EmptyValue();
+
+            return _stored;
+        };
+
+        bool loaded(void) const { return _loaded; };
+
+    protected:
+        void commit(const StringType def)
+        {
+            if (_tmpval.empty())
+            {
+                _stored = def;
+            }
+            else
+            {
+                _stored = _tmpval;
+                _tmpval.clear();
+            }
+
+            operator()(_stored);
+
+            _loaded = true;
+            _inited = true;
+        };
+
+        void store(const StringType val)
+        {
+            _tmpval = val;
+            _loaded = true;
+            _inited = true;
+        }
+
+        void reset(void)
+        {
+            _loaded = false;
+        }
+
+    private:
+        StringType _tmpval;
+        StringType _stored;
+        bool _loaded;
+        bool _inited;
+    };
+
+    /* NOTE: we use a non-templated classe to place this functions inside the .cpp */
+    struct Restriction
+    {
+        static void checkRange(const std::string & name,     const SIntType value, const Range < SIntType > & range);
+        static void checkRange(const std::string & name,     const UIntType value, const Range < UIntType > & range);
+        static void checkStringSet(const std::string & name, const StringType & value, const StringSet & allowed);
+    };
+
+    template < typename Type >
+    struct InnerOptionBase
+    {
+        typedef Variable < Value < Type > > MemberValue;
+
+        InnerOptionBase(const std::string name, MemberValue option, const Type defvalue)
+        : _name(name), _option(option), _default(defvalue) {};
+
+        template < typename Object >
+        void reset(Object * const obj) const
+        {
+            _option(obj).reset();
+        }
+
+        template < typename Object >
+        const Type & get(const Object * const obj) const
+        {
+            return _option(obj).get();
+        }
+
+        template < typename Object >
+        bool loaded(const Object * const obj) const
+        {
+            return _option(obj).loaded();
+        }
+
+    protected:
+        const std::string   _name;
+        MemberValue         _option;
+        const Type          _default;
+    };
+
+    template < >
+    struct InnerOption < SIntType >: public InnerOptionBase < SIntType >
+    {
+        typedef InnerOptionBase < SIntType >  Super;
+        typedef Super::MemberValue           MemberValue;
+
+        InnerOption(const std::string name, MemberValue option, const SIntType defval,
+                    const SIntType min, const SIntType max, const SIntType step)
+        : Super(name, option, defval), _range(min, max, step) {};
+
+        template < typename Object >
+        void commit(Object * const obj) const
+        {
+            Restriction::checkRange(_name, _default, _range);
+            _option(obj).commit(_default);
+        };
+
+        template < typename Object >
+        void store(Object * const obj, const SIntType stored) const
+        {
+            Restriction::checkRange(_name, _default, _range);
+            _option(obj).store(stored);
+        }
+
+        using Super::reset;
+        using Super::get;
+
+        const Range< SIntType >  _range;
+    };
+
+    template < >
+    struct InnerOption < UIntType >: public InnerOptionBase < UIntType >
+    {
+        typedef InnerOptionBase < UIntType >  Super;
+        typedef Super::MemberValue                 MemberValue;
+
+        InnerOption(const std::string name, MemberValue option, const UIntType defval,
+                    const UIntType min, const UIntType max, const UIntType step)
+        : Super(name, option, defval), _range(min, max, step) {};
+
+        template < typename Object >
+        void commit(Object * const obj) const
+        {
+            Restriction::checkRange(_name, _default, _range);
+            _option(obj).commit(_default);
+        };
+
+        template < typename Object >
+        void store(Object * const obj, const UIntType stored) const
+        {
+            Restriction::checkRange(_name, _default, _range);
+            _option(obj).store(stored);
+        }
+
+        using Super::reset;
+        using Super::get;
+
+        const Range< UIntType >  _range;
+    };
+
+    template < >
+    struct InnerOption < BooleanType >: public InnerOptionBase < BooleanType >
+    {
+        typedef InnerOptionBase < BooleanType >  Super;
+        typedef Super::MemberValue                    MemberValue;
+
+        InnerOption(std::string name, MemberValue option, BooleanType defval)
+        : Super(name, option, defval) {};
+
+        template < typename Object >
+        void commit(Object * obj) const
+        {
+            _option(obj).commit(_default);
+        };
+
+        template < typename Object >
+        void store(Object * obj, BooleanType stored) const
+        {
+            _option(obj).store(stored);
+        }
+
+        using Super::reset;
+        using Super::get;
+    };
+
+    template < >
+    struct InnerOption < StringType >: public InnerOptionBase < StringType >
+    {
+        typedef InnerOptionBase < StringType >  Super;
+        typedef Super::MemberValue              MemberValue;
+
+        InnerOption(const std::string name, MemberValue option, const StringType defval, const StringSet & allowed)
+        : Super(name, option, defval), _allowed(allowed) {};
+
+        InnerOption(const std::string name, MemberValue option, const StringType defval)
+        : Super(name, option, defval) {};
+
+        template < typename Object >
+        void commit(Object * const obj) const
+        {
+            Restriction::checkStringSet(_name, _default, _allowed);
+            _option(obj).commit(_default);
+        };
+
+        template < typename Object >
+        void store(Object * const obj, const StringType stored) const
+        {
+            Restriction::checkStringSet(_name, _default, _allowed);
+            _option(obj).store(stored);
+        }
+
+        using Super::reset;
+        using Super::get;
+
+        const StringSet _allowed;
+    };
+
+    struct InnerFunctionType
+    {
+        typedef Variable < FunctionValue > MemberValue;
+
+        InnerFunctionType(const std::string name, MemberValue option, const StringType defval, const StringSet & allowed)
+        : _name(name), _option(option), _default(defval), _allowed(allowed) {};
+
+        InnerFunctionType(const std::string name, MemberValue option, const StringType defval)
+        : _name(name), _option(option), _default(defval) {};
+
+        template < typename Object >
+        const StringType & get(const Object * const obj) const
+        {
+            return _option(obj).get();
+        }
+
+        template < typename Object >
+        bool loaded(const Object * const obj) const
+        {
+            return _option(obj).loaded();
+        }
+
+        template < typename Object >
+        void reset(Object * const obj) const
+        {
+            _option(obj).reset();
+        }
+
+        template < typename Object >
+        void commit(Object * const obj) const
+        {
+            Restriction::checkStringSet(_name, _default, _allowed);
+            _option(obj).commit(_default);
+        };
+
+        template < typename Object >
+        void store(Object * const obj, const StringType stored) const
+        {
+            Restriction::checkStringSet(_name, _default, _allowed);
+            _option(obj).store(stored);
+        }
+
+    protected:
+        const std::string   _name;
+        MemberValue         _option;
+        const StringType    _default;
+
+    public:
+        const StringSet     _allowed;
+    };
+
+    struct Option
+    {
+        typedef InnerOption < SIntType >        InnerSIntType;
+        typedef InnerOption < UIntType >        InnerUIntType;
+        typedef InnerOption < BooleanType >  InnerBooleanType;
+        typedef InnerOption < StringType >    InnerStringType;
+
+        typedef Variable < Value < SIntType > >         SIntMemberType;
+        typedef Variable < Value < UIntType > >         UIntMemberType;
+        typedef Variable < Value < BooleanType > >   BooleanMemberType;
+        typedef Variable < Value < StringType > >     StringMemberType;
+
+        typedef Variable < FunctionValue >          FunctionMemberType;
+
+        typedef Tagged::Union < InnerStringType,
+                Tagged::Union < InnerBooleanType,
+                Tagged::Union < InnerSIntType ,
+                Tagged::Union < InnerUIntType,
+                Tagged::Union < InnerFunctionType > > > > >
+            InnerType;
+
+        explicit Option(std::string, StringMemberType,   const StringType, StringSet & allowed, bool listme = true);
+        explicit Option(std::string, StringMemberType,   const StringType = "", bool listme = true);
+        explicit Option(std::string, SIntMemberType,     const SIntType = 0, SIntType min =  INT_MIN, SIntType max =  INT_MAX, SIntType step = 1, bool listme = true);
+        explicit Option(std::string, UIntMemberType,     const UIntType = 0, UIntType min = 0, UIntType max = UINT_MAX, UIntType step = 1, bool listme = true);
+        explicit Option(std::string, BooleanMemberType,  const BooleanType = false, bool listme = true);
+
+        explicit Option(std::string, FunctionMemberType, const StringType, StringSet & allowed, bool listme = true);
+        explicit Option(std::string, FunctionMemberType, const StringType = "", bool listme = true);
+
+        Option(const Option & o);
+
+        ~Option(void);
+
+        template < typename Object >
+        void set(Object * object, std::string value)
+        {
+            try
+            {
+                /**/ if (_option.check<InnerFunctionType>()) _option.get<InnerFunctionType>().store(object, value);
+                else if (_option.check<InnerStringType>())   _option.get<InnerStringType>().store(object, value);
+                else if (_option.check<InnerBooleanType>())  _option.get<InnerBooleanType>().store(object, Strings::toboolean(value));
+                else if (_option.check<InnerSIntType>())     _option.get<InnerSIntType>().store(object, Strings::tolong(value));
+                else if (_option.check<InnerUIntType>())     _option.get<InnerUIntType>().store(object, Strings::toulong(value));
+                else
+                {
+                    throw Failure(STG(FMT("set() not implemented for type used in option '%s'") % _myname));
+                }
+            }
+            catch (Strings::invalid_value & e)
+            {
+                throw Failure(STG(FMT("got invalid value '%s' for option '%s'") % value % _myname));
+            }
+            catch (EmptyVariable & e)
+            {
+                throw Failure(STG(FMT("uninitialized variable while setting value '%s' for option '%s'") % value % _myname));
+            }
+        }
+
+        template < typename Object >
+        std::string get(const Object * const object) const
+        {
+            try
+            {
+                /**/ if (_option.check<InnerFunctionType>()) return _option.get<InnerFunctionType>().get(object);
+                else if (_option.check<InnerStringType>())   return _option.get<InnerStringType>().get(object);
+                else if (_option.check<InnerBooleanType>())  return (_option.get<InnerBooleanType>().get(object) ? "yes" : "no");
+                else if (_option.check<InnerSIntType>())     return STG(FMT("%d") % _option.get<InnerSIntType>().get(object));
+                else if (_option.check<InnerUIntType>())     return STG(FMT("%u") % _option.get<InnerUIntType>().get(object));
+                else
+                {
+                    throw Failure(STG(FMT("get() not implemented for type used in option '%s'") % _myname));
+                }
+            }
+            catch (EmptyVariable & e)
+            {
+                throw Failure(STG(FMT("uninitialized variable while getting value for option '%s'") % _myname));
+            }
+        }
+
+        template < typename Object >
+        bool loaded(const Object * const object) const
+        {
+            try
+            {
+                /**/ if (_option.check<InnerFunctionType>()) return _option.get<InnerFunctionType>().loaded(object);
+                else if (_option.check<InnerBooleanType>())  return _option.get<InnerBooleanType>().loaded(object);
+                else if (_option.check<InnerStringType>())   return _option.get<InnerStringType>().loaded(object);
+                else if (_option.check<InnerSIntType>())     return _option.get<InnerSIntType>().loaded(object);
+                else if (_option.check<InnerUIntType>())     return _option.get<InnerUIntType>().loaded(object);
+                else
+                {
+                    throw Failure(STG(FMT("loaded() not implemented for type used in option '%s'") % _myname));
+                }
+            }
+            catch (EmptyVariable & e)
+            {
+                throw Failure(STG(FMT("uninitialized variable while checking load status for option '%s'") % _myname));
+            }
+        }
+
+        template < typename Object >
+        void reset(Object * const object)
+        {
+            try
+            {
+                /**/ if (_option.check<InnerFunctionType>()) _option.get<InnerFunctionType>().reset(object);
+                else if (_option.check<InnerBooleanType>())  _option.get<InnerBooleanType>().reset(object);
+                else if (_option.check<InnerStringType>())   _option.get<InnerStringType>().reset(object);
+                else if (_option.check<InnerSIntType>())     _option.get<InnerSIntType>().reset(object);
+                else if (_option.check<InnerUIntType>())     _option.get<InnerUIntType>().reset(object);
+                else
+                {
+                    throw Failure(STG(FMT("reset() not implemented for type used in option '%s'") % _myname));
+                }
+            }
+            catch (EmptyVariable & e)
+            {
+                throw Failure(STG(FMT("uninitialized variable while reseting status for option '%s'") % _myname));
+            }
+        }
+
+        template < typename Object >
+        void commit(Object * const object)
+        {
+            try
+            {
+                /**/ if (_option.check<InnerFunctionType>()) _option.get<InnerFunctionType>().commit(object);
+                else if (_option.check<InnerBooleanType>())  _option.get<InnerBooleanType>().commit(object);
+                else if (_option.check<InnerStringType>())   _option.get<InnerStringType>().commit(object);
+                else if (_option.check<InnerSIntType>())     _option.get<InnerSIntType>().commit(object);
+                else if (_option.check<InnerUIntType>())     _option.get<InnerUIntType>().commit(object);
+                else
+                {
+                    throw Failure(STG(FMT("commit() not implemented for type used in option '%s'") % _myname));
+                }
+            }
+            catch (EmptyVariable & e)
+            {
+                throw Failure(STG(FMT("uninitialized variable while commiting option '%s'") % _myname));
+            }
+        }
+
+        const std::string &   name(void) const { return _myname; }
+        bool                listme(void) const { return _listme; };
+
+        const char **       values(void);
+
+        template < typename Object >
+        void                copyFrom(const Object * const srcobj, Object * const dstobj, bool force = false)
+        {
+            if (loaded(dstobj) && !force)
+                return;
+
+            if (loaded(srcobj))
+                set(dstobj, get(srcobj));
+            else
+                reset(dstobj);
+        }
+
+    protected:
+        const std::string  _myname;
+        InnerType          _option;
+        const bool         _listme;
+        const char **      _values;
+    };
+
+    struct Options
+    {
+        typedef std::vector < std::string >    Messages;
+
+        Options();
+        ~Options();
+
+        typedef std::set < std::string >  StringSet;
+
+        typedef std::map  < std::string, Option >   OptionMap;
+        typedef std::pair < std::string, Option >  OptionPair;
+
+        typedef std::map  < std::string, std::string >   SynOptionMap;
+        typedef std::pair < std::string, std::string >  SynOptionPair;
+
+        bool add(Option option);
+
+        /* only valid in "process" (for backwards compatibility config files) */
+        bool synonym(std::string, std::string);
+
+        template < typename Type >
+        void set(const std::string & name, Type value)
+        {
+            OptionMap::iterator iter = find_option(name);
+
+            if (iter == _map.end())
+                throw Failure(STG(FMT("unknown option: %s") % name));
+
+            iter->second.set(value);
+        }
+
+        template < typename Object >
+        std::string get(const Object * const object, const std::string & name)
+        {
+            OptionMap::iterator iter = find_option(name);
+
+            if (iter == _map.end())
+                throw Failure(STG(FMT("unknown option: %s") % name));
+
+            return iter->second.get(object);
+        }
+
+        template < typename Object >
+        void process(Object * const object, const char * name, const char * value)
+        {
+            OptionMap::iterator iter = find_option(name);
+
+            if (iter == _map.end())
+                throw Failure(STG(FMT("unknown option '%s'") % name));
+
+            iter->second.set(object, value);
+        }
+
+        template < typename Object >
+        Messages commit(Object * const object)
+        {
+            Messages msgs;
+
+            for (OptionMap::iterator i = _map.begin(); i != _map.end(); ++i)
+            {
+                try
+                {
+                    i->second.commit(object);
+                }
+                catch (Failure & e)
+                {
+                    msgs.push_back(e.what());
+                }
+            }
+
+            return msgs;
+        }
+
+        template < typename Object >
+        void reset(Object * object)
+        {
+            for (OptionMap::iterator i = _map.begin(); i != _map.end(); ++i)
+                i->second.reset(object);
+        }
+
+        template < typename Object >
+        bool loaded(Object * object, std::string name)
+        {
+            OptionMap::iterator iter = find_option(name);
+
+            if (iter == _map.end())
+                return false;
+
+            return iter->second.loaded(object);
+        }
+
+        bool exists(const std::string & name)
+        {
+            OptionMap::iterator iter = find_option(name);
+
+            return (iter != _map.end());
+        }
+
+        StringSet options(void);
+
+        const char ** values(const char *); /* option value */
+        const char ** values(void);         /* values from options */
+
+        template < typename Object >
+        void copyFrom(const std::string & name, const Object * const src_obj, Object * const dst_obj, bool force = false)
+        {
+            OptionMap::iterator iter = find_option(name);
+
+            if (iter == _map.end())
+                throw Failure(STG(FMT("unknown option '%s'") % name));
+
+            iter->second.copyFrom(src_obj, dst_obj, force);
+        }
+
+        template < typename Object >
+        void copyFrom(Object * src_obj, Object * dst_obj, bool force = false)
+        {
+            for (OptionMap::iterator iter = _map.begin(); iter != _map.end(); ++iter)
+                iter->second.copyFrom(src_obj, dst_obj, force);
+        }
+
+    protected:
+        OptionMap::iterator find_option(std::string);
+
+    protected:
+        OptionMap      _map;
+        SynOptionMap   _syn_map;
+
+        const char **  _values;
+    };
+};
+
+#endif /* _CONFIG_OPTIONS_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/configurator/configfile.cpp b/src/mod/endpoints/mod_khomp/commons/base/configurator/configfile.cpp
new file mode 100644
index 0000000000..8a46587a59
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/base/configurator/configfile.cpp
@@ -0,0 +1,241 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  The contents of this file are subject to the Mozilla Public License Version 1.1
+  (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.mozilla.org/MPL/
+
+  Software distributed under the License is distributed on an "AS IS" basis,
+  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+  the specific language governing rights and limitations under the License.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+#include <errno.h>
+
+#include <configurator/configfile.hpp>
+
+#if _MSC_VER >= 1400
+#undef close
+#endif
+
+void Configfile::ignore(const std::string & str)
+{
+    _ignores.insert(str);
+};
+
+bool Configfile::select(Section **ptr, const std::string & str)
+{
+    /* default section == this! */
+    *ptr = this;
+
+    /* always success by default */
+    return true;
+};
+
+bool Configfile::adjust(Section * section, const std::string & opt, const std::string & val)
+{
+    return section->load(opt, val);
+};
+
+bool Configfile::deserialize(std::ifstream & fd)
+{
+    Section * section = NULL;
+
+    /* default selection! */
+    if (!select(&section))
+    {
+        _errors.push_back("default selection has failed!");
+        return false;
+    }
+
+    size_t count = 0;
+
+    while (fd.good())
+    {
+        std::string str;
+
+        /* read one line! */
+        std::getline(fd, str);
+
+        size_t lst = str.size() - 1;
+
+        if (str.size() >= 1 && str[lst] == '\r') //cuida das quebras de linha do tipo \r\n
+        {
+            str.erase(lst,1);
+            --lst;
+        }
+
+        /* empty line! */
+        if (str.size() == 0)
+            continue;
+
+        /* comment! */
+        if (str[0] == '#')
+            continue;
+
+        ++count;
+
+        if (str[0] == '[' && str[lst] == ']')
+        {
+            str.erase(0,1);   --lst;
+            str.erase(lst,1); --lst;
+
+            if (!select(&section, str))
+            {
+                _errors.push_back(STG(FMT("erroneous section '%s'") % str));
+
+                /* ignore this section */
+                section = NULL;
+                continue;
+            }
+        }
+        else
+        {
+            std::string::size_type pos = str.find('=');
+
+            if (pos == std::string::npos)
+            {
+                _errors.push_back(STG(FMT("erroneous separator '%s'") % str));
+                continue;
+            };
+
+            if (section == NULL)
+            {
+                _errors.push_back(STG(FMT("no section for option '%s'") % str));
+                continue;
+            }
+
+            std::string  opt(str.substr(0,pos));
+            std::string  val(str.substr(pos+1));
+
+            if (_ignores.find(opt) != _ignores.end())
+                continue;
+
+            if (val == "@") val = "";
+
+            if (adjust(section, opt, val))
+                continue;
+
+            _errors.push_back(STG(FMT("option '%s' does "
+                "not exist or '%s' is not a valid value (at section '%s')")
+                % opt % val % section->name()));
+        }
+    }
+
+    // retorna 'true' se arquivo tinha alguma coisa valida.
+    return (count != 0);
+}
+
+bool Configfile::obtain()
+{
+    std::ifstream fd(_filename.c_str());
+
+    if (!fd.is_open())
+    {
+        _errors.push_back(STG(FMT("unable to open file '%s': %s")
+            % _filename % strerror(errno)));
+        return false;
+    };
+
+    if (!deserialize(fd))
+    {
+        fd.close();
+        return false;
+    }
+
+    fd.close();
+    return true;
+};
+
+void Configfile::recurse(std::ofstream & fd, Section * section)
+{
+    typedef Section::SectionMap::const_iterator SectionIter;
+    typedef Section::OptionMap::const_iterator  OptionIter;
+
+    for (OptionIter i = section->option_begin(); i != section->option_end(); i++)
+    {
+        std::string res;
+
+        if ((*i).second.store(res))
+        {
+            if (res == "") res = "@";
+            fd << (*i).first << "=" << res << std::endl;
+        }
+    }
+
+    if (!section->recursive())
+        return;
+
+    for (SectionIter j = section->section_begin(); j != section->section_end(); j++)
+        recurse(fd, (*j).second);
+}
+
+bool Configfile::serialize(std::ofstream & fd)
+{
+    recurse(fd, this);
+    return true;
+}
+
+bool Configfile::provide()
+{
+    std::string tmp(_filename);
+    tmp += ".new";
+
+    std::ofstream fd(tmp.c_str());
+
+    if (!fd.good())
+    {
+        _errors.push_back(STG(FMT("unable to open file '%s': %s")
+            % tmp % strerror(errno)));
+        return false;
+    }
+
+    if (!serialize(fd))
+    {
+        fd.close();
+        return false;
+    }
+
+    fd.close();
+
+    if (rename(tmp.c_str(), _filename.c_str()) != 0)
+    {
+        _errors.push_back(STG(FMT("unable to replace config file '%s': %s")
+            % _filename % strerror(errno)));
+        return false;
+    }
+
+    return true;
+}
+
+#if _MSC_VER >= 1400
+#define close _close
+#endif
diff --git a/src/mod/endpoints/mod_khomp/commons/configurator/configfile.hpp b/src/mod/endpoints/mod_khomp/commons/base/configurator/configfile.hpp
similarity index 65%
rename from src/mod/endpoints/mod_khomp/commons/configurator/configfile.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/configurator/configfile.hpp
index 61f42469af..e725c09964 100644
--- a/src/mod/endpoints/mod_khomp/commons/configurator/configfile.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/configurator/configfile.hpp
@@ -1,7 +1,7 @@
-/*  
+/*
     KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.  
-  
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
   The contents of this file are subject to the Mozilla Public License Version 1.1
   (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.mozilla.org/MPL/
@@ -23,20 +23,20 @@
 
   The LGPL header follows below:
 
-    This library is free software; you can redistribute it and/or  
-    modify it under the terms of the GNU Lesser General Public  
-    License as published by the Free Software Foundation; either  
-    version 2.1 of the License, or (at your option) any later version.  
-  
-    This library is distributed in the hope that it will be useful,  
-    but WITHOUT ANY WARRANTY; without even the implied warranty of  
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
-    Lesser General Public License for more details.  
-  
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
     You should have received a copy of the GNU Lesser General Public License
     along with this library; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
-  
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <vector>
@@ -53,38 +53,38 @@
 
 struct Configfile: public Section
 {
-	typedef std::list < std::string > ErrorVector;
-	typedef std::set < std::string >  NameSet;
+    typedef std::list < std::string >  ErrorVector;
+    typedef std::set  < std::string >  NameSet;
 
-	Configfile(std::string name, std::string desc)
-	: Section(name, desc), _good(false) {};
+    Configfile(const std::string & name, const std::string & desc)
+    : Section(name, desc), _good(false) {};
 
-	virtual ~Configfile() {};
+    virtual ~Configfile() {};
 
-	bool                good() { return _good;     };
-	std::string &   filename() { return _filename; };
+    bool                      good() const { return _good;     };
+    const std::string &   filename() const { return _filename; };
 
-	ErrorVector &     errors() { return _errors;   };
+    const ErrorVector &     errors() const { return _errors;   };
 
-	void ignore(std::string);
+    void ignore(const std::string &);
 
-	virtual bool obtain();
-	virtual bool provide();
+    virtual bool obtain();
+    virtual bool provide();
 
  protected:
-	virtual bool select(Section **, std::string str = "");
-	virtual bool adjust(Section *, std::string & opt, std::string & val);
+    virtual bool select(Section **, const std::string & str = "");
+    virtual bool adjust(Section *, const std::string & opt, const std::string & val);
 
-	virtual bool deserialize(std::ifstream &);
-	virtual bool serialize(std::ofstream &);
+    virtual bool deserialize(std::ifstream &);
+    virtual bool serialize(std::ofstream &);
 
-	void recurse(std::ofstream &, Section *);
+    void recurse(std::ofstream &, Section *);
 
  protected:
-	bool             _good;
-	ErrorVector      _errors;
-	NameSet          _ignores;
-	std::string      _filename;
+    bool         _good;
+    ErrorVector  _errors;
+    NameSet      _ignores;
+    std::string  _filename;
 };
 
 #endif /* _CONFIG_CONFIGFILE_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/configurator/option.cpp b/src/mod/endpoints/mod_khomp/commons/base/configurator/option.cpp
new file mode 100644
index 0000000000..6de9212bf3
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/base/configurator/option.cpp
@@ -0,0 +1,186 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  The contents of this file are subject to the Mozilla Public License Version 1.1
+  (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.mozilla.org/MPL/
+
+  Software distributed under the License is distributed on an "AS IS" basis,
+  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+  the specific language governing rights and limitations under the License.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <configurator/option.hpp>
+
+bool Option::equals(const std::string & value) const
+{
+    switch (_restriction.numeral())
+    {
+        case Restriction::N_UNIQUE:
+        {
+            Restriction::Value my_value;
+
+            if (!_restriction.get(Restriction::F_USER, my_value))
+                return false;
+
+            return (my_value == value);
+        }
+        case Restriction::N_MULTIPLE:
+        {
+            Restriction::Vector my_values;
+
+            if (!_restriction.get(Restriction::F_USER, my_values))
+                return false;
+
+            for (Restriction::Vector::iterator i = my_values.begin(); i != my_values.end(); i++)
+            {
+                if ((*i) == value)
+                    return true;
+            }
+
+            return false;
+        }
+    }
+
+    return false;
+}
+
+bool Option::load(const std::string & value)
+{
+    bool ret = _restriction.set( (const Restriction::Format)Restriction::F_FILE, value);
+
+    if (ret) _modified = false;
+
+    return ret;
+}
+
+bool Option::change(const std::string & value)
+{
+    bool ret = _restriction.set(Restriction::F_FILE, value);
+
+    if (ret) _modified = true;
+
+    return ret;
+}
+
+bool Option::store(std::string & value) const
+{
+    switch  (_restriction.numeral())
+    {
+        case Restriction::N_UNIQUE:
+            return _restriction.get(Restriction::F_FILE, value);
+
+        case Restriction::N_MULTIPLE:
+        {
+            Restriction::Vector values;
+
+            if (!_restriction.get(Restriction::F_FILE, values))
+                return false;
+
+            Strings::Merger strs;
+
+            for (Restriction::Vector::iterator i = values.begin(); i != values.end(); i++)
+                strs.add(*i);
+
+            value = strs.merge(",");
+
+            return true;
+        }
+
+        default:
+            return false;
+    }
+}
+
+/*
+Option::Flags Option::set(const char * value)
+{
+    std::string str_value(value);
+    return set(str_value);
+}
+*/
+
+Option::Flags Option::set(const Restriction::Value & value)
+{
+    Restriction::Value  last_value, curr_value;
+    Flags               flags;
+
+    bool ret1 = _restriction.get(Restriction::F_USER, last_value);
+
+    if (!_restriction.set(Restriction::F_USER, value))
+        return flags;
+
+    flags[F_ADJUSTED] = true;
+
+    bool ret2 = _restriction.get(Restriction::F_USER, curr_value);
+
+    if (!ret1 || (ret2 && (last_value != curr_value)))
+    {
+        flags[F_MODIFIED] = true;
+        _modified = true;
+    }
+
+    return flags;
+}
+
+Option::Flags Option::set(const Restriction::Vector & values)
+{
+    Restriction::Vector  last_values, curr_values;
+    Flags                flags;
+
+    bool ret1 = _restriction.get(Restriction::F_USER, last_values);
+
+    if (!_restriction.set(Restriction::F_USER, values))
+        return flags;
+
+    flags[F_ADJUSTED] = true;
+
+    bool ret2 = _restriction.get(Restriction::F_USER, curr_values);
+
+    if (!ret1 || (ret2 && (last_values != curr_values)))
+    {
+        flags[F_MODIFIED] = true;
+        _modified = true;
+    }
+
+    return flags;
+}
+
+bool Option::get(Restriction::Value & value) const
+{
+    return _restriction.get(Restriction::F_USER, value);
+}
+
+bool Option::get(Restriction::Vector & values) const
+{
+    return _restriction.get(Restriction::F_USER, values);
+}
diff --git a/src/mod/endpoints/mod_khomp/commons/configurator/option.hpp b/src/mod/endpoints/mod_khomp/commons/base/configurator/option.hpp
similarity index 52%
rename from src/mod/endpoints/mod_khomp/commons/configurator/option.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/configurator/option.hpp
index 8aa103a0cc..e46ab75902 100644
--- a/src/mod/endpoints/mod_khomp/commons/configurator/option.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/configurator/option.hpp
@@ -1,7 +1,7 @@
-/*  
+/*
     KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.  
-  
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
   The contents of this file are subject to the Mozilla Public License Version 1.1
   (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.mozilla.org/MPL/
@@ -23,20 +23,20 @@
 
   The LGPL header follows below:
 
-    This library is free software; you can redistribute it and/or  
-    modify it under the terms of the GNU Lesser General Public  
-    License as published by the Free Software Foundation; either  
-    version 2.1 of the License, or (at your option) any later version.  
-  
-    This library is distributed in the hope that it will be useful,  
-    but WITHOUT ANY WARRANTY; without even the implied warranty of  
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
-    Lesser General Public License for more details.  
-  
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
     You should have received a copy of the GNU Lesser General Public License
     along with this library; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
-  
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <iostream>
@@ -45,6 +45,7 @@
 #include <list>
 #include <vector>
 
+#include <format.hpp>
 #include <strings.hpp>
 
 #include <configurator/restriction.hpp>
@@ -56,67 +57,72 @@ struct Option
 {
     enum FlagTypes
     {
-		F_MODIFIED = 0x0, /* if option was modified */
-		F_ADJUSTED = 0x1, /* if option was correctly formated */
+        F_MODIFIED = 0x0, /* if option was modified */
+        F_ADJUSTED = 0x1, /* if option was correctly formated */
     };
 
-	struct Flags: public std::vector<bool>
-	{
-		Flags(): std::vector<bool>(2) {};
-	};
+    struct Flags: public std::vector<bool>
+    {
+        Flags(): std::vector<bool>(2) {};
+    };
 
-	typedef Restriction::Value   Value;
-	typedef Restriction::Vector Vector;
+    typedef Restriction::Value   Value;
+    typedef Restriction::Vector Vector;
 
     /* exception */
-    struct InvalidDefaultValue
+    struct InvalidDefaultValue: public std::runtime_error
     {
-        InvalidDefaultValue(std::string name, std::string value)
-        : _name(name), _value(value) {};
+        InvalidDefaultValue(const std::string & name, const std::string & value)
+        : std::runtime_error(STG(FMT("invalid default value '%s' for option '%s'") % value % name)),
+           _name(name), _value(value)
+        {};
 
-        std::string &  name() { return _name;  };
-        std::string & value() { return _value; };
+        ~InvalidDefaultValue() throw ()
+        {};
+
+        const std::string &  name() const { return _name;  };
+        const std::string & value() const { return _value; };
 
       protected:
-        std::string _name;
-        std::string _value;
+        const std::string _name;
+        const std::string _value;
     };
 
-	Option(std::string name, std::string desc, std::string defvalue, Restriction restriction)
-	: _name(name), _desc(desc), _restriction(restriction), _modified(true)
-	{
-		std::string value(defvalue);
+    Option(const std::string & name, const std::string & desc, const std::string & defvalue, const Restriction & restriction)
+    : _name(name), _description(desc), _restriction(restriction), _modified(true)
+    {
+//        std::string value(defvalue);
 
-		if (!(set(value)[F_ADJUSTED]))
+        if (!(set(defvalue)[F_ADJUSTED]))
             throw InvalidDefaultValue(name, defvalue);
-	}
+    }
 
-	const std::string & name()        { return _name; };
-	const std::string & description() { return _desc; };
+    const std::string &        name() const { return _name;        };
+    const std::string & description() const { return _description; };
 
-	Restriction       & restriction() { return _restriction; };
-	bool                modified()    { return _modified;    };
+    const Restriction & restriction() const { return _restriction; };
+    bool                   modified() const { return _modified;    };
 
  public:
-	bool    load(std::string &);
-	bool    change(std::string &);
-	bool    store(std::string &);
+    bool    load(const std::string &);
+    bool  change(const std::string &);
+    bool   store(std::string &) const;
 
-	Flags   set(const char  *);
-	Flags   set(Value  &);
-	Flags   set(Vector &);
+//    Flags   set(const char  *);
+    Flags   set(const Value  &);
+    Flags   set(const Vector &);
 
-	bool    get(Value  &);
-	bool    get(Vector &);
+    bool    get(Value  &) const;
+    bool    get(Vector &) const;
 
-	bool    equals(std::string &);
+    bool    equals(const std::string &) const;
 
  protected:
-	std::string   _name;
-	std::string   _desc;
+    const std::string   _name;
+    const std::string   _description;
 
-	Restriction   _restriction;
-	bool          _modified;
+    Restriction         _restriction;
+    bool                _modified;
 };
 
 #endif /* _CONFIG_OPTION_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/configurator/restriction.cpp b/src/mod/endpoints/mod_khomp/commons/base/configurator/restriction.cpp
new file mode 100644
index 0000000000..52be1ea881
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/base/configurator/restriction.cpp
@@ -0,0 +1,358 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  The contents of this file are subject to the Mozilla Public License Version 1.1
+  (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.mozilla.org/MPL/
+
+  Software distributed under the License is distributed on an "AS IS" basis,
+  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+  the specific language governing rights and limitations under the License.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <math.h>
+#include <string.h>
+
+#include <iostream>
+#include <strings.hpp>
+
+#include <configurator/restriction.hpp>
+
+/* internal helper! */
+bool Restriction::equalNumber(const double a, const double b)
+{
+    char tmp1[64];
+    char tmp2[64];
+
+    snprintf(tmp1, sizeof(tmp1), "%.3f", a);
+    snprintf(tmp2, sizeof(tmp2), "%.3f", b);
+
+    if (strncmp(tmp1, tmp2, sizeof(tmp1)))
+        return false;
+
+    return true;
+}
+
+/* process value to our internal representation */
+
+bool Restriction::process(Restriction::Format fmt,
+        const Restriction::Value & value, Restriction::Value & final) const
+{
+    switch (_bounds)
+    {
+        case B_RANGE:
+        {
+            if (_kind != K_NUMBER)
+                return false;
+
+            std::string tmpvalue;
+
+            Restriction::Value::const_iterator itr = value.begin();
+            Restriction::Value::const_iterator end = value.end();
+
+            tmpvalue.reserve(value.size());
+
+            // f*cking dot/comma notation!
+            for (; itr != end; ++itr)
+                tmpvalue += ((*itr) != ',' ? (*itr) : '.');
+
+            try
+            {
+                double newvalue = Strings::todouble(tmpvalue);
+
+                if (newvalue < _init && newvalue > _fini)
+                    return false;
+
+                double res = (newvalue - _init) / _step;
+
+                if (!Restriction::equalNumber(res, rint(res)))
+                    return false;
+
+                final = value;
+                return true;
+            }
+            catch (...)
+            {
+                return false;
+            }
+        }
+
+        case B_LIST:
+            for (List::const_iterator i = _list.begin(); i != _list.end(); i++)
+            {
+                const Value & tmp = (*i);
+
+                if (tmp == value)
+                {
+                    final = value;
+                    return true;
+                }
+            }
+            return false;
+
+        case B_MAPS:
+            switch (fmt)
+            {
+                case F_USER:
+                {
+                    Map::const_iterator i = _map_from_usr.find(value);
+
+                    if (i == _map_from_usr.end())
+                        return false;
+
+                    const Value & tmp = (*i).second;
+
+                    final = tmp;
+                    return true;
+                }
+
+                case F_FILE:
+                {
+                    Map::const_iterator i = _map_from_cfg.find(value);
+
+                    if (i == _map_from_cfg.end())
+                        return false;
+
+                    final = value;
+                    return true;
+                }
+
+                default:
+                    break;
+            }
+            return false;
+
+        case B_FREE:
+            final = value;
+            return true;
+
+        default:
+            break;
+    }
+
+    return false;
+}
+
+/* unprocess the value (outputs the external representation) */
+
+bool Restriction::unprocess(Restriction::Format fmt,
+        const Restriction::Value & value, Restriction::Value & final) const
+{
+    switch (_bounds)
+    {
+        case B_MAPS:
+
+            switch (fmt)
+            {
+                case F_USER:
+                {
+                    Map::const_iterator i = _map_from_cfg.find(value);
+
+                    if (i == _map_from_cfg.end())
+                        return false;
+
+                    final = (*i).second;
+                    return true;
+                }
+                default:
+                    break;
+            }
+
+        default:
+            final = value;
+            return true;
+    }
+}
+
+/***************************** *****************************/
+
+bool Restriction::get(Restriction::Format fmt, Restriction::Value & value) const
+{
+    if (_numeral != N_UNIQUE)
+        return false;
+
+    if (!unprocess(fmt, _value._unique, value))
+        return false;
+
+    return true;
+}
+
+bool Restriction::get(Restriction::Format fmt, Restriction::Vector & values) const
+{
+    if (_numeral != N_MULTIPLE)
+        return false;
+
+    const List & my_values = _value._multiple;
+
+    for (List::const_iterator i = my_values.begin(); i != my_values.end(); i++)
+    {
+        const Value & value = (*i);
+
+        Value   final;
+
+        if (!unprocess(fmt, value, final))
+            return false;
+
+        values.push_back(final);
+    };
+
+    return true;
+}
+
+/***************************** *****************************/
+
+bool Restriction::set(Restriction::Format fmt, const Restriction::Value & value)
+{
+    switch (_numeral)
+    {
+        case N_UNIQUE:
+        {
+            Value final;
+
+            if (!constThis().process(fmt, value, final))
+                return false;
+
+            _value._unique = final;
+            return true;
+        }
+
+        case N_MULTIPLE:
+        {
+            if (value == "@" || value == "#" || value == "")
+            {
+                _value._multiple.clear();
+                return true;
+            }
+
+            Strings::vector_type values;
+            Strings::tokenize(value, values, ",");
+
+            return set(fmt, values);
+        }
+
+        default:
+            return false;
+    }
+}
+
+bool Restriction::set(Restriction::Format fmt, const Restriction::Vector & values)
+{
+    if (_numeral != N_MULTIPLE)
+        return false;
+
+    if (values.empty())
+    {
+        _value._multiple.clear();
+    }
+    else
+    {
+        /* list needed to store temporary values */
+        List finals;
+
+        for (Vector::const_iterator i = values.begin(); i != values.end(); i++)
+        {
+            const Value & value = (*i);
+
+            Value   final;
+
+            if (!constThis().process(fmt, value, final))
+                return false;
+
+            finals.push_back(final);
+        }
+
+        List & lst = _value._multiple;
+
+        /* need to clear values set before */
+        lst.clear();
+
+        for (List::iterator i = finals.begin(); i != finals.end(); i++)
+        {
+            Value value = (*i);
+            lst.push_back(value);
+        }
+    };
+
+    return true;
+}
+
+/***************************** *****************************/
+
+void Restriction::allowed(Restriction::Vector & vals) const
+{
+    switch (_bounds)
+    {
+        case B_FREE:
+            return;
+
+        case B_LIST:
+            for (List::const_iterator i = _list.begin(); i != _list.end(); i++)
+                vals.push_back(*i);
+            break;
+
+        case B_MAPS:
+            for (Map::const_iterator i = _map_from_usr.begin(); i != _map_from_usr.end(); i++)
+                vals.push_back(i->first);
+            break;
+
+        case B_RANGE:
+        {
+            if (_kind != K_NUMBER)
+                return;
+
+            // is there any fraction?
+            bool has_fraction =
+                (!Restriction::equalNumber(_init, rint(_init))) ||
+                (!Restriction::equalNumber(_fini, rint(_fini))) ||
+                (!Restriction::equalNumber(_step, rint(_step)));
+
+            const char * format = (has_fraction ? "%.2f" : "%02.0f");
+
+            for (double i = _init; i <= _fini; i += _step)
+            {
+                char tmp[32];
+                snprintf(tmp, sizeof(tmp), format, i);
+                vals.push_back(std::string(tmp));
+            }
+            break;
+        }
+
+        default:
+            break;
+    }
+}
+
+void Restriction::init_class()
+{
+    _value._unique.clear();
+    _value._multiple.clear();
+}
diff --git a/src/mod/endpoints/mod_khomp/commons/base/configurator/restriction.hpp b/src/mod/endpoints/mod_khomp/commons/base/configurator/restriction.hpp
new file mode 100644
index 0000000000..576560dbd4
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/base/configurator/restriction.hpp
@@ -0,0 +1,269 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  The contents of this file are subject to the Mozilla Public License Version 1.1
+  (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.mozilla.org/MPL/
+
+  Software distributed under the License is distributed on an "AS IS" basis,
+  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+  the specific language governing rights and limitations under the License.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <stdarg.h>
+
+#include <string>
+#include <list>
+#include <vector>
+#include <map>
+
+#include <const_this.hpp>
+
+#ifndef _CONFIG_RESTRICTION_HPP_
+#define _CONFIG_RESTRICTION_HPP_
+
+struct Restriction: public ConstThis < Restriction >
+{
+    /* generic types */
+
+    // TODO: change this type name for something different
+    //       to avoid conflicting with "format.hpp".
+    enum Format
+    {
+        F_USER,
+        F_FILE
+    };
+
+    enum Kind
+    {
+        K_STRING,
+        K_NUMBER // = K_INTEGER // compatibility
+    };
+
+    enum Bounds
+    {
+        B_FREE,
+        B_RANGE,
+        B_LIST,
+        B_MAPS
+    };
+
+    enum Numeral
+    {
+        N_UNIQUE,
+        N_MULTIPLE
+    };
+
+    typedef std::string   Value;
+
+    /* types used for data input */
+    struct Pair
+    {
+        const char *pretty;
+        const char *value;
+    };
+
+    typedef std::pair < Value, Value >   PairMap;
+    typedef std::list < PairMap >        ListMap;
+
+    /* types used internally */
+    typedef std::map < Value, Value >           Map;
+    typedef std::vector < Value >            Vector;
+
+    typedef std::list < Value >                List;
+    typedef std::pair < Value, Value >       MapPair;
+
+    struct Generic
+    {
+        Value _unique;
+        List  _multiple;
+    };
+
+    Restriction(Kind kind, Numeral num)
+    : _kind(kind), _bounds(B_FREE), _numeral(num), _unit(""),
+      _init(-1), _fini(-1), _step(-1)
+    {
+        init_class();
+    }
+
+    Restriction(Kind kind, Numeral num,
+                double init, double fini, double step = 1)
+    : _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(""),
+      _init(init), _fini(fini), _step(step)
+    {
+        init_class();
+    }
+
+    Restriction(Kind kind, Numeral num,
+                const char *unit, double init, double fini, double step = 1.0)
+    : _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(unit),
+      _init(init), _fini(fini), _step(step)
+    {
+        init_class();
+    }
+
+    Restriction(Kind kind, Numeral num,
+                std::string unit, double init, double fini, double step = 1.0)
+    : _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(unit),
+      _init(init), _fini(fini), _step(step)
+    {
+        init_class();
+    }
+
+    Restriction(Kind kind, Numeral num,
+                const char *first, ...)
+    : _kind(kind), _bounds(B_LIST), _numeral(num), _unit(""),
+      _init(-1), _fini(-1), _step(-1)
+    {
+        _list.push_back(std::string(first));
+
+        va_list ap;
+        va_start(ap, first);
+
+        while (true)
+        {
+            const char *arg = va_arg(ap, const char *);
+
+            if (arg == NULL) break;
+
+            _list.push_back(std::string(arg));
+        }
+
+        init_class();
+    }
+
+    Restriction(Kind kind, const char *unit, Numeral num,
+                const char *first, ...)
+    : _kind(kind), _bounds(B_LIST), _numeral(num), _unit(unit),
+      _init(-1), _fini(-1), _step(-1)
+    {
+        _list.push_back(std::string(first));
+
+        va_list ap;
+        va_start(ap, first);
+
+        while (true)
+        {
+            const char *arg = va_arg(ap, const char *);
+
+            if (arg == NULL) break;
+
+            _list.push_back(std::string(arg));
+        }
+
+        init_class();
+    }
+
+    Restriction(Kind kind, Numeral num,
+                const struct Pair first, ...)
+    : _kind(kind), _bounds(B_MAPS), _numeral(num), _unit(""),
+      _init(-1), _fini(-1), _step(-1)
+    {
+        _map_from_usr.insert(MapPair(Value(first.pretty), Value(first.value)));
+        _map_from_cfg.insert(MapPair(Value(first.value), Value(first.pretty)));
+
+        va_list ap;
+        va_start(ap, first);
+
+        while (true)
+        {
+            Pair arg = va_arg(ap, Pair);
+
+            if (arg.pretty == NULL) break;
+
+            _map_from_usr.insert(MapPair(Value(arg.pretty), Value(arg.value)));
+            _map_from_cfg.insert(MapPair(Value(arg.value), Value(arg.pretty)));
+        }
+
+        init_class();
+    }
+
+    Restriction(Kind kind, Numeral num, List list)
+    : _kind(kind), _bounds(B_LIST), _numeral(num), _unit(""),
+      _init(-1), _fini(-1), _step(-1), _list(list)
+    {
+        init_class();
+    }
+
+    Restriction(Kind kind, Numeral num, ListMap map)
+    : _kind(kind), _bounds(B_MAPS), _numeral(num), _unit(""),
+      _init(-1), _fini(-1), _step(-1)
+    {
+        for (ListMap::iterator i = map.begin(); i != map.end(); i++)
+        {
+            _map_from_usr.insert(MapPair(Value((*i).first), Value((*i).second)));
+            _map_from_cfg.insert(MapPair(Value((*i).second), Value((*i).first)));
+        }
+
+        init_class();
+    }
+
+    const Kind          kind() const { return _kind;    };
+    const Bounds      bounds() const { return _bounds;  };
+    const Numeral    numeral() const { return _numeral; };
+
+    const std::string & unit() const { return _unit;    };
+
+    bool  set(Format, const Vector &);
+    bool  set(Format, const  Value &);
+
+    bool  get(Format, Vector &) const;
+    bool  get(Format,  Value &) const;
+
+    void  allowed(Vector &) const;
+
+ private:
+    bool    process(const Format, const Value &, Value &) const;
+    bool  unprocess(const Format, const Value &, Value &) const;
+
+    void  init_class();
+
+    static bool equalNumber(const double, const double);
+
+ protected:
+    const Kind      _kind;
+    const Bounds    _bounds;
+    const Numeral   _numeral;
+
+    Value     _unit;
+
+    const double    _init, _fini, _step;
+
+    Map       _map_from_usr,
+              _map_from_cfg;
+
+    List      _list;
+
+    Generic   _value;
+};
+
+#endif /* _CONFIG_RESTRICTION_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/configurator/section.cpp b/src/mod/endpoints/mod_khomp/commons/base/configurator/section.cpp
similarity index 59%
rename from src/mod/endpoints/mod_khomp/commons/configurator/section.cpp
rename to src/mod/endpoints/mod_khomp/commons/base/configurator/section.cpp
index 5d26858054..9ed775b044 100644
--- a/src/mod/endpoints/mod_khomp/commons/configurator/section.cpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/configurator/section.cpp
@@ -1,7 +1,7 @@
-/*  
+/*
     KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.  
-  
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
   The contents of this file are subject to the Mozilla Public License Version 1.1
   (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.mozilla.org/MPL/
@@ -23,108 +23,114 @@
 
   The LGPL header follows below:
 
-    This library is free software; you can redistribute it and/or  
-    modify it under the terms of the GNU Lesser General Public  
-    License as published by the Free Software Foundation; either  
-    version 2.1 of the License, or (at your option) any later version.  
-  
-    This library is distributed in the hope that it will be useful,  
-    but WITHOUT ANY WARRANTY; without even the implied warranty of  
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
-    Lesser General Public License for more details.  
-  
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
     You should have received a copy of the GNU Lesser General Public License
     along with this library; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
-  
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <configurator/section.hpp>
 
-void Section::options(Section::OptionVector & vec)
+void Section::options(Section::OptionVector & vec) const
 {
-	for (OptionMap::iterator it = _options.begin(); it != _options.end();)
-	{
-		vec.push_back(&((*it).second));
-		++it;
-	}
+    for (OptionMap::const_iterator it = _options.begin(); it != _options.end();)
+    {
+        vec.push_back(const_cast< Option * >(&(it->second)));
+        ++it;
+    }
 }
 
-void Section::sections(Section::SectionVector & vec)
+void Section::sections(Section::SectionVector & vec) const
 {
-	for (SectionMap::iterator it = _sections.begin(); it != _sections.end();)
-	{
-		vec.push_back((*it).second);
-		++it;
-	}
+    for (SectionMap::const_iterator it = _sections.begin(); it != _sections.end();)
+    {
+        vec.push_back(const_cast< Section * >(it->second));
+        ++it;
+    }
 }
 
 /*********/
 
-Option * Section::option_find(std::string & str, bool recurse)
+Option * Section::option_find(const std::string & str, bool recurse) const
 {
-	OptionMap::iterator i = _options.find(str);
+    OptionMap::const_iterator i = _options.find(str);
 
-	if (i == _options.end())
+    if (i == _options.end())
     {
         if (!recurse)
-            throw not_found();
+            throw OptionNotFound(str, _name);
+//            throw not_found();
 
-        for (SectionMap::iterator i = _sections.begin(); i != _sections.end(); i++)
+        for (SectionMap::const_iterator i = _sections.begin(); i != _sections.end(); i++)
         {
             try
             {
                 return i->second->option_find(str, recurse);
             }
-            catch (not_found & e)
+            catch (NotFound & e)
             {
                 /* keep looping! */
             };
         }
 
-        throw not_found();
+//        throw not_found();
+        throw OptionNotFound(str, _name);
     }
 
-	return &((*i).second);
+    return const_cast< Option * >(&(i->second));
 }
 
+/*
 Option * Section::option_find(const char * str, bool recurse)
 {
-	std::string sstr(str);
-	return option_find(sstr, recurse);
+    std::string sstr(str);
+    return option_find(sstr, recurse);
 }
+*/
 
 /*********/
 
-Section * Section::section_find(std::string & str, bool recurse)
+Section * Section::section_find(const std::string & str, bool recurse) const
 {
-	SectionMap::iterator i = _sections.find(str);
+    SectionMap::const_iterator i = _sections.find(str);
 
-	if (i == _sections.end())
+    if (i == _sections.end())
     {
         if (!recurse)
-            throw not_found();
+            throw SectionNotFound(str, _name);
 
-        for (SectionMap::iterator i = _sections.begin(); i != _sections.end(); i++)
+        for (SectionMap::const_iterator i = _sections.begin(); i != _sections.end(); i++)
         {
             try
             {
                 return i->second->section_find(str, recurse);
             }
-            catch (not_found & e)
+            catch (NotFound & e)
             {
                 /* keep looping! */
             };
         }
 
-        throw not_found();
+        throw SectionNotFound(str, _name);
     }
 
-	return ((*i).second);
+    return const_cast< Section * >(i->second);
 }
 
+/*
 Section * Section::section_find(const char * str, bool recurse)
 {
-	std::string sstr(str);
-	return section_find(sstr, recurse);
+    std::string sstr(str);
+    return section_find(sstr, recurse);
 }
+*/
diff --git a/src/mod/endpoints/mod_khomp/commons/base/configurator/section.hpp b/src/mod/endpoints/mod_khomp/commons/base/configurator/section.hpp
new file mode 100644
index 0000000000..d5a8c95688
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/base/configurator/section.hpp
@@ -0,0 +1,260 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  The contents of this file are subject to the Mozilla Public License Version 1.1
+  (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.mozilla.org/MPL/
+
+  Software distributed under the License is distributed on an "AS IS" basis,
+  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+  the specific language governing rights and limitations under the License.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#ifndef _CONFIG_SECTION_HPP_
+#define _CONFIG_SECTION_HPP_
+
+#include <string>
+#include <vector>
+#include <map>
+#include <algorithm>
+#include <iostream>
+
+#include <format.hpp>
+
+#include <configurator/option.hpp>
+
+struct Section
+{
+    typedef std::map < std::string, Option >   OptionMap;
+    typedef std::vector< Option * >            OptionVector;
+
+    typedef std::map < std::string, Section * > SectionMap;
+    typedef std::vector < Section * >           SectionVector;
+
+    struct NotFound: public std::runtime_error
+    {
+        NotFound(const std::string & type, const std::string & name, const std::string & me)
+        : std::runtime_error(STG(FMT("%s '%s' not found on section '%s'") % type % name % me)) {};
+    };
+
+    struct OptionNotFound: public NotFound
+    {
+        OptionNotFound(const std::string & name, const std::string & me)
+        : NotFound("option", name, me) {};
+    };
+
+    struct SectionNotFound: public NotFound
+    {
+        SectionNotFound(const std::string & name, const std::string & me)
+        : NotFound("section", name, me) {};
+    };
+
+    typedef NotFound not_found; /* backward compatibility */
+
+// protected:
+    Section(const std::string & name, const std::string & desc, bool recursive = true)
+    : _name(name), _description(desc), _recursive(recursive) {};
+
+    void add(const Option & o)
+    {
+        _options.insert(std::pair<std::string,Option>(o.name(), o));
+    };
+
+    void del(const std::string & name)
+    {
+        _options.erase(name);
+    };
+
+    void add(Section * s)
+    {
+        _sections.insert(std::pair< std::string, Section * >(s->name(), s));
+    };
+
+ public:
+    const std::string & name()        const { return _name;        };
+    const std::string & description() const { return _description; };
+
+    const bool          recursive()   const { return _recursive;   };
+
+    OptionMap::const_iterator option_begin()   const { return _options.begin(); };
+    OptionMap::const_iterator option_end()     const { return _options.end();   };
+
+    SectionMap::const_iterator section_begin() const { return _sections.begin(); };
+    SectionMap::const_iterator section_end()   const { return _sections.end();   };
+
+    /**/
+
+//    Option  *  option_find(const char *, bool recurse = false) const;
+//    Section * section_find(const char *, bool recurse = false) const;
+
+    Option  *  option_find(const std::string &, bool recurse = false) const;
+    Section * section_find(const std::string &, bool recurse = false) const;
+
+    /**/
+
+    void  options(OptionVector &)  const;
+    void sections(SectionVector &) const;
+
+    /**/
+
+    template < typename T, typename F >
+    bool search_and_apply(const std::string & key, T & value, F f)
+    {
+        OptionMap::iterator i = _options.find(key);
+
+        if (i != _options.end())
+            return f(i->second);
+
+        if (!_recursive)
+            return false;
+
+        return (find_if(_sections.begin(), _sections.end(), f) != _sections.end());
+    }
+
+ private:
+    struct ConstKeyValue
+    {
+        ConstKeyValue(const std::string & k, const std::string &v)
+        : _k(k), _v(v) {};
+
+        const std::string & _k;
+        const std::string & _v;
+    };
+
+    struct KeyValue
+    {
+        KeyValue(const std::string & k, std::string &v)
+        : _k(k), _v(v) {};
+
+        const std::string & _k;
+              std::string & _v;
+    };
+
+    struct load_section: protected ConstKeyValue
+    {
+        load_section(const std::string & k, const std::string & v): ConstKeyValue(k,v) {};
+
+        bool operator()(Option & o)                 { return o.load(_v);            };
+        bool operator()(SectionMap::value_type & v) { return v.second->load(_k,_v); };
+    };
+
+    struct change_section: protected ConstKeyValue
+    {
+        change_section(const std::string & k, const std::string & v): ConstKeyValue(k,v) {};
+
+        bool operator()(Option & o)                 { return o.change(_v);            };
+        bool operator()(SectionMap::value_type & v) { return v.second->change(_k,_v); };
+    };
+
+    struct store_section: protected KeyValue
+    {
+        store_section(const std::string & k, std::string & v): KeyValue(k,v) {};
+
+        bool operator()(Option & o)                 { return o.store(_v);            };
+        bool operator()(SectionMap::value_type & v) { return v.second->store(_k,_v); };
+    };
+
+    struct set_section: protected ConstKeyValue
+    {
+        set_section(const std::string & k, const std::string & v): ConstKeyValue(k,v) {};
+
+        bool operator()(Option & o)                 { return (o.set(_v))[Option::F_ADJUSTED]; };
+        bool operator()(SectionMap::value_type & v) { return  v.second->set(_k,_v);           };
+    };
+
+    struct get_section: protected KeyValue
+    {
+        get_section(const std::string & k, std::string & v): KeyValue(k,v) {};
+
+        bool operator()(Option & o)                 { return o.get(_v);            };
+        bool operator()(SectionMap::value_type & v) { return v.second->get(_k,_v); };
+    };
+
+    struct modified_section
+    {
+        bool operator()(const OptionMap::value_type  & v) { return v.second.modified();  };
+        bool operator()(const SectionMap::value_type & v) { return v.second->modified(); };
+    };
+
+ public:
+/*
+    bool load(const char * key, const std::string value)
+    {
+        std::string skey(key);
+        return search_and_apply(skey, value, load_section(skey, value));
+    }
+*/
+    bool load(const std::string & key, const std::string & value)
+    {
+        return search_and_apply(key, value, load_section(key, value));
+    }
+
+    bool change(const std::string & key, const std::string & value)
+    {
+        return search_and_apply(key, value, change_section(key, value));
+    }
+
+    bool store(const std::string & key, std::string & value)
+    {
+        return search_and_apply(key, value, store_section(key, value));
+    }
+
+    bool set(const std::string & key, const std::string & value)
+    {
+        return search_and_apply(key, value, set_section(key, value));
+    }
+
+    bool get(const std::string & key, std::string & value)
+    {
+        return search_and_apply(key, value, get_section(key, value));
+    }
+
+    bool modified() const
+    {
+        return ((find_if(_options.begin(),  _options.end(),  modified_section()) != _options.end()) ||
+                (find_if(_sections.begin(), _sections.end(), modified_section()) != _sections.end()));
+    }
+
+ private:
+    Section(): _name(""), _description(""), _recursive(false) {};
+
+ protected:
+    const std::string   _name;
+    const std::string   _description;
+
+    OptionMap           _options;
+    SectionMap          _sections;
+
+    const bool          _recursive;
+};
+
+#endif /* _CONFIG_SECTION_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/base/const_this.hpp b/src/mod/endpoints/mod_khomp/commons/base/const_this.hpp
new file mode 100644
index 0000000000..48e3c1e32f
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/base/const_this.hpp
@@ -0,0 +1,15 @@
+
+#ifndef _CONST_THIS_H_
+#define _CONST_THIS_H_
+
+template < typename T >
+struct ConstThis
+{
+    T const & constThis() const
+    {
+        // TODO: will this return the right reference?
+        return static_cast<const T&>(*this);
+    }
+};
+
+#endif /* _CONST_THIS_H_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/flagger.hpp b/src/mod/endpoints/mod_khomp/commons/base/flagger.hpp
similarity index 100%
rename from src/mod/endpoints/mod_khomp/commons/flagger.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/flagger.hpp
diff --git a/src/mod/endpoints/mod_khomp/commons/format.cpp b/src/mod/endpoints/mod_khomp/commons/base/format.cpp
similarity index 89%
rename from src/mod/endpoints/mod_khomp/commons/format.cpp
rename to src/mod/endpoints/mod_khomp/commons/base/format.cpp
index 20f79204ec..74223cc406 100644
--- a/src/mod/endpoints/mod_khomp/commons/format.cpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/format.cpp
@@ -42,27 +42,7 @@
 #include "format.hpp"
 //#include <iostream>
 
-Format::Format(const char  * format_string, bool raise_exception)
-: _format(format_string), _valid(true), _raise(raise_exception)
-{
-    initialize(format_string);
-}
-
-/*
-Format::Format(std::string & format_string, bool raise_exception)
-: _format(NULL), _valid(true), _raise(raise_exception)
-{
-    initialize(format_string.c_str());
-}
-*/
-
-Format::Format(std::string   format_string, bool raise_exception)
-: _format(format_string), _valid(true), _raise(raise_exception)
-{
-    initialize(format_string.c_str());
-}
-
-void Format::initialize(const char * format_string)
+void FormatTraits::initialize(const char * format_string)
 {
     std::string txt;
 
@@ -82,7 +62,6 @@ void Format::initialize(const char * format_string)
         if (*ptr2 == '%')
         {
             txt += *ptr;
-
             ptr += 2;
             continue;
         }
@@ -238,36 +217,20 @@ void Format::initialize(const char * format_string)
         push_argument(txt, T_LITERAL);
 }
 
-void Format::mark_invalid(std::string & msg)
+void FormatTraits::push_argument(std::string & data, FormatTraits::Type type)
 {
-    if (_valid)
-    {
-        _valid = false;
+//    std::cerr << "pushing type (" << type << ") with format (" << data << ")" << std::endl;
 
-        std::string finalmsg;
-
-        finalmsg += "** INVALID FORMAT: ";
-        finalmsg += msg;
-        finalmsg += " **";
-
-        _result = finalmsg;
-    }
+    _args.push(Argument(data, type));
+    data.clear();
 }
 
-void Format::raise_check(void)
+void FormatTraits::pop_argument(void)
 {
-    if (!_valid && _raise)
-        throw InvalidFormat(_result);
+    _args.pop();
 }
 
-bool Format::validity_check(void)
-{
-    raise_check();
-
-    return _valid;
-}
-
-const Format::Argument * Format::next_argument(void)
+const FormatTraits::Argument * FormatTraits::next_argument(void)
 {
 //    std::cerr << "size: " << _args.size() << std::endl;
 
@@ -294,38 +257,81 @@ const Format::Argument * Format::next_argument(void)
     }
 }
 
-void Format::pop_argument(void)
+/******************************************************************/
+
+#if 0
+Format::Format(const char  * format_string, bool raise_exception)
+: _format(format_string), _valid(true), _raise(raise_exception)
 {
-    _args.pop();
+    FormatTraits::initialize(format_string);
 }
 
-void Format::push_argument(std::string & data, Format::Type type)
+Format::Format(std::string   format_string, bool raise_exception)
+: _format(format_string), _valid(true), _raise(raise_exception)
 {
-//    std::cerr << "pushing type (" << type << ") with format (" << data << ")" << std::endl;
+    FormatTraits::initialize(format_string.c_str());
+}
 
-    _args.push(Argument(data, type));
-    data.clear();
+/*
+Format::Format(std::string & format_string, bool raise_exception)
+: _format(NULL), _valid(true), _raise(raise_exception)
+{
+    initialize(format_string.c_str());
+}
+*/
+
+void Format::mark_invalid(std::string & msg)
+{
+    if (_valid)
+    {
+        _valid = false;
+
+        _result  = "** INVALID FORMAT: ";
+        _result += msg;
+        _result += " **";
+    }
+}
+
+void Format::raise(void) const
+{
+    if (!_valid)
+    {
+        // call specialized class
+        FormatException::raise(_result);
+    }
+}
+
+bool Format::valid(void) const
+{
+//    raise();
+    return _valid;
 }
 
 std::string Format::str()
 {
-    if (!validity_check())
+    if (!valid())
         return _result;
 
-    if (next_argument() == NULL)
+//    try
+//    {
+    if (next_argument() != NULL)
+    {
+        std::string msg;
+
+        msg += "too few arguments passed for format '";
+        msg += _format;
+        msg += "' (";
+        msg += _format;
+        msg += ")";
+
+        mark_invalid(msg);
+
         return _result;
-
-    std::string msg;
-
-    msg += "too few arguments passed for format '";
-    msg += _format;
-    msg += "' (";
-    msg += _format;
-    msg += ")";
-
-    mark_invalid(msg);
-
-    return _result;
+    }
+//    catch (NoArgumentLeft e)
+//    {
+//        return _result;
+//    }
 }
 
-
+#endif
diff --git a/src/mod/endpoints/mod_khomp/commons/format.hpp b/src/mod/endpoints/mod_khomp/commons/base/format.hpp
similarity index 81%
rename from src/mod/endpoints/mod_khomp/commons/format.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/format.hpp
index b1ebe74396..0469e4fdf9 100644
--- a/src/mod/endpoints/mod_khomp/commons/format.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/format.hpp
@@ -52,37 +52,35 @@
 #include <stdio.h>
 
 #ifdef WIN32 // WINDOWS
-#include <KHostSystem.h>
+# include <KHostSystem.h>
 #endif
 
-
-/* macros used for shortening lines and making the code clearer */
-#define STG(x) (x).str()
-#define FMT(x) Format(x)
-
-struct Format
+struct InvalidFormat
 {
-    static const unsigned int strings_base_length = 64;
-    static const unsigned int generic_base_length = 64;
+    InvalidFormat(std::string _msg) : msg(_msg) {}
+    const std::string msg;
+};
 
-    struct InvalidFormat
+template < bool E >
+struct FormatException
+{
+    void raise(const std::string & msg) const
     {
-        InvalidFormat(std::string msg) : _msg(msg) {}
-
-        std::string _msg;
+        /* DO NOTHING */
     };
+};
 
-    explicit Format(const char  * format_string, bool raise_exception = false);
-    explicit Format(std::string   format_string, bool raise_exception = false);
-
-    void initialize(const char *);
-
-    std::string str(void);
-
-    ////////////////////////////////////////////////////////////
-
- protected:
+template < >
+struct FormatException < true >
+{
+    void raise(const std::string & msg) const
+    {
+        throw InvalidFormat(msg);
+    };
+};
 
+struct FormatTraits
+{
     enum Type
     {
         T_ANYTHING = 1,
@@ -113,24 +111,240 @@ struct Format
         Argument(std::string fmts, Type type)
         : _fmts(fmts), _type(type) {};
 
-        Type                type(void) const { return _type; }
+        const Type          type(void) const { return _type; }
         const std::string & fmts(void) const { return _fmts; }
 
      protected:
-        std::string _fmts;
-        Type        _type;
+        const std::string _fmts;
+        const Type        _type;
     };
 
     typedef std::queue < Argument > ArgumentQueue;
 
-    ////////////////////////////////////////////////////////////
-
- public:
+    //////////////////////////////////
 
     template < typename V >
-    Format & operator%( V value )
+    bool number_verify_signed_short( V value ) const
     {
-        if (!validity_check())
+        return
+           ((typeid(V) == typeid(short int) ||
+             typeid(V) == typeid(short) ||
+             typeid(V) == typeid(const short int) ||
+             typeid(V) == typeid(const short) ||
+             typeid(V) == typeid(volatile short int) ||
+             typeid(V) == typeid(volatile short)) &&
+             sizeof(V) == sizeof(short));
+    }
+
+    template < typename V >
+    bool number_verify_unsigned_short( V value ) const
+    {
+        return
+           ((typeid(V) == typeid(unsigned short int) ||
+             typeid(V) == typeid(unsigned short) ||
+             typeid(V) == typeid(const unsigned short int) ||
+             typeid(V) == typeid(const unsigned short) ||
+             typeid(V) == typeid(volatile unsigned short int) ||
+             typeid(V) == typeid(volatile unsigned short)) &&
+             sizeof(V) == sizeof(unsigned short));
+    }
+
+    template < typename V >
+    bool number_verify_signed_long( V value ) const
+    {
+        return
+           ((typeid(V) == typeid(long int) ||
+             typeid(V) == typeid(long) ||
+             typeid(V) == typeid(const long int) ||
+             typeid(V) == typeid(const long) ||
+             typeid(V) == typeid(volatile long int) ||
+             typeid(V) == typeid(volatile long)) &&
+             sizeof(V) == sizeof(long));
+    }
+
+    template < typename V >
+    bool number_verify_unsigned_long( V value ) const
+    {
+        return
+           ((typeid(V) == typeid(unsigned long int) ||
+             typeid(V) == typeid(unsigned long) ||
+             typeid(V) == typeid(const unsigned long int) ||
+             typeid(V) == typeid(const unsigned long) ||
+             typeid(V) == typeid(volatile unsigned long int) ||
+             typeid(V) == typeid(volatile unsigned long)) &&
+             sizeof(V) == sizeof(long long));
+    }
+
+    template < typename V >
+    bool number_verify_signed_long_long( V value ) const
+    {
+        return
+           ((typeid(V) == typeid(long long int) ||
+             typeid(V) == typeid(long long) ||
+             typeid(V) == typeid(const long long int) ||
+             typeid(V) == typeid(const long long) ||
+             typeid(V) == typeid(volatile long long) ||
+             typeid(V) == typeid(volatile long long int)) &&
+             sizeof(V) == sizeof(long long));
+    }
+
+    template < typename V >
+    bool number_verify_unsigned_long_long( V value ) const
+    {
+        return
+           ((typeid(V) == typeid(unsigned long long int) ||
+             typeid(V) == typeid(unsigned long long) ||
+             typeid(V) == typeid(const unsigned long long int) ||
+             typeid(V) == typeid(const unsigned long long) ||
+             typeid(V) == typeid(volatile unsigned long long) ||
+             typeid(V) == typeid(volatile unsigned long long int)) &&
+             sizeof(V) == sizeof(unsigned long long));
+    }
+
+    template < typename V >
+    bool number_verify_signed_int( V value ) const
+    {
+        return
+            (sizeof(V) <= sizeof(int) ||
+             typeid(V) == typeid(int) ||
+             typeid(V) == typeid(const int) ||
+             typeid(V) == typeid(volatile int));
+    }
+
+    template < typename V >
+    bool number_verify_unsigned_int( V value ) const
+    {
+        return
+            (sizeof(V) <= sizeof(unsigned int) ||
+             typeid(V) == typeid(unsigned int) ||
+             typeid(V) == typeid(const unsigned int) ||
+             typeid(V) == typeid(volatile unsigned int));
+    }
+
+    template < typename V >
+    bool generic_verify( V value, const Type type ) const
+    {
+        switch (type)
+        {
+            /* EXCEPTION: consider any number an valid input. */
+            case T_SIGNED_INT:
+            case T_UNSIGNED_INT:
+                return
+                    (number_verify_signed_int(value)     ||
+                     number_verify_unsigned_int(value)   ||
+                     number_verify_signed_long(value)    ||
+                     number_verify_unsigned_long(value)  ||
+                     number_verify_signed_short(value)   ||
+                     number_verify_unsigned_short(value));
+
+            case T_SIGNED_SHORT_SHORT:
+                return (typeid(V) == typeid(char) || typeid(V) == typeid(const char));
+
+            case T_SIGNED_SHORT:
+                return number_verify_signed_short(value);
+
+            case T_SIGNED_LONG:
+                return number_verify_signed_long(value);
+
+            case T_SIGNED_LONG_LONG:
+                return number_verify_signed_long_long(value);
+
+            case T_UNSIGNED_SHORT_SHORT:
+                return (typeid(V) == typeid(unsigned char) || typeid(V) == typeid(unsigned char));
+
+            case T_UNSIGNED_SHORT:
+                return number_verify_unsigned_short(value);
+
+            case T_UNSIGNED_LONG:
+                return number_verify_unsigned_long(value);
+
+            case T_UNSIGNED_LONG_LONG:
+                return number_verify_unsigned_long_long(value);
+
+            case T_FLOAT:
+                return (typeid(V) == typeid(float)) || (typeid(V) == typeid(double) ||
+                    typeid(V) == typeid(const float)) || (typeid(V) == typeid(const double));
+
+            case T_CHAR:
+                return (typeid(V) == typeid(char)) || (typeid(V) == typeid(unsigned char) ||
+                    typeid(V) == typeid(const char)) || (typeid(V) == typeid(const unsigned char));
+
+            case T_POINTER:
+            case T_STRING:
+                return false;
+
+            case T_ANYTHING:
+                return true;
+
+            case T_LITERAL:
+                return false;
+        }
+
+        return false;
+    };
+
+    const Argument * next_argument(void);
+
+    void push_argument(std::string & data, const Type type);
+    void pop_argument(void);
+
+    void initialize(const char *);
+
+  protected:
+    ArgumentQueue _args;
+    std::string   _result;
+
+};
+
+template < bool E = false >
+struct FormatBase: protected FormatTraits, protected FormatException < E >
+{
+    static const unsigned int strings_base_length = 64;
+    static const unsigned int generic_base_length = 64;
+
+    explicit FormatBase(const char  * format_string)
+    : _format(format_string), _valid(true)
+    {
+        FormatTraits::initialize(format_string);
+    };
+
+    explicit FormatBase(std::string   format_string)
+    : _format(format_string), _valid(true)
+    {
+        FormatTraits::initialize(format_string.c_str());
+    };
+
+    bool valid(void) const
+    {
+        return _valid;
+    }
+
+    const std::string str()
+    {
+        if (valid() && (next_argument() != NULL))
+        {
+            std::string msg;
+
+            // TODO: why format appears two times?
+            msg += "too few arguments passed for format '";
+            msg += _format;
+            msg += "' (";
+            msg += _format;
+            msg += ")";
+
+            mark_invalid(msg);
+        }
+
+        raise();
+        return _result;
+    };
+
+    ////////////////////////////////////////////////////////////
+
+    template < typename V >
+    FormatBase & operator%( V value )
+    {
+        if (!valid())
             return *this;
 
         const Argument * top = next_argument();
@@ -149,7 +363,7 @@ struct Format
         {
             char temp[generic_base_length];
 
-            if (!generic_verify(value, top->type()))
+            if (!FormatTraits::generic_verify(value, top->type()))
             {
                 std::string msg;
 
@@ -171,14 +385,14 @@ struct Format
             pop_argument();
         }
 
-        raise_check();
+        raise();
         return *this;
     }
 
     template < typename V >
-    Format & operator%( V * value )
+    FormatBase & operator%( V * value )
     {
-        if (!validity_check())
+        if (!valid())
             return *this;
 
         const Argument * top = next_argument();
@@ -256,20 +470,13 @@ struct Format
             pop_argument();
         }
 
-        raise_check();
+        raise();
         return *this;
     }
 
-/*
-    Format & operator%( std::string   value )
+    FormatBase & operator%( const std::string value )
     {
-        return operator%(value);
-    }
-*/
-
-    Format & operator%( const std::string value )
-    {
-        if (!validity_check())
+        if (!valid())
             return *this;
 
         const Argument * top = next_argument();
@@ -313,200 +520,42 @@ struct Format
             pop_argument();
         }
 
-        raise_check();
+        raise();
         return *this;
     }
 
- protected:
-
-    template < typename V >
-    bool number_verify_signed_short( V value )
+  protected:
+    void mark_invalid(std::string & msg)
     {
-        return
-           ((typeid(V) == typeid(short int) ||
-             typeid(V) == typeid(short) ||
-             typeid(V) == typeid(const short int) ||
-             typeid(V) == typeid(const short) ||
-             typeid(V) == typeid(volatile short int) ||
-             typeid(V) == typeid(volatile short)) &&
-             sizeof(V) == sizeof(short));
-    }
-
-    template < typename V >
-    bool number_verify_unsigned_short( V value )
-    {
-        return
-           ((typeid(V) == typeid(unsigned short int) ||
-             typeid(V) == typeid(unsigned short) ||
-             typeid(V) == typeid(const unsigned short int) ||
-             typeid(V) == typeid(const unsigned short) ||
-             typeid(V) == typeid(volatile unsigned short int) ||
-             typeid(V) == typeid(volatile unsigned short)) &&
-             sizeof(V) == sizeof(unsigned short));
-    }
-
-    template < typename V >
-    bool number_verify_signed_long( V value )
-    {
-        return
-           ((typeid(V) == typeid(long int) ||
-             typeid(V) == typeid(long) ||
-             typeid(V) == typeid(const long int) ||
-             typeid(V) == typeid(const long) ||
-             typeid(V) == typeid(volatile long int) ||
-             typeid(V) == typeid(volatile long)) &&
-             sizeof(V) == sizeof(long));
-    }
-
-    template < typename V >
-    bool number_verify_unsigned_long( V value )
-    {
-        return
-           ((typeid(V) == typeid(unsigned long int) ||
-             typeid(V) == typeid(unsigned long) ||
-             typeid(V) == typeid(const unsigned long int) ||
-             typeid(V) == typeid(const unsigned long) ||
-             typeid(V) == typeid(volatile unsigned long int) ||
-             typeid(V) == typeid(volatile unsigned long)) &&
-             sizeof(V) == sizeof(long long));
-    }
-
-    template < typename V >
-    bool number_verify_signed_long_long( V value )
-    {
-        return
-           ((typeid(V) == typeid(long long int) ||
-             typeid(V) == typeid(long long) ||
-             typeid(V) == typeid(const long long int) ||
-             typeid(V) == typeid(const long long) ||
-             typeid(V) == typeid(volatile long long) ||
-             typeid(V) == typeid(volatile long long int)) &&
-             sizeof(V) == sizeof(long long));
-    }
-
-    template < typename V >
-    bool number_verify_unsigned_long_long( V value )
-    {
-        return
-           ((typeid(V) == typeid(unsigned long long int) ||
-             typeid(V) == typeid(unsigned long long) ||
-             typeid(V) == typeid(const unsigned long long int) ||
-             typeid(V) == typeid(const unsigned long long) ||
-             typeid(V) == typeid(volatile unsigned long long) ||
-             typeid(V) == typeid(volatile unsigned long long int)) &&
-             sizeof(V) == sizeof(unsigned long long));
-    }
-
-    template < typename V >
-    bool number_verify_signed_int( V value )
-    {
-        return
-            (sizeof(V) <= sizeof(int) ||
-             typeid(V) == typeid(int) ||
-             typeid(V) == typeid(const int) ||
-             typeid(V) == typeid(volatile int));
-    }
-
-    template < typename V >
-    bool number_verify_unsigned_int( V value )
-    {
-        return
-            (sizeof(V) <= sizeof(unsigned int) ||
-             typeid(V) == typeid(unsigned int) ||
-             typeid(V) == typeid(const unsigned int) ||
-             typeid(V) == typeid(volatile unsigned int));
-    }
-
-    template < typename V >
-    bool generic_verify( V value, Type type )
-    {
-        switch (type)
+        if (_valid)
         {
-            /* EXCEPTION: consider any number an valid input. */
-            case T_SIGNED_INT:
-            case T_UNSIGNED_INT:
-                return
-                    (number_verify_signed_int(value)     ||
-                     number_verify_unsigned_int(value)   ||
-                     number_verify_signed_long(value)    ||
-                     number_verify_unsigned_long(value)  ||
-                     number_verify_signed_short(value)   ||
-                     number_verify_unsigned_short(value));
+            _valid = false;
 
-            case T_SIGNED_SHORT_SHORT:
-                return (typeid(V) == typeid(char) || typeid(V) == typeid(const char));
-
-            case T_SIGNED_SHORT:
-                return number_verify_signed_short(value);
-
-            case T_SIGNED_LONG:
-                return number_verify_signed_long(value);
-
-            case T_SIGNED_LONG_LONG:
-                return number_verify_signed_long_long(value);
-
-            case T_UNSIGNED_SHORT_SHORT:
-                return (typeid(V) == typeid(unsigned char) || typeid(V) == typeid(unsigned char));
-
-            case T_UNSIGNED_SHORT:
-                return number_verify_unsigned_short(value);
-
-            case T_UNSIGNED_LONG:
-                return number_verify_unsigned_long(value);
-
-            case T_UNSIGNED_LONG_LONG:
-                return number_verify_unsigned_long_long(value);
-
-            case T_FLOAT:
-                return (typeid(V) == typeid(float)) || (typeid(V) == typeid(double) ||
-                    typeid(V) == typeid(const float)) || (typeid(V) == typeid(const double));
-
-            case T_CHAR:
-                return (typeid(V) == typeid(char)) || (typeid(V) == typeid(unsigned char) ||
-                    typeid(V) == typeid(const char)) || (typeid(V) == typeid(const unsigned char));
-
-            case T_POINTER:
-            case T_STRING:
-                return false;
-
-            case T_ANYTHING:
-                return true;
-
-            case T_LITERAL:
-                return false;
+            _result  = "** INVALID FORMAT: ";
+            _result += msg;
+            _result += " **";
         }
+    }
 
-        return false;
-    };
-
-    void mark_invalid(std::string &);
-
-    bool validity_check(void);
-    void raise_check(void);
-
-/*
-    struct NoArgumentLeft
+    void raise(void) const
     {
-        NoArgumentLeft(): empty(0) {};
-
-        unsigned int empty;
-    };
-*/
-
-    const Argument * next_argument(void);
-
-    void pop_argument(void);
-    void push_argument(std::string & data, Type type);
+        if (!_valid)
+        {
+            // call specialized class
+            FormatException< E >::raise(_result);
+        }
+    }
 
  private:
-    std::string   _format;
-
-    bool          _valid;
-    bool          _raise;
-
-    std::string   _result;
-    ArgumentQueue _args;
+    const std::string _format;
+    bool              _valid;
 };
 
-#endif /* _FORMAT_H_ */
+/* useful typedef for general usage (not generating exceptions) */
+typedef FormatBase<> Format;
 
+/* macros used for shortening lines and making the code clearer */
+#define STG(x) (x).str()
+#define FMT(x) Format(x)
+
+#endif /* _FORMAT_H_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/function.hpp b/src/mod/endpoints/mod_khomp/commons/base/function.hpp
similarity index 65%
rename from src/mod/endpoints/mod_khomp/commons/function.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/function.hpp
index c448299acd..7470bf245d 100644
--- a/src/mod/endpoints/mod_khomp/commons/function.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/function.hpp
@@ -46,12 +46,13 @@
 
 namespace Function
 {
-    struct EmptyFunction {};
+    struct EmptyFunction     {};
+    struct NonMemberFunction {};
 
     /**/
 
     template < typename FunctionTraits >
-    struct StorageBase: NEW_REFCOUNTER(StorageBase < FunctionTraits >)
+    struct StorageBase: COUNTER_SUPER(StorageBase < FunctionTraits >)
     {
         typedef typename FunctionTraits::BaseType BaseType;
 
@@ -59,27 +60,33 @@ namespace Function
         typedef typename FunctionTraits::ObjType  ObjType;
 
         template < typename Functor >
-        StorageBase(Functor f)
-        : _object(reinterpret_cast<ObjType>(new Functor(f))),
-          _function(reinterpret_cast<FunType>(&(Functor::operator()))),
+        StorageBase(const Functor f)
+        : _object(reinterpret_cast< ObjType >(new Functor(f))),
+          _function(reinterpret_cast< FunType >(&Functor::operator())),
           _malloced(true)
         {};
 
         template < typename Functor >
         StorageBase(Functor & f, bool malloced)
-        : _object(reinterpret_cast<ObjType>((malloced ? new Functor(f) : &f))),
-          _function(reinterpret_cast<FunType>(&(Functor::operator()))),
+        : _object(reinterpret_cast< ObjType >((malloced ? new Functor(f) : &f))),
+          _function(reinterpret_cast< FunType >(&Functor::operator())),
           _malloced(malloced)
         {};
 
+        StorageBase(FunType const * member)
+        : _object(reinterpret_cast< ObjType >(0)),
+          _function(reinterpret_cast< FunType >(member)),
+          _malloced(false)
+        {};
+
         StorageBase()
-        : _object(reinterpret_cast<ObjType>(0)),
-          _function(reinterpret_cast<FunType>(0)),
+        : _object(reinterpret_cast< ObjType >(0)),
+          _function(reinterpret_cast< FunType >(0)),
           _malloced(false)
         {};
 
         StorageBase(const StorageBase & o)
-        : INC_REFCOUNTER(o, StorageBase < FunctionTraits >),
+        : COUNTER_REFER(o, StorageBase < FunctionTraits >),
            _object(o._object), _function(o._function), _malloced(o._malloced)
         {};
 
@@ -95,9 +102,9 @@ namespace Function
         template < typename Functor >
         void operator=(Functor f)
         {
-            _object   = reinterpret_cast<ObjType>(new Functor(f)),
-            _function = reinterpret_cast<FunType>(&(Functor::operator()));
-            _malloced = false;
+            _object   = reinterpret_cast< ObjType >(new Functor(f)),
+            _function = reinterpret_cast< FunType >(&Functor::operator());
+            _malloced = true;
         }
 
      protected:
@@ -229,10 +236,15 @@ namespace Function
         typedef StorageBase < Function0Traits < R > >  Storage;
 
         template < typename Functor >
-        Function0(Functor f): Storage(f) {};
+        Function0(const Functor f)
+        : Storage(f) {};
 
         template < typename Functor >
-        Function0(Functor & f, bool m): Storage(f, m) {};
+        Function0(Functor & f, bool m)
+        : Storage(f, m) {};
+
+        Function0(const typename Function0Traits < R >::FunType * m)
+        : Storage(m) {};
 
         Function0() {};
 
@@ -243,6 +255,18 @@ namespace Function
 
             return ((Storage::_object)->*(Storage::_function))();
         }
+
+        template < typename Object >
+        R operator()(Object * object)
+        {
+            if (reinterpret_cast<void *>(Storage::_function) == 0)
+                throw EmptyFunction();
+
+            if (reinterpret_cast<void *>(Storage::_object) != 0)
+                throw NonMemberFunction();
+
+            return (reinterpret_cast< typename Function0Traits < R >::ObjType *>(object)->*(Storage::_function))();
+        }
     };
 
     template < typename R, typename A0 >
@@ -251,10 +275,15 @@ namespace Function
         typedef StorageBase < Function1Traits < R, A0 > >  Storage;
 
         template < typename Functor >
-        Function1(Functor f): Storage(f) {};
+        Function1(const Functor f)
+        : Storage(f) {};
 
         template < typename Functor >
-        Function1(Functor & f, bool m): Storage(f, m) {};
+        Function1(Functor & f, bool m)
+        : Storage(f, m) {};
+
+        Function1(const typename Function1Traits < R, A0 >::FunType * m)
+        : Storage(m) {};
 
         Function1() {};
 
@@ -265,6 +294,18 @@ namespace Function
 
             return ((Storage::_object)->*(Storage::_function))(a0);
         }
+
+        template < typename Object >
+        R operator()(Object * object, A0 a0)
+        {
+            if (reinterpret_cast<void *>(Storage::_function) == 0)
+                throw EmptyFunction();
+
+            if (reinterpret_cast<void *>(Storage::_object) != 0)
+                throw NonMemberFunction();
+
+            return (reinterpret_cast< typename Function1Traits < R, A0 >::ObjType *>(object)->*(Storage::_function))(a0);
+        }
     };
 
     template < typename R, typename A0, typename A1 >
@@ -273,10 +314,15 @@ namespace Function
         typedef StorageBase < Function2Traits < R, A0, A1 > >  Storage;
 
         template < typename Functor >
-        Function2(Functor f): Storage(f) {};
+        Function2(const Functor f)
+        : Storage(f) {};
 
         template < typename Functor >
-        Function2(Functor & f, bool m): Storage(f, m) {};
+        Function2(Functor & f, bool m)
+        : Storage(f, m) {};
+
+        Function2(const typename Function2Traits < R, A0, A1 >::FunType * m)
+        : Storage(m) {};
 
         Function2() {};
 
@@ -287,6 +333,18 @@ namespace Function
 
             return ((Storage::_object)->*(Storage::_function))(a0, a1);
         }
+
+        template < typename Object >
+        R operator()(Object * object, A0 a0, A1 a1)
+        {
+            if (reinterpret_cast<void *>(Storage::_function) == 0)
+                throw EmptyFunction();
+
+            if (reinterpret_cast<void *>(Storage::_object) != 0)
+                throw NonMemberFunction();
+
+            return (reinterpret_cast< typename Function2Traits < R, A0, A1 >::ObjType *>(object)->*(Storage::_function))(a0, a1);
+        }
     };
 
     template < typename R, typename A0, typename A1, typename A2 >
@@ -295,20 +353,37 @@ namespace Function
         typedef StorageBase < Function3Traits < R, A0, A1, A2 > >  Storage;
 
         template < typename Functor >
-        Function3(Functor f): Storage(f) {};
+        Function3(const Functor f)
+        : Storage(f) {};
 
         template < typename Functor >
-        Function3(Functor & f, bool m): Storage(f, m) {};
+        Function3(Functor & f, bool m)
+        : Storage(f, m) {};
+
+        Function3(const typename Function3Traits < R, A0, A1, A2 >::FunType * m)
+        : Storage(m) {};
 
         Function3() {};
 
         R operator()(A0 a0, A1 a1, A2 a2)
         {
-            if (reinterpret_cast<void *>(Storage::_object) == 0)
+            if (reinterpret_cast<const void *>(Storage::_object) == 0)
                 throw EmptyFunction();
 
             return ((Storage::_object)->*(Storage::_function))(a0, a1, a2);
         }
+
+        template < typename Object >
+        R operator()(Object * object, A0 a0, A1 a1, A2 a2)
+        {
+            if (reinterpret_cast<void *>(Storage::_function) == 0)
+                throw EmptyFunction();
+
+            if (reinterpret_cast<void *>(Storage::_object) != 0)
+                throw NonMemberFunction();
+
+            return (reinterpret_cast< typename Function3Traits < R, A0, A1, A2 >::ObjType *>(object)->*(Storage::_function))(a0, a1, a2);
+        }
     };
 
     template < typename R, typename A0, typename A1, typename A2, typename A3 >
@@ -317,10 +392,15 @@ namespace Function
         typedef StorageBase < Function4Traits < R, A0, A1, A2, A3 > >  Storage;
 
         template < typename Functor >
-        Function4(Functor f): Storage(f) {};
+        Function4(const Functor f)
+        : Storage(f) {};
 
         template < typename Functor >
-        Function4(Functor & f, bool m): Storage(f, m) {};
+        Function4(Functor & f, bool m)
+        : Storage(f, m) {};
+
+        Function4(const typename Function4Traits < R, A0, A1, A2, A3 >::FunType * m)
+        : Storage(m) {};
 
         Function4() {};
 
@@ -331,6 +411,18 @@ namespace Function
 
             return ((Storage::_object)->*(Storage::_function))(a0, a1, a2, a3);
         }
+
+        template < typename Object >
+        R operator()(Object * object, A0 a0, A1 a1, A2 a2, A3 a3)
+        {
+            if (reinterpret_cast<void *>(Storage::_function) == 0)
+                throw EmptyFunction();
+
+            if (reinterpret_cast<void *>(Storage::_object) != 0)
+                throw NonMemberFunction();
+
+            return (reinterpret_cast< typename Function4Traits < R, A0, A1, A2, A3 >::ObjType *>(object)->*(Storage::_function))(a0, a1, a2, a3);
+        }
     };
 };
 
diff --git a/src/mod/endpoints/mod_khomp/commons/initializer.hpp b/src/mod/endpoints/mod_khomp/commons/base/initializer.hpp
similarity index 86%
rename from src/mod/endpoints/mod_khomp/commons/initializer.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/initializer.hpp
index e0e110d49c..16359e8c97 100644
--- a/src/mod/endpoints/mod_khomp/commons/initializer.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/initializer.hpp
@@ -47,32 +47,32 @@
 template < typename Type >
 struct Initializer: public std::vector< Type >
 {
-    typedef std::vector< Type > super;
+    typedef std::vector< Type > Super;
 
-    Initializer(Type   e) { push_back(e); };
-    Initializer(Type & e) { push_back(e); };
+    Initializer(Type   e) { Super::push_back(e); };
+    Initializer(Type & e) { Super::push_back(e); };
 
-    Initializer & operator&(Initializer v)
+    Initializer & operator&(const Initializer v)
     {
-        insert(super::end(), v.begin(), v.end());
+        Super::insert(Super::end(), v.begin(), v.end());
         return *this;
     };
 
     Initializer & operator&(Initializer & v)
     {
-        insert(super::end(), v.begin(), v.end());
+        Super::insert(Super::end(), v.begin(), v.end());
         return *this;
     };
 
     Initializer & operator&(Type v)
     {
-        insert(super::end(), v);
+        Super::insert(Super::end(), v);
         return *this;
     };
 
     Initializer & operator&(Type  & v)
     {
-        insert(super::end(), v);
+        Super::insert(Super::end(), v);
         return *this;
     };
 };
diff --git a/src/mod/endpoints/mod_khomp/commons/k3lapi.cpp b/src/mod/endpoints/mod_khomp/commons/base/k3lapi.cpp
similarity index 77%
rename from src/mod/endpoints/mod_khomp/commons/k3lapi.cpp
rename to src/mod/endpoints/mod_khomp/commons/base/k3lapi.cpp
index f5afa1348f..09f5c81c0e 100644
--- a/src/mod/endpoints/mod_khomp/commons/k3lapi.cpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/k3lapi.cpp
@@ -41,18 +41,16 @@
 
 #include <k3lapi.hpp>
 
-#include <format.hpp>
-#include <verbose.hpp>
+#include <string.h>
 
-K3LAPI::K3LAPI(bool has_exceptions)
-: _has_exceptions(has_exceptions),
-  _device_count(0),  _channel_count(0),  _link_count(0),
+K3LAPIBase::K3LAPIBase()
+: _device_count(0),  _channel_count(0),  _link_count(0),
   _device_config(0), _channel_config(0), _link_config(0)
 {};
 
 /* initialize the whole thing! */
 
-void K3LAPI::start(void)
+void K3LAPIBase::start(void)
 {
     /* tie the used k3l to the compiled k3l version */
     char *ret = k3lStart(k3lApiMajorVersion, k3lApiMinorVersion, 0); //k3lApiBuildVersion);
@@ -64,7 +62,7 @@ void K3LAPI::start(void)
     init();
 }
 
-void K3LAPI::stop(void)
+void K3LAPIBase::stop(void)
 {
     k3lStop();
     fini();
@@ -72,7 +70,7 @@ void K3LAPI::stop(void)
 
 /* envio de comandos para placa */
 
-void K3LAPI::mixer(int32 dev, int32 obj, byte track, KMixerSource src, int32 index)
+void K3LAPIBase::mixer(int32 dev, int32 obj, byte track, KMixerSource src, int32 index) const
 {
     KMixerCommand mix;
 
@@ -83,7 +81,7 @@ void K3LAPI::mixer(int32 dev, int32 obj, byte track, KMixerSource src, int32 ind
     command(dev, obj, CM_MIXER, (const char *) &mix);
 }
 
-void K3LAPI::mixerRecord(int32 dev, int32 obj, byte track, KMixerSource src, int32 index)
+void K3LAPIBase::mixerRecord(int32 dev, KDeviceType type, int32 obj, byte track, KMixerSource src, int32 index) const
 {
     /* estes buffers *NAO PODEM SER ESTATICOS*! */
     char cmd[] = { 0x3f, 0x03, (char)obj, (char)track, 0xff, 0xff };
@@ -131,12 +129,12 @@ void K3LAPI::mixerRecord(int32 dev, int32 obj, byte track, KMixerSource src, int
             break;
     }
 
-    int32 dsp = get_dsp(dev, DSP_AUDIO);
+    int32 dsp = get_dsp(type, DSP_AUDIO);
 
     raw_command(dev, dsp, cmd, sizeof(cmd));
 }
 
-void K3LAPI::mixerCTbus(int32 dev, int32 obj, byte track, KMixerSource src, int32 index)
+void K3LAPIBase::mixerCTbus(int32 dev, int32 obj, byte track, KMixerSource src, int32 index) const
 {
     KMixerCommand mix;
 
@@ -147,12 +145,12 @@ void K3LAPI::mixerCTbus(int32 dev, int32 obj, byte track, KMixerSource src, int3
     command(dev, obj, CM_MIXER_CTBUS, (const char *) &mix);
 }
 
-void K3LAPI::command(int32 dev, int32 obj, int32 code, std::string & str)
+void K3LAPIBase::command(int32 dev, int32 obj, int32 code, std::string & str) const
 {
     command(dev, obj, code, str.c_str());
 }
 
-void K3LAPI::command (int32 dev, int32 obj, int32 code, const char * parms)
+void K3LAPIBase::command (int32 dev, int32 obj, int32 code, const char * parms) const
 {
     K3L_COMMAND cmd;
 
@@ -166,12 +164,12 @@ void K3LAPI::command (int32 dev, int32 obj, int32 code, const char * parms)
         throw failed_command(code, dev, obj, rc);
 }
 
-void K3LAPI::raw_command(int32 dev, int32 dsp, std::string & str)
+void K3LAPIBase::raw_command(int32 dev, int32 dsp, std::string & str) const
 {
     raw_command(dev, dsp, str.data(), str.size());
 }
 
-void K3LAPI::raw_command(int32 dev, int32 dsp, const char * cmds, int32 size)
+void K3LAPIBase::raw_command(int32 dev, int32 dsp, const char * cmds, int32 size) const
 {
     std::string str(cmds, size);
 
@@ -181,7 +179,7 @@ void K3LAPI::raw_command(int32 dev, int32 dsp, const char * cmds, int32 size)
         throw failed_raw_command(dev, dsp, rc);
 }
 
-KLibraryStatus K3LAPI::get_param(K3L_EVENT *ev, const char *name, std::string &res)
+KLibraryStatus K3LAPIBase::get_param(K3L_EVENT *ev, const char *name, std::string &res) const
 {
     char tmp_param[256];
     memset((void*)tmp_param, 0, sizeof(tmp_param));
@@ -195,7 +193,7 @@ KLibraryStatus K3LAPI::get_param(K3L_EVENT *ev, const char *name, std::string &r
     return ksSuccess;
 }
 
-std::string K3LAPI::get_param(K3L_EVENT *ev, const char *name)
+std::string K3LAPIBase::get_param(K3L_EVENT *ev, const char *name) const
 {
     std::string res;
 
@@ -207,7 +205,7 @@ std::string K3LAPI::get_param(K3L_EVENT *ev, const char *name)
     return res;
 }
 
-void K3LAPI::init(void)
+void K3LAPIBase::init(void)
 {
     if (_device_count != 0) return;
 
@@ -217,20 +215,16 @@ void K3LAPI::init(void)
     _device_config  = new device_conf_type[_device_count];
     _channel_config = new channel_ptr_conf_type[_device_count];
     _link_config    = new link_ptr_conf_type[_device_count];
-    _channel_count  = new unsigned int[_device_count];
-    _link_count     = new unsigned int[_device_count];
+    _channel_count    = new unsigned int[_device_count];
+    _link_count        = new unsigned int[_device_count];
 
     for (unsigned int dev = 0; dev < _device_count; dev++)
     {
-        KLibraryStatus ret = ksSuccess;
-
         _device_type[dev] = (KDeviceType) k3lGetDeviceType(dev);
 
         /* caches each device config */
-        ret = (KLibraryStatus)k3lGetDeviceConfig(dev, ksoDevice + dev, &(_device_config[dev]), sizeof(_device_config[dev]));
-
-        if (ret != ksSuccess)
-            throw start_failed(STG(FMT("k3lGetDeviceConfig(dev=%d): %s") % dev % Verbose::status(ret)));
+        if (k3lGetDeviceConfig(dev, ksoDevice + dev, &(_device_config[dev]), sizeof(_device_config[dev])) != ksSuccess)
+            throw start_failed("k3lGetDeviceConfig(device)");
 
         /* adjust channel/link count for device */
         _channel_count[dev] = _device_config[dev].ChannelCount;
@@ -241,10 +235,9 @@ void K3LAPI::init(void)
 
         for (unsigned int obj = 0; obj < _channel_count[dev]; obj++)
         {
-            ret = (KLibraryStatus)k3lGetDeviceConfig(dev, ksoChannel + obj, &(_channel_config[dev][obj]), sizeof(_channel_config[dev][obj]));
-
-            if (ret != ksSuccess)
-                throw start_failed(STG(FMT("k3lGetDeviceConfig(dev=%d,chan=%d): %s") % dev % obj % Verbose::status(ret)));
+            if (k3lGetDeviceConfig(dev, ksoChannel + obj, &(_channel_config[dev][obj]),
+                                    sizeof(_channel_config[dev][obj])) != ksSuccess)
+                throw start_failed("k3lGetDeviceConfig(channel)");
         }
 
         /* adjust link count for device */
@@ -255,15 +248,14 @@ void K3LAPI::init(void)
 
         for (unsigned int obj = 0; obj < _link_count[dev]; obj++)
         {
-            ret = (KLibraryStatus)k3lGetDeviceConfig(dev, ksoLink + obj, &(_link_config[dev][obj]), sizeof(_link_config[dev][obj]));
-
-            if (ret != ksSuccess)
-                throw start_failed(STG(FMT("k3lGetDeviceConfig(dev=%d,link=%d): %s") % dev % obj % Verbose::status(ret)));
+            if (k3lGetDeviceConfig(dev, ksoLink + obj, &(_link_config[dev][obj]),
+                                    sizeof(_link_config[dev][obj])) != ksSuccess)
+                throw start_failed("k3lGetDeviceConfig(link)");
         }
     }
 }
 
-void K3LAPI::fini(void)
+void K3LAPIBase::fini(void)
 {
     for (unsigned int dev = 0; dev < _device_count; dev++)
     {
@@ -290,9 +282,9 @@ void K3LAPI::fini(void)
     if (_link_count)     { delete[] _link_count;         _link_count = NULL; }
 }
 
-int32 K3LAPI::get_dsp(int32 dev, K3LAPI::DspType type)
+int32 K3LAPIBase::get_dsp(KDeviceType devtype, K3LAPI::DspType type) const
 {
-    switch (device_type(dev))
+    switch (devtype)
     {
         case kdtFXO:
         case kdtFXOVoIP:
@@ -311,3 +303,7 @@ int32 K3LAPI::get_dsp(int32 dev, K3LAPI::DspType type)
     }
 }
 
+int32 K3LAPIBase::get_dsp(const K3LAPIBase::GenericTarget & tgt, K3LAPI::DspType type) const
+{
+    return get_dsp(_device_type[tgt.device], type);
+}
diff --git a/src/mod/endpoints/mod_khomp/commons/k3lapi.hpp b/src/mod/endpoints/mod_khomp/commons/base/k3lapi.hpp
similarity index 50%
rename from src/mod/endpoints/mod_khomp/commons/k3lapi.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/k3lapi.hpp
index 596548405b..ef12a3f676 100644
--- a/src/mod/endpoints/mod_khomp/commons/k3lapi.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/k3lapi.hpp
@@ -40,6 +40,9 @@
 */
 
 #include <string>
+#include <stdexcept>
+
+#include <format.hpp>
 
 #include <k3l.h>
 
@@ -59,15 +62,110 @@
 #ifndef _K3LAPI_HPP_
 #define _K3LAPI_HPP_
 
-struct K3LAPI
+struct K3LAPITraits
 {
+    struct invalid_device;
+    struct invalid_channel;
+    struct invalid_link;
+
+    struct invalid_target: public std::runtime_error
+    {
+        friend class invalid_device;
+        friend class invalid_channel;
+        friend class invalid_link;
+
+        const int32 device, object;
+
+      protected:
+        invalid_target(int32 _device, int32 _object, const std::string & msg)
+        : std::runtime_error(msg), device(_device), object(_object) {};
+    };
+
+    struct invalid_device: public invalid_target
+    {
+        invalid_device(int32 _device)
+        : invalid_target(_device, -1, STG(FMT("invalid device number '%d'") % _device)) {};
+    };
+
+    struct invalid_channel: public invalid_target
+    {
+        invalid_channel(int32 _device, int32 _channel)
+        : invalid_target(_device, _channel, STG(FMT("invalid channel number '%d' on device '%d'") % _channel % _device)) {};
+    };
+
+    struct invalid_link: public invalid_target
+    {
+        invalid_link(int32 _device, int32 _link)
+        : invalid_target(_device, _link, STG(FMT("invalid link number '%d' on device '%d'") % _link % _device)) {};
+    };
+};
+
+struct K3LAPIBase
+{
+    /* High level checked object identifier. */
+
+    struct GenericTarget
+    {
+        typedef enum { DEVICE, CHANNEL, MIXER, LINK } Type;
+
+        GenericTarget(const K3LAPIBase & k3lapi, Type _type, int32 _device, int32 _object)
+        : type(_type), device((unsigned int)_device), object((unsigned int)_object)
+        {
+            switch (_type)
+            {
+                case DEVICE:
+                    if (!k3lapi.valid_device(_device))
+                        throw K3LAPITraits::invalid_device(_device);
+                    break;
+
+                case CHANNEL:
+                case MIXER:
+                    if (!k3lapi.valid_channel(_device, _object))
+                        throw K3LAPITraits::invalid_channel(_device, _object);
+                    break;
+
+                case LINK:
+                    if (!k3lapi.valid_link(_device, _object))
+                        throw K3LAPITraits::invalid_link(_device, _object);
+                    break;
+            }
+        };
+
+        const Type type;
+
+        const unsigned int device;
+        const unsigned int object;
+    };
+
+/*
+    struct LinkTarget    : public GenericTarget
+    {
+        LinkTarget(const K3LAPIBase & k3lapi, int32 _device, int32 _object)
+        : GenericTarget(k3lapi, GenericTarget::LINK, _device, _object) {};
+    };
+
+    struct ChannelTarget : public GenericTarget
+    {
+        ChannelTarget(const K3LAPIBase & k3lapi, int32 _device, int32 _object)
+        : GenericTarget(k3lapi, GenericTarget::CHANNEL, _device, _object) {};
+    };
+
+*/
+    template < GenericTarget::Type T >
+    struct Target: public GenericTarget
+    {
+        Target(const K3LAPIBase & k3lapi, int32 _device, int32 _object)
+        : GenericTarget(k3lapi, T, _device, _object) {};
+
+//        operator const GenericTarget&() const { return static_cast<const GenericTarget &>(*this); };
+    };
+
     /* exceptions */
 
-    struct start_failed
+    struct start_failed: public std::runtime_error
     {
-        start_failed(const char * _msg) : msg(_msg) {};
-        start_failed(std::string  _msg) : msg(_msg) {};
-        std::string msg;
+        start_failed(const char * msg)
+        : std::runtime_error(msg) {};
     };
 
     struct failed_command
@@ -91,30 +189,6 @@ struct K3LAPI
         int32           rc;
     };
 
-    struct invalid_device
-    {
-        invalid_device(int32 _device)
-        : device(_device) {};
-
-        int32 device;
-    };
-
-    struct invalid_channel
-    {
-        invalid_channel(int32 _device, int32 _channel)
-        : device(_device), channel(_channel) {};
-
-        int32 device, channel;
-    };
-
-    struct invalid_link
-    {
-        invalid_link(unsigned int _device, unsigned int _link)
-        : device(_device), link(_link) {};
-
-        int32 device, link;
-    };
-
     struct get_param_failed
     {
         get_param_failed(std::string _name, int32 _rc)
@@ -124,6 +198,8 @@ struct K3LAPI
         KLibraryStatus rc;
     };
 
+    /* typedefs essenciais */
+
     typedef K3L_DEVICE_CONFIG          device_conf_type;
     typedef K3L_CHANNEL_CONFIG        channel_conf_type;
     typedef K3L_CHANNEL_CONFIG *  channel_ptr_conf_type;
@@ -132,8 +208,8 @@ struct K3LAPI
 
     /* constructors/destructors */
 
-             K3LAPI(bool has_exceptions = false);
-    virtual ~K3LAPI() {};
+             K3LAPIBase();
+    virtual ~K3LAPIBase() {};
 
     /* (init|final)ialize the whole thing! */
 
@@ -142,239 +218,106 @@ struct K3LAPI
 
     /* verificacao de intervalos */
 
-    inline bool valid_device(int32 dev)
+    inline bool valid_device(int32 dev) const
     {
         return (dev >= 0 && dev < ((int32)_device_count));
     }
 
-    inline bool valid_channel(int32 dev, int32 obj)
+    inline bool valid_channel(int32 dev, int32 obj) const
     {
         return (valid_device(dev) && obj >= 0 && obj < ((int32)_channel_count[dev]));
     }
 
-    inline bool valid_link(int32 dev, int32 obj)
+    inline bool valid_link(int32 dev, int32 obj) const
     {
         return (valid_device(dev) && obj >= 0 && obj < ((int32)_link_count[dev]));
     }
 
-    /*!
-      \brief High level object identifier
-      Since Khomp works with an object concept, this is used to map the
-      object id with its proper type.
-     */
-    struct target
-    {
-        /*! The types a target can have */
-        typedef enum { DEVICE, CHANNEL, MIXER, LINK } target_type;
-
-        target(K3LAPI & k3lapi, target_type type_init, int32 device_value, int32 object_value)
-        : type(type_init),
-          device((unsigned short)device_value),
-          object((unsigned short)object_value)
-        {
-            switch (type_init)
-            {
-                case DEVICE:
-                    if (!k3lapi.valid_device(device_value))
-                        throw invalid_device(device_value);
-                    break;
-
-                case CHANNEL:
-                case MIXER:
-                    if (!k3lapi.valid_channel(device_value, object_value))
-                        throw invalid_channel(device_value, object_value);
-                    break;
-
-                case LINK:
-                    if (!k3lapi.valid_link(device_value, object_value))
-                        throw invalid_link(device_value, object_value);
-                    break;
-            }
-
-        };
-
-        const target_type type;
-
-        const unsigned short device;
-        const unsigned short object;
-    };
-
     /* envio de comandos para placa (geral) */
 
-    void raw_command(int32 dev, int32 dsp, std::string & str);
-    void raw_command(int32 dev, int32 dsp, const char * cmds, int32 size);
+    void raw_command(int32 dev, int32 dsp, std::string & str) const;
+    void raw_command(int32 dev, int32 dsp, const char * cmds, int32 size) const;
 
     /* obter dados 'cacheados' (geral) */
 
-    inline unsigned int device_count(void)
+    inline unsigned int device_count(void) const
     {
         return _device_count;
     }
 
     /* envio de comandos para placa (sem identificadores) */
 
-    void mixer(int32 dev, int32 obj, byte track, KMixerSource src, int32 index);
-    void mixerRecord(int32 dev, int32 obj, byte track, KMixerSource src, int32 index);
-    void mixerCTbus(int32 dev, int32 obj, byte track, KMixerSource src, int32 index);
+    void mixer(int32 dev, int32 obj, byte track, KMixerSource src, int32 index) const;
+    void mixerRecord(int32 dev, KDeviceType type, int32 obj, byte track, KMixerSource src, int32 index) const;
+    void mixerCTbus(int32 dev, int32 obj, byte track, KMixerSource src, int32 index) const;
 
-    void command (int32 dev, int32 obj, int32 code, std::string & str);
-    void command (int32 dev, int32 obj, int32 code, const char * parms = NULL);
+    void command (int32 dev, int32 obj, int32 code, std::string & str) const;
+    void command (int32 dev, int32 obj, int32 code, const char * parms = NULL) const;
 
-    /* obter dados 'cacheados' (sem identificadores) */
-
-    inline unsigned int channel_count(int32 dev)
-    {
-        if (!valid_device(dev))
-        {
-            if (_has_exceptions)
-                throw invalid_device(dev);
-            else
-                return 0;
-        }
-
-        return _channel_count[dev];
-    }
-
-    inline unsigned int link_count(int32 dev)
-    {
-        if (!valid_device(dev))
-        {
-            if (_has_exceptions)
-                throw invalid_device(dev);
-            else
-                return 0;
-        }
-
-        return _link_count[dev];
-    }
-
-    inline uint32 channel_stats(int32 dev, int32 obj, uint32 index)
-    {
-        if (!valid_channel(dev, obj))
-        {
-            if (_has_exceptions)
-                throw invalid_channel(dev, obj);
-            else
-                return 0;
-        }
-
-        uint32 res_value = (uint32)-1;
-        stt_code stt_res = ksFail;
-
-#if K3L_AT_LEAST(2,1,0)
-        stt_res = k3lGetChannelStats(dev, obj, index, &res_value);
-#endif
-
-        if(stt_res != ksSuccess)
-        {
-            return (uint32)-1;
-        }
-
-        return res_value;
-    }
-
-    KDeviceType device_type(int32 dev)
-    {
-        if (!valid_device(dev))
-        {
-            if (_has_exceptions)
-                throw invalid_device(dev);
-            else
-                return kdtDevTypeCount;
-        }
-
-        return _device_type[dev];
-    }
-
-
-    K3L_DEVICE_CONFIG & device_config(int32 dev)
-    {
-        if (!valid_device(dev))
-            throw invalid_device(dev);
-
-        return _device_config[dev];
-    }
-
-    K3L_CHANNEL_CONFIG & channel_config(int32 dev, int32 obj)
-    {
-        if (!valid_channel(dev, obj))
-            throw invalid_channel(dev, obj);
-
-        return _channel_config[dev][obj];
-    }
-
-    K3L_LINK_CONFIG & link_config(int32 dev, int32 obj)
-    {
-        if (!valid_link(dev, obj))
-            throw invalid_channel(dev, obj);
-
-        return _link_config[dev][obj];
-    }
 
     /* envio de comandos para placa (com identificadores) */
 
-    void mixer(target & tgt, byte track, KMixerSource src, int32 index)
+    void mixer(const GenericTarget & tgt, byte track, KMixerSource src, int32 index) const
     {
-        mixer((int32)tgt.device, (int32)tgt.object, track, src, index);
+        mixer(tgt.device, tgt.object, track, src, index);
     }
 
-    void mixerRecord(target & tgt, byte track, KMixerSource src, int32 index)
+    void mixerRecord(const GenericTarget & tgt, byte track, KMixerSource src, int32 index) const
     {
-        mixerRecord((int32)tgt.device, (int32)tgt.object, track, src, index);
+        mixerRecord((int32)tgt.device, _device_type[tgt.device], (int32)tgt.object, track, src, index);
     }
 
-    void mixerCTbus(target & tgt, byte track, KMixerSource src, int32 index)
+    void mixerCTbus(const GenericTarget & tgt, byte track, KMixerSource src, int32 index) const
     {
         mixerCTbus((int32)tgt.device, (int32)tgt.object, track, src, index);
     }
 
-    void command (target & tgt, int32 code, std::string & str)
+    void command(const GenericTarget & tgt, int32 code, std::string & str) const
     {
         command((int32)tgt.device, (int32)tgt.object, code, str);
     };
 
-    void command (target & tgt, int32 code, const char * parms = NULL)
+    void command(const GenericTarget & tgt, int32 code, const char * parms = NULL) const
     {
         command((int32)tgt.device, (int32)tgt.object, code, parms);
     };
 
     /* obter dados 'cacheados' (com indentificadores) */
 
-    inline unsigned int channel_count(target & tgt)
+    inline unsigned int channel_count(const GenericTarget & tgt) const
     {
         return _channel_count[tgt.device];
     }
 
-    inline unsigned int link_count(target & tgt)
+    inline unsigned int link_count(const GenericTarget & tgt) const
     {
         return _link_count[tgt.device];
     }
 
-    KDeviceType device_type(target & tgt)
+    KDeviceType device_type(const GenericTarget & tgt) const
     {
         return _device_type[tgt.device];
     }
 
-
-    K3L_DEVICE_CONFIG & device_config(target & tgt)
+    const K3L_DEVICE_CONFIG & device_config(const GenericTarget & tgt) const
     {
         return _device_config[tgt.device];
     }
 
-    K3L_CHANNEL_CONFIG & channel_config(target & tgt)
+    const K3L_CHANNEL_CONFIG & channel_config(const Target<GenericTarget::CHANNEL> & tgt) const
     {
         return _channel_config[tgt.device][tgt.object];
     }
 
-    K3L_LINK_CONFIG & link_config(target & tgt)
+    const K3L_LINK_CONFIG & link_config(const Target<GenericTarget::LINK> & tgt) const
     {
         return _link_config[tgt.device][tgt.object];
     }
 
     /* pega valores em strings de eventos */
 
-    KLibraryStatus get_param(K3L_EVENT *ev, const char *name, std::string &res);
-    std::string get_param(K3L_EVENT *ev, const char *name);
+    KLibraryStatus get_param(K3L_EVENT *ev, const char *name, std::string &res) const;
+    std::string get_param(K3L_EVENT *ev, const char *name) const;
 
     /* inicializa valores em cache */
 
@@ -389,12 +332,12 @@ struct K3LAPI
         DSP_SIGNALING,
     };
 
-    int32 get_dsp(int32, DspType);
+    int32 get_dsp(KDeviceType, DspType) const;
+
+    int32 get_dsp(const GenericTarget &, DspType) const;
 
  protected:
 
-    const bool           _has_exceptions;
-
     unsigned int           _device_count;
     unsigned int *        _channel_count;
     unsigned int *           _link_count;
@@ -405,4 +348,145 @@ struct K3LAPI
               KDeviceType *     _device_type;
 };
 
+/* exceptions */
+template < bool E = false >
+struct K3LAPIException
+{
+    void invalid_device(const int32 device) const
+    {
+        /* NOTHING */
+    }
+
+    void invalid_channel(const int32 device, const int32 channel) const
+    {
+        /* NOTHING */
+    }
+
+    void invalid_link(const int32 device, const int32 link) const
+    {
+        /* NOTHING */
+    }
+};
+
+template < >
+struct K3LAPIException < true >
+{
+    void invalid_device(const int32 device) const
+    {
+        throw K3LAPITraits::invalid_device(device);
+    }
+
+    void invalid_channel(const int32 device, const int32 channel) const
+    {
+        throw K3LAPITraits::invalid_channel(device, channel);
+    }
+
+    void invalid_link(const int32 device, const int32 link) const
+    {
+        throw K3LAPITraits::invalid_link(device, link);
+    }
+};
+
+template < bool E = false >
+struct K3LAPITemplate: public K3LAPIBase, protected K3LAPIException < E >
+{
+    using K3LAPIBase::device_config;
+    using K3LAPIBase::channel_config;
+    using K3LAPIBase::link_config;
+
+    using K3LAPIBase::device_type;
+    using K3LAPIBase::get_dsp;
+    
+    using K3LAPIBase::mixerRecord;
+
+    /* obter dados 'cacheados' (sem identificadores) */
+
+    inline unsigned int channel_count(int32 dev) const
+    {
+        if (!valid_device(dev))
+        {
+            K3LAPIException< E >::invalid_device(dev);
+            return 0;
+        }
+
+        return _channel_count[dev];
+    }
+
+    inline unsigned int link_count(int32 dev) const
+    {
+        if (!valid_device(dev))
+        {
+            K3LAPIException< E >::invalid_device(dev);
+            return 0;
+        }
+
+        return _link_count[dev];
+    }
+
+    inline uint32 channel_stats(int32 dev, int32 obj, uint32 index) const
+    {
+        if (!valid_channel(dev, obj))
+        {
+            K3LAPIException< E >::invalid_channel(dev, obj);
+            return 0u;
+        }
+
+        uint32 res_value = 0u;
+
+#if K3L_AT_LEAST(2,1,0)
+        if (k3lGetChannelStats(dev, obj, index, &res_value) != ksSuccess)
+            return 0u;
+
+        return res_value;
+#endif
+    }
+
+    KDeviceType device_type(int32 dev) const
+    {
+        if (!valid_device(dev))
+        {
+            K3LAPIException< E >::invalid_device(dev);
+            return kdtDevTypeCount;
+        }
+
+        return _device_type[dev];
+    }
+
+    const K3L_DEVICE_CONFIG & device_config(int32 dev) const
+    {
+        if (!valid_device(dev))
+            throw K3LAPITraits::invalid_device(dev);
+
+        return _device_config[dev];
+    }
+
+    const K3L_CHANNEL_CONFIG & channel_config(int32 dev, int32 obj) const
+    {
+        if (!valid_channel(dev, obj))
+            throw K3LAPITraits::invalid_channel(dev, obj);
+
+        return _channel_config[dev][obj];
+    }
+
+    const K3L_LINK_CONFIG & link_config(int32 dev, int32 obj) const
+    {
+        if (!valid_link(dev, obj))
+            throw K3LAPITraits::invalid_link(dev, obj);
+
+        return _link_config[dev][obj];
+    }
+
+    int32 get_dsp(int32 dev, DspType type) const
+    {
+        return get_dsp(device_type(dev), type);
+    }
+
+    void mixerRecord(int32 dev, int32 obj, byte track, KMixerSource src, int32 index) const
+    {
+        mixerRecord(dev, device_type(dev), obj, track, src, index);
+    }
+};
+
+typedef K3LAPITemplate<> K3LAPI;
+
 #endif /* _K3LAPI_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/k3lutil.cpp b/src/mod/endpoints/mod_khomp/commons/base/k3lutil.cpp
similarity index 83%
rename from src/mod/endpoints/mod_khomp/commons/k3lutil.cpp
rename to src/mod/endpoints/mod_khomp/commons/base/k3lutil.cpp
index 83ac82efae..3fda813a03 100644
--- a/src/mod/endpoints/mod_khomp/commons/k3lutil.cpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/k3lutil.cpp
@@ -46,7 +46,8 @@ std::string K3LUtil::channelStatus(int32 dev, int32 channel,
 {
     try
     {
-        K3L_CHANNEL_CONFIG & config = _k3lapi.channel_config(dev, channel);
+        const K3L_CHANNEL_CONFIG & config = _k3lapi.channel_config(dev, channel);
+
         K3L_CHANNEL_STATUS   status;
 
         KLibraryStatus ret = (KLibraryStatus) k3lGetDeviceStatus (dev,
@@ -60,7 +61,7 @@ std::string K3LUtil::channelStatus(int32 dev, int32 channel,
                                                             : "Unknown (fail)");
         }
     }
-    catch(K3LAPI::invalid_channel & e)
+    catch(K3LAPITraits::invalid_channel & e)
     {
         return (fmt == Verbose::EXACT ? "<unknown[fail]>" : "Unknown (fail)");
     }
@@ -83,64 +84,35 @@ std::string K3LUtil::callStatus(int32 dev, int32 channel,
 }
 
 std::string K3LUtil::linkStatus(int32 dev, int32 link,
-        Verbose::Presentation fmt, KSignaling sig)
+        Verbose::Presentation fmt, KSignaling signaling, bool simpleStatus)
 {
     try
     {
-        if (sig == ksigInactive)
+        if (signaling == ksigInactive)
         {
-            K3L_LINK_CONFIG & config = _k3lapi.link_config(dev, link);
-            sig = config.Signaling;
+            const K3L_LINK_CONFIG & config = _k3lapi.link_config(dev, link);
+            signaling = config.Signaling;
         }
 
-       	K3L_LINK_STATUS   status;
+        K3L_LINK_STATUS   status;
 
         KLibraryStatus ret = (KLibraryStatus) k3lGetDeviceStatus (dev,
                 link + ksoLink, &status, sizeof(status));
 
         switch (ret)
         {
-            case ksSuccess:  return Verbose::linkStatus(sig, status.E1, fmt);
+            case ksSuccess:  return Verbose::linkStatus(signaling, status.E1, fmt, simpleStatus);
             default:         return (fmt == Verbose::EXACT ?
                                 "<unknown[failure]>" : "Unknown (failure)");
         }
     }
-    catch(K3LAPI::invalid_channel & e)
+    catch(K3LAPITraits::invalid_channel & e)
     {
         return (fmt == Verbose::EXACT ? "<unknown[failure]>"
                                         : "Unknown (failure)");
     }
 }
 
-std::string K3LUtil::getLinkStatus(int32 dev, int32 link,
-            Verbose::Presentation fmt)
-{
-    switch (_k3lapi.device_type(dev))
-    {
-#if K3L_AT_LEAST(1,6,0)
-        case kdtFXS:
-        case kdtFXSSpx:
-            return linkStatus(dev, link, fmt, ksigAnalogTerminal);
-
-#if K3L_AT_LEAST(2,1,0)
-        case kdtE1FXSSpx:
-            if (link == 1)
-                return linkStatus(dev, link, fmt, ksigAnalogTerminal);
-#endif
-#endif
-        default:
-            break;
-    }
-
-    K3L_LINK_CONFIG & conf = _k3lapi.link_config(dev, link);
-
-    std::string res = linkStatus(dev, link, fmt);
-
-    if (conf.ReceivingClock & 0x01)
-       res += (fmt == Verbose::EXACT ? ",sync" : " (sync)");
-
-    return res;
-}
 
 unsigned int K3LUtil::physicalLinkCount(int32 dev, bool count_virtual)
 {
@@ -199,7 +171,7 @@ unsigned int K3LUtil::physicalLinkCount(int32 dev, bool count_virtual)
                 break;
         }
     }
-    catch(K3LAPI::invalid_device & e)
+    catch(K3LAPITraits::invalid_device & e)
     {
         return 0;
     }
diff --git a/src/mod/endpoints/mod_khomp/commons/k3lutil.hpp b/src/mod/endpoints/mod_khomp/commons/base/k3lutil.hpp
similarity index 95%
rename from src/mod/endpoints/mod_khomp/commons/k3lutil.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/k3lutil.hpp
index e547f3df6e..9d87d8b0f6 100644
--- a/src/mod/endpoints/mod_khomp/commons/k3lutil.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/k3lutil.hpp
@@ -64,10 +64,8 @@ struct K3LUtil
 
     std::string linkStatus(int32, int32,
             Verbose::Presentation fmt = Verbose::HUMAN,
-            KSignaling sig = ksigInactive);
-
-    std::string getLinkStatus(int32, int32, 
-            Verbose::Presentation fmt = Verbose::HUMAN);
+            KSignaling sig = ksigInactive,
+            bool simpleStatus = false);
 
     unsigned int physicalLinkCount(int32 dev, bool count_virtual = false);
 
diff --git a/src/mod/endpoints/mod_khomp/commons/logger.hpp b/src/mod/endpoints/mod_khomp/commons/base/logger.hpp
similarity index 89%
rename from src/mod/endpoints/mod_khomp/commons/logger.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/logger.hpp
index 6fcf7bffe3..6c333e7b87 100644
--- a/src/mod/endpoints/mod_khomp/commons/logger.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/logger.hpp
@@ -55,6 +55,7 @@
 #if defined(COMMONS_LIBRARY_USING_ASTERISK)
 extern "C"
 {
+    #include <asterisk.h>
     #include <asterisk/localtime.h>
 }
 #elif defined(COMMONS_LIBRARY_USING_CALLWEAVER)
@@ -443,35 +444,17 @@ struct Logger
                         localtime_r (&tv, &lt);
 #endif
 
-                        out_msg += STG(FMT("[%04d-%02d-%02d %02d:%02d:%02d] ")
-                            % (lt.tm_year + 1900) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour
-                            % lt.tm_min % lt.tm_sec);
-
-#elif defined(COMMONS_LIBRARY_USING_CALLWEAVER)
+#elif defined(COMMONS_LIBRARY_USING_CALLWEAVER) || defined(COMMONS_LIBRARY_USING_FREESWITCH)
                         time_t      tv;
                         struct tm   lt;
 
                         time (&tv);
 
                         localtime_r (&tv, &lt);
-
-                        out_msg += STG(FMT("[%04d-%02d-%02d %02d:%02d:%02d] ")
-                            % (lt.tm_year + 1900) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour
-                            % lt.tm_min % lt.tm_sec);
-
-#elif defined(COMMONS_LIBRARY_USING_FREESWITCH)
-                        time_t      tv;
-                        struct tm   lt;
-
-                        time (&tv);
-
-                        localtime_r (&tv, &lt);
-
-                        out_msg += STG(FMT("[%04d-%02d-%02d %02d:%02d:%02d] ")
-                            % (lt.tm_year + 1900) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour
-                            % lt.tm_min % lt.tm_sec);
-
 #endif
+                        out_msg += STG(FMT("[%02d-%02d-%02d %02d:%02d:%02d] ")
+                            % (lt.tm_year % 100) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour
+                            % lt.tm_min % lt.tm_sec);
                     }
 
                     if (opt._flags[Option::DATETIMEMS])
@@ -497,16 +480,16 @@ struct Logger
 #endif
 
 #if ASTERISK_AT_LEAST(1,6,0)
-                        out_msg += STG(FMT("[%04d-%02d-%02d %02d:%02d:%02d:%04d] ")
-                            % (lt.tm_year + 1900) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour % lt.tm_min
+                        out_msg += STG(FMT("[%02d-%02d-%02d %02d:%02d:%02d:%04d] ")
+                            % (lt.tm_year % 100) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour % lt.tm_min
                             % lt.tm_sec % (tv.tv_usec / 1000));
 #else
-                        out_msg += STG(FMT("[%04d-%02d-%02d %02d:%02d:%02d:%04d] ")
-                            % (lt.tm_year + 1900) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour % lt.tm_min
+                        out_msg += STG(FMT("[%02d-%02d-%02d %02d:%02d:%02d:%04d] ")
+                            % (lt.tm_year % 100) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour % lt.tm_min
                             % lt.tm_sec % (tv * 1000));
 #endif
 
-#elif defined(COMMONS_LIBRARY_USING_CALLWEAVER)
+#elif defined(COMMONS_LIBRARY_USING_CALLWEAVER) || defined(COMMONS_LIBRARY_USING_FREESWITCH)
                         time_t      tv;
                         struct tm   lt;
 
@@ -514,22 +497,9 @@ struct Logger
 
                         localtime_r (&tv, &lt);
 
-                        out_msg += STG(FMT("[%04d-%02d-%02d %02d:%02d:%02d:%04d] ")
-                            % (lt.tm_year + 1900) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour % lt.tm_min
+                        out_msg += STG(FMT("[%02d-%02d-%02d %02d:%02d:%02d:%04d] ")
+                            % (lt.tm_year % 100) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour % lt.tm_min
                             % lt.tm_sec % (tv * 1000));
-
-#elif defined(COMMONS_LIBRARY_USING_FREESWITCH)
-                        time_t      tv;
-                        struct tm   lt;
-
-                        time (&tv);
-
-                        localtime_r (&tv, &lt);
-
-                        out_msg += STG(FMT("[%04d-%02d-%02d %02d:%02d:%02d:%04d] ")
-                            % (lt.tm_year + 1900) % (lt.tm_mon + 1) % lt.tm_mday % lt.tm_hour % lt.tm_min
-                            % lt.tm_sec % (tv * 1000));
-
 #endif
                     }
 
@@ -538,7 +508,7 @@ struct Logger
                     if (opt._flags[Option::THREADID])
                     {
 #if defined (COMMONS_LIBRARY_USING_ASTERISK) || defined(COMMONS_LIBRARY_USING_CALLWEAVER) || defined(COMMONS_LIBRARY_USING_FREESWITCH)
-                        out_msg += STG(FMT("t=%08p ") % ((void*)pthread_self()));
+                        out_msg += STG(FMT("%08x ") % ((unsigned long)pthread_self()));
 #endif
                     }
 
diff --git a/src/mod/endpoints/mod_khomp/commons/noncopyable.hpp b/src/mod/endpoints/mod_khomp/commons/base/noncopyable.hpp
similarity index 100%
rename from src/mod/endpoints/mod_khomp/commons/noncopyable.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/noncopyable.hpp
diff --git a/src/mod/endpoints/mod_khomp/commons/refcounter.hpp b/src/mod/endpoints/mod_khomp/commons/base/refcounter.hpp
similarity index 94%
rename from src/mod/endpoints/mod_khomp/commons/refcounter.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/refcounter.hpp
index 6ba8ae8b2f..d1738185bb 100644
--- a/src/mod/endpoints/mod_khomp/commons/refcounter.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/refcounter.hpp
@@ -45,6 +45,11 @@
 #ifndef _REFCOUNTER_HPP_
 #define _REFCOUNTER_HPP_
 
+#define COUNTER_CLASS(...)    ReferenceCounter< __VA_ARGS__ >
+#define COUNTER_SUPER(...)    public COUNTER_CLASS( __VA_ARGS__ )
+#define COUNTER_REFER(o, ...) COUNTER_CLASS( __VA_ARGS__ )(static_cast< const COUNTER_CLASS( __VA_ARGS__ ) & >(o))
+
+// DEPRECATED DECLARATIONS ///
 #define NEW_REFCOUNTER(...)    public ReferenceCounter< __VA_ARGS__ >
 #define INC_REFCOUNTER(o, ...) ReferenceCounter< __VA_ARGS__ >(static_cast< const ReferenceCounter < __VA_ARGS__ > & >(o))
 
@@ -179,13 +184,13 @@ struct ReferenceCounter
 };
 
 template < typename T >
-struct ReferenceContainer: NEW_REFCOUNTER(ReferenceContainer< T >)
+struct ReferenceContainer: COUNTER_SUPER(ReferenceContainer< T >)
 {
     /* type */
     typedef T Type;
 
     /* shorthand */
-    typedef ReferenceCounter < ReferenceContainer< Type > > Counter;
+    typedef COUNTER_CLASS(ReferenceContainer< Type >) Counter;
 
     // TODO: make this a generic exception someday
     struct NotFound {};
@@ -249,7 +254,7 @@ struct ReferenceContainer: NEW_REFCOUNTER(ReferenceContainer< T >)
     };
 
     // return value (pointer)!
-    Type * operator()(void)
+    Type * operator()(void) const
     {
         return _reference_value;
     };
diff --git a/src/mod/endpoints/mod_khomp/commons/regex.cpp b/src/mod/endpoints/mod_khomp/commons/base/regex.cpp
similarity index 94%
rename from src/mod/endpoints/mod_khomp/commons/regex.cpp
rename to src/mod/endpoints/mod_khomp/commons/base/regex.cpp
index 61f941c214..d2b8cd0469 100644
--- a/src/mod/endpoints/mod_khomp/commons/regex.cpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/regex.cpp
@@ -74,7 +74,7 @@ void Regex::Expression::initialize(void)
     _errorstate = regcomp(&_comp_regex, _expression, _flags);
 }
 
-std::string Regex::Expression::regerror_as_string(void)
+std::string Regex::Expression::regerror_as_string(void) const
 {
     unsigned int count = regerror(_errorstate, &_comp_regex, 0, 0) + 1;
 
@@ -95,6 +95,7 @@ void Regex::Match::initialize(void)
     {
         _subcounter = (_expression.subcount() + 2); // 0 + N.. + invalid
         _submatches = new regmatch_t[_subcounter];
+        _subcaching = new std::string[_subcounter];
         _have_match = (regexec(_expression.repr(), _basestring.c_str(),
             _subcounter, _submatches, _flags) == 0);
     }
@@ -117,7 +118,7 @@ std::string Regex::Match::replace(Regex::ReplaceMap & map)
     try
     {
         if (_submatches[0].rm_so != 0 && (map.find(0) != map.end()))
-            return _basestring.replace(_submatches[0].rm_so, _submatches[0].rm_eo - _submatches[0].rm_so, map.find(0)->second);
+            return buffer.replace(_submatches[0].rm_so, _submatches[0].rm_eo - _submatches[0].rm_so, map.find(0)->second);
 
         for (unsigned int n = 1; (_submatches[n].rm_so != -1) && (n < _subcounter); n++)
         {
diff --git a/src/mod/endpoints/mod_khomp/commons/regex.hpp b/src/mod/endpoints/mod_khomp/commons/base/regex.hpp
similarity index 78%
rename from src/mod/endpoints/mod_khomp/commons/regex.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/regex.hpp
index daf20147a8..61325238b8 100644
--- a/src/mod/endpoints/mod_khomp/commons/regex.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/regex.hpp
@@ -111,12 +111,12 @@ struct Regex
             }
         }
 
-        bool               valid(void) { return (_errorstate == 0); }
+        bool               valid(void) const { return (_errorstate == 0); }
 
-        unsigned int    subcount(void) { return  _subcounter; }
-        const regex_t *     repr(void) { return &_comp_regex; }
+        unsigned int    subcount(void) const { return  _subcounter; }
+        const regex_t *     repr(void) const { return &_comp_regex; }
 
-        std::string error(void)
+        std::string error(void) const
         {
             switch (_errorstate)
             {
@@ -127,31 +127,33 @@ struct Regex
         }
 
      private:
-        void                initialize(void);
-        std::string regerror_as_string(void);
+        std::string regerror_as_string(void) const;
+
+     private:
+        void initialize(void);
 
      protected:
         const char   * _expression;
-        bool           _alloced;
+        const bool     _alloced;
 
         unsigned int   _subcounter;
 
         int            _errorstate;
         regex_t        _comp_regex;
 
-        unsigned int   _flags;
+        const unsigned int _flags;
     };
 
-    struct Match: NEW_REFCOUNTER(Match)
+    struct Match: COUNTER_SUPER(Match)
     {
-        Match(const char * basestring, Expression & expression, unsigned int flags = 0)
+        Match(const char * basestring, const Expression & expression, unsigned int flags = 0)
         : _basestring(basestring), _expression(expression), _subcounter(0), _submatches(0),
            _have_match(false), _flags(flags)
         {
             initialize();
         }
 
-        Match(std::string & basestring, Expression & expression, unsigned int flags = 0)
+        Match(const std::string & basestring, const Expression & expression, unsigned int flags = 0)
         : _basestring(basestring), _expression(expression), _subcounter(0), _submatches(0),
           _have_match(false), _flags(flags)
         {
@@ -159,7 +161,7 @@ struct Regex
         }
 
         Match(const Match & o)
-        : INC_REFCOUNTER(o, Match),
+        : COUNTER_REFER(o, Match),
           _basestring(o._basestring), _expression(o._expression),
           _subcounter(o._subcounter), _submatches(o._submatches),
           _have_match(o._have_match), _flags(o._flags)
@@ -169,6 +171,10 @@ struct Regex
         void unreference()
         {
             delete[] _submatches;
+            delete[] _subcaching;
+
+            _submatches = 0;
+            _subcaching = 0;
         }
 
         bool matched(void)
@@ -184,34 +190,23 @@ struct Regex
             return false;
         }
 
-        std::string submatch(int number)
+        const std::string & submatch(int number)
         {
             if (!matched(number))
-                return "";
+                return _subcaching[_subcounter - 1 /* invalid, always empty! */ ];
 
-            return _basestring.substr(_submatches[number].rm_so,
-                _submatches[number].rm_eo - _submatches[number].rm_so);
-        }
-
-        /**
-        * \brief gets a map with all matches
-        * \return std::map<int,std::string> with all matches
-        * \note index 0 in map, is the complete string
-        * \author Eduardo Nunes Pereira
-        *
-        * If fails the empty map is returned
-        */
-        std::map<int, std::string> obtain_match_map()
-        {
-            int match_counter = 0;
-            std::map<int,std::string> tmp_map;
-            while(matched(match_counter))
+            if (_subcaching[number].empty())
             {
-                tmp_map.insert(std::make_pair(match_counter,submatch(match_counter)));
-                match_counter++;
+                _subcaching[number].assign(_basestring, _submatches[number].rm_so,
+                    _submatches[number].rm_eo - _submatches[number].rm_so);
             }
 
-            return tmp_map;
+            return _subcaching[number];
+        }
+
+        const std::string & operator[](int number)
+        {
+            return submatch(number);
         }
 
         /**
@@ -226,25 +221,21 @@ struct Regex
         std::string replace(ReplaceMap &);
         std::string replace(std::string, unsigned int index = REP_BASE);
 
-        std::string operator[](int number)
-        {
-            return submatch(number);
-        }
-
         // NOTE: there is already a way to get subcount defined on EXPRESSION class!
 
      private:
         void initialize(void);
 
      protected:
-        std::string    _basestring;
-        Expression   & _expression;
+        const std::string    _basestring;
+        const Expression   & _expression;
 
         unsigned int   _subcounter;
         regmatch_t   * _submatches;
-
+        std::string  * _subcaching;
         bool           _have_match;
-        unsigned int   _flags;
+
+        const unsigned int  _flags;
     };
 };
 
diff --git a/src/mod/endpoints/mod_khomp/commons/base/ringbuffer.cpp b/src/mod/endpoints/mod_khomp/commons/base/ringbuffer.cpp
new file mode 100644
index 0000000000..42056307e0
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/base/ringbuffer.cpp
@@ -0,0 +1,485 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  The contents of this file are subject to the Mozilla Public License Version 1.1
+  (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.mozilla.org/MPL/
+
+  Software distributed under the License is distributed on an "AS IS" basis,
+  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+  the specific language governing rights and limitations under the License.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <ringbuffer.hpp>
+
+// #include <stdio.h>
+
+
+  /* Documentation of the formula used in the buffer arithmetic.
+   *
+   * [0|1|2|3|4|5|6|7] => size=8
+   *      |   |
+   *  reader  |
+   *         writer
+   *
+   * => writer has places [5,6,7,0,1] to write (5 places).
+   *
+   * =>  8 - (4-2+1) = 8 - (2+1) = 8 - 3 = 5
+   *
+   * > writer goes 1 up, amount goes 1 down.
+   * > reader goes 1 up, amount goes 1 up.
+   * > size goes 1 down, amount goes 1 down.
+   *
+   */
+
+/********** BUFFER FUNCTIONS **********/
+
+/* writes everything or nothing */
+bool Ringbuffer_traits::traits_provide(char * buffer, const char * value, unsigned int amount, bool do_not_overwrite)
+{
+    /* avoid using different values */
+    Buffer_table cache = _pointers;
+
+    bool need_overwrite = false;
+
+    if (amount > free_blocks(cache))
+    {
+        if (do_not_overwrite)
+            return false;
+
+        /* if we are allowed to overwrite, just the buffer size matters for us */
+        if (amount >= _size)
+            return false;
+
+        /* we need to change reader pointer below... */
+        need_overwrite = true;
+    }
+
+    const unsigned int wr = cache.writer.complete;
+    const unsigned int wp = cache.writer.complete - 1;
+
+    /* should we go around the buffer for writing? */
+    if ((wr + amount) > _size)
+    {
+//        fprintf(stderr, "%p> first if matched\n", this);
+
+        if (need_overwrite)
+        {
+            do
+            {
+                Buffer_pointer extra(cache.reader);
+                extra.complete = ((wr + amount) % _size); // (extra.complete + amount) % _size;
+//                extra.complete = (extra.complete + amount) % _size;
+
+                if (update(cache.reader, extra))
+                    break;
+            }
+            while (true);
+        }
+
+        unsigned int wr1 = _size - wr + 1; /* writer is already 1 position after */
+        unsigned int wr2 = amount - wr1;
+
+//        fprintf(stderr, "%p> partial write: (%d/%d) %d/%d [%d/%d]\n", this, wr1, wr2, amount, _size, reader, writer);
+
+        /* two partial writes (one at the end, another at the beginning) */
+        memcpy((void *) &(buffer[wp]), (const void *)  (value),      _block * wr1);
+        memcpy((void *)  (buffer),     (const void *) &(value[wr1]), _block * wr2);
+    }
+    else
+    {
+//        fprintf(stderr, "%p> second if matched\n", this);
+
+        if (need_overwrite)
+        {
+            do
+            {
+                Buffer_pointer extra(cache.reader);
+                extra.complete = ((wr + amount) % _size); // (extra.complete + amount) % _size;
+
+                if (update(cache.reader, extra))
+                    break;
+            }
+            while (true);
+        }
+
+//        fprintf(stderr, "%p> full write: a=%d/s=%d [r=%d/w=%d]\n", this, amount, _size, reader, writer);
+
+        /* we are talking about buffers here, man! */
+        memcpy((void *) &(buffer[wp]), (const void *) value, _block * amount);
+    }
+
+    _pointers.writer.complete = ((wp + amount) % _size) + 1;
+    _pointers.writer.partial  = 1;
+
+//    if (need_overwrite)
+//        fprintf(stdout, "%p> write end: w=%d/r=%d\n", this, _pointers.writer.complete, _pointers.reader.complete);
+
+    return true;
+}
+
+/* returns the number of itens that have been read */
+unsigned int Ringbuffer_traits::traits_consume(const char * buffer, char * value, unsigned int amount, bool atomic_mode)
+{
+    /* avoid using different values */
+    Buffer_table cache = _pointers;
+
+    const unsigned int available = used_blocks(cache);
+
+    if (atomic_mode && amount > available)
+        return false;
+
+    const unsigned int rd = _pointers.reader.complete;
+
+    unsigned int total = std::min(amount, available);
+
+    /* should we go around the buffer for reading? */
+    if ((rd + total) >= _size)
+    {
+        unsigned int rd1 = _size - rd;
+        unsigned int rd2 = total - rd1;
+
+//        fprintf(stderr, "%p> partial read: (%d/%d) %d/%d [%d/%d]\n", this, rd1, rd2, total, _size, reader, writer);
+
+        /* two partial consumes (one at the end, another at the beginning) */
+        memcpy((void *)  (value),      (const void *) &(buffer[rd]), _block * rd1);
+        memcpy((void *) &(value[rd1]), (const void *)  (buffer),     _block * rd2);
+    }
+    else
+    {
+//        fprintf(stderr, "%p> full read: %d/%d [%d/%d]\n", this, total, _size, reader, writer);
+
+        /* we are talking about buffers here, man! */
+        memcpy((void *) value, (const void *) &(buffer[rd]), _block * total);
+    }
+
+    do
+    {
+        /* jump the reader forward */
+        Buffer_pointer index((cache.reader.complete + total) % _size, 0);
+
+        if (update(cache.reader, index))
+            break;
+    }
+    while (true);
+
+//    fprintf(stderr, "%p> read end: %d [block=%d]\n", this, reader, _block);
+
+    return total;
+}
+
+/********** TWO-PHASE BUFFER FUNCTIONS ***********/
+
+/* returns the number of itens that have been read */
+unsigned int Ringbuffer_traits::traits_consume_begins(const char * buffer, char * value, unsigned int amount, bool atomic_mode)
+{
+    /* avoid using different values */
+    Buffer_table cache = _pointers;
+
+    const unsigned int available = used_blocks(cache);
+
+    if (amount > available)
+    {
+        if (atomic_mode)
+            return false;
+    }
+
+    const unsigned int rd = _pointers.reader.complete;
+
+    unsigned int total = std::min(amount, available);
+
+    /* should we go around the buffer for reading? */
+    if ((rd + total) >= _size)
+    {
+        unsigned int rd1 = _size - rd;
+        unsigned int rd2 = total - rd1;
+
+//        fprintf(stderr, "%p> partial read: (%d/%d) %d/%d [%d/%d]\n", this, rd1, rd2, total, _size, reader, writer);
+
+        /* two partial consumes (one at the end, another at the beginning) */
+        memcpy((void *)  (value),      (const void *) &(buffer[rd]), _block * rd1);
+        memcpy((void *) &(value[rd1]), (const void *)  (buffer),     _block * rd2);
+    }
+    else
+    {
+//        fprintf(stderr, "%p> full read: %d/%d [%d/%d]\n", this, total, _size, reader, writer);
+
+        /* we are talking about buffers here, man! */
+        memcpy((void *) value, (const void *) &(buffer[rd]), _block * total);
+    }
+
+    return total;
+}
+
+bool Ringbuffer_traits::traits_consume_commit(unsigned int amount)
+{
+    if (amount == 0)
+        return true;
+
+    /* avoid using different values */
+    Buffer_table cache = _pointers;
+
+    const unsigned int available = used_blocks(cache);
+
+    /* cannot commit more than available! */
+    if (amount > available)
+        return false;
+
+    unsigned int total = std::min(amount, available);
+
+    do
+    {
+        /* jump the reader forward */
+        Buffer_pointer index((cache.reader.complete + total) % _size, 0);
+
+        if (update(cache.reader, index))
+            break;
+    }
+    while (true);
+
+//    fprintf(stderr, "%p> read end: %d [block=%d]\n", this, reader, _block);
+
+    return true;
+}
+
+/********** PARTIAL BUFFER FUNCTIONS (bytes) ***********/
+
+/* writes everything or nothing */
+bool Ringbuffer_traits::traits_provide_partial(char * buffer, const char * value, unsigned int amount)
+{
+    /* avoid using different values */
+    Buffer_table cache = _pointers;
+
+    const unsigned int memsize = (_size * _block);
+
+    if (amount > (free_blocks(cache) * _block))
+        return false;
+
+    const unsigned int wr = ((cache.writer.complete - 1) * _block) + cache.writer.partial;
+    const unsigned int wp = wr - 1;
+
+    /* should we go around the buffer for writing? */
+    if ((wr + amount) > memsize)
+    {
+//        fprintf(stderr, "%p> first if matched\n", this);
+
+        unsigned int wr1 = memsize - wr + 1; /* writer is already 1 position after */
+        unsigned int wr2 = amount - wr1;
+
+//        fprintf(stderr, "%p> partial write: (%d/%d) %d/%d [%d/%d]\n", this, wr1, wr2, amount, _size, reader, writer);
+
+        /* two partial writes (one at the end, another at the beginning) */
+        memcpy((void *) &(buffer[wp]), (const void *)  (value),      wr1);
+        memcpy((void *)  (buffer),     (const void *) &(value[wr1]), wr2);
+    }
+    else
+    {
+//        fprintf(stderr, "%p> second if matched\n", this);
+
+//        fprintf(stderr, "%p> full write: a=%d/s=%d [r=%d/w=%d]\n", this, amount, _size, reader, writer);
+
+        /* we are talking about buffers here, man! */
+        memcpy((void *) &(buffer[wp]), (const void *) value, amount);
+    }
+
+    const unsigned int new_wp = (wp + amount) % memsize;
+
+    _pointers.writer.complete = (unsigned int)(floor((double)new_wp / (double)_block) + 1);
+    _pointers.writer.partial  = (new_wp % _block) + 1;
+
+//    if (need_overwrite)
+//        fprintf(stdout, "%p> write end: w=%d/r=%d\n", this, _pointers.writer.complete, _pointers.reader.complete);
+
+    return true;
+}
+
+/* returns the number of bytes that have been read */
+unsigned int Ringbuffer_traits::traits_consume_partial(const char * buffer, char * value, unsigned int amount)
+{
+    /* avoid using different values */
+    Buffer_table cache = _pointers;
+
+    const unsigned int available = used_blocks(cache) * _block;
+
+    const unsigned int rd = (_pointers.reader.complete * _block) + _pointers.reader.partial;
+
+    const unsigned int memsize = _size * _block;
+
+    unsigned int total = std::min(amount, available);
+
+    /* should we go around the buffer for reading? */
+    if ((rd + total) >= _size)
+    {
+        unsigned int rd1 = memsize - rd;
+        unsigned int rd2 = total - rd1;
+
+//        fprintf(stderr, "%p> partial read: (%d/%d) %d/%d [%d/%d]\n", this, rd1, rd2, total, _size, reader, writer);
+
+        /* two partial consumes (one at the end, another at the beginning) */
+        memcpy((void *)  (value),      (const void *) &(buffer[rd]), rd1);
+        memcpy((void *) &(value[rd1]), (const void *)  (buffer),     rd2);
+    }
+    else
+    {
+//        fprintf(stderr, "%p> full read: %d/%d [%d/%d]\n", this, total, _size, reader, writer);
+
+        /* we are talking about buffers here, man! */
+        memcpy((void *) value, (const void *) &(buffer[rd]), total);
+    }
+
+    do
+    {
+        const unsigned int new_rd = (((cache.reader.complete * _block) + cache.reader.partial) + total) % memsize;
+
+        /* jump the reader forward */
+        Buffer_pointer index((unsigned int)floor((double)new_rd / (double)_block), (unsigned short)(new_rd % _block));
+
+        if (update(cache.reader, index))
+            break;
+    }
+    while (true);
+
+//    fprintf(stderr, "%p> read end: %d [block=%d]\n", this, reader, _block);
+
+    return total;
+}
+
+/********** IO FUNCTIONS **********/
+
+/* returns the number of items written to from buffer to stream */
+unsigned int Ringbuffer_traits::traits_put(const char * buffer, std::ostream &fd, unsigned int amount)
+{
+    /* avoid using different values */
+    Buffer_table cache = _pointers;
+
+    const unsigned int available = used_blocks(cache);
+
+    if (amount > available)
+        return false;
+
+    const unsigned int wr = _pointers.writer.complete;
+    const unsigned int rd = _pointers.reader.complete;
+
+    unsigned int total = std::min(amount, available);
+
+    /* should we go around the buffer for reading? */
+    if ((rd + total) >= _size)
+    {
+        unsigned int rd1 = _size - rd;
+        unsigned int rd2 = total - rd1;
+
+//        fprintf(stderr, "%p> partial read: (%d/%d) %d/%d [%d/%d]\n", this, rd1, rd2, total, _size, reader, writer);
+
+        /* two partial consumes (one at the end, another at the beginning) */
+        fd.write((const char *) &(buffer[rd]), _block * rd1);
+        fd.write((const char *)  (buffer),     _block * rd2);
+    }
+    else
+    {
+//      fprintf(stderr, "%p> full read: %d/%d [%d/%d]\n", this, total, _size, reader, writer);
+        fd.write((const char *) &(buffer[rd]), _block * total);
+    }
+
+    do
+    {
+        /* jump the reader forward */
+        Buffer_pointer index((cache.reader.complete + total) % _size, 0);
+
+        if (update(cache.reader, index))
+            break;
+    }
+    while (true);
+
+//    fprintf(stderr, "%p> read end: %d [block=%d]\n", this, reader, _block);
+
+    return total;
+}
+
+/* returns number of items read from stream to buffer */
+unsigned int Ringbuffer_traits::traits_get(char * buffer, std::istream &fd, unsigned int amount)
+{
+    /* avoid using different values */
+    Buffer_table cache = _pointers;
+
+    if (amount > free_blocks(cache))
+        return false;
+
+    const unsigned int wr = cache.writer.complete;
+    const unsigned int wp = cache.writer.complete - 1;
+
+    unsigned int real_amount = 0;
+
+    /* should we go around the buffer for writing? */
+    if ((wr + amount) > _size)
+    {
+//        fprintf(stderr, "%p> first if matched\n", this);
+
+        unsigned int wr1 = _size - wr + 1; /* writer is already 1 position after */
+        unsigned int wr2 = amount - wr1;
+
+//        fprintf(stderr, "%p> partial write: (%d/%d) %d/%d [%d/%d]\n", this, wr1, wr2, amount, _size, reader, writer);
+
+        /* two partial writes (one at the end, another at the beginning) */
+        unsigned int char_amount = 0;
+
+        /* one partial write on the buffer (at the end) */
+        fd.read((char *) &(buffer[wp]), _block * wr1);
+        char_amount += fd.gcount();
+
+        if (fd.gcount() == (int)(_block * wr1))
+        {
+            /* another partial write on the buffer (at the beginning) */
+            fd.read((char *) (buffer), _block * wr2);
+            char_amount += fd.gcount();
+        }
+
+        real_amount = char_amount / _block;
+    }
+    else
+    {
+//        fprintf(stderr, "%p> second if matched\n", this);
+
+//        fprintf(stderr, "%p> full write: a=%d/s=%d [r=%d/w=%d]\n", this, amount, _size, reader, writer);
+
+        /* we are talking about buffers here, man! */
+        fd.read((char *) &(buffer[wp]), _block * amount);
+
+        real_amount = fd.gcount() / _block;
+    }
+
+    _pointers.writer.complete = ((wp + amount) % _size) + 1;
+    _pointers.writer.partial  = 1;
+
+//    fprintf(stdout, "%p> write end: %d\n", this, _pointers.writer.complete);
+
+    return real_amount;
+}
diff --git a/src/mod/endpoints/mod_khomp/commons/ringbuffer.hpp b/src/mod/endpoints/mod_khomp/commons/base/ringbuffer.hpp
similarity index 88%
rename from src/mod/endpoints/mod_khomp/commons/ringbuffer.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/ringbuffer.hpp
index 39f8ffe8fb..b9ecd7e6bd 100644
--- a/src/mod/endpoints/mod_khomp/commons/ringbuffer.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/ringbuffer.hpp
@@ -46,6 +46,12 @@
 
             Also, it works only for single-reader + single-writer, since it does not depends
             on external mutex functions.
+
+    NOTE: for single element provide/consume, this abstraction has standard C++ semantics.
+
+          for multiple and partial element provide/consume, memcpy is used - thus complex C++
+          objects which need correct copy constructor semantics should not copied this way.
+
  */
 
 #include <string.h>
@@ -61,7 +67,7 @@
 
 struct Buffer_pointer
 {
-    Buffer_pointer(unsigned int _complete = 0u, unsigned short _partial = 0u)
+    Buffer_pointer(unsigned int _complete, unsigned short _partial)
     : complete(_complete), partial(_partial)
     {};
 
@@ -134,6 +140,10 @@ __attribute__((packed));
 
 struct Ringbuffer_traits
 {
+    struct BufferFull  {};
+    struct BufferEmpty {};
+
+  protected:
     Ringbuffer_traits(unsigned int block, unsigned int size)
     : _block(block), _size(size)
     {};
@@ -155,6 +165,28 @@ struct Ringbuffer_traits
         return Atomic::doCAS(&(_pointers.reader), &cache, update);
     }
 
+    inline unsigned int free_blocks(const Buffer_table & cache) const
+    {
+        const unsigned int r = cache.reader.complete;
+        const unsigned int w = cache.writer.complete;
+
+        if (r >= w)
+            return (r - w);
+
+        return _size - (w - r);
+    }
+
+    inline unsigned int used_blocks(const Buffer_table & cache) const
+    {
+        const unsigned int r = cache.reader.complete;
+        const unsigned int w = cache.writer.complete;
+
+        if (r >= w)
+            return (_size - (r - w)) - 1;
+
+        return (w - r) - 1;
+    }
+
  protected:
     const unsigned int      _block;
     const unsigned int      _size;
@@ -163,11 +195,8 @@ struct Ringbuffer_traits
 };
 
 template <typename T>
-struct Ringbuffer: protected Ringbuffer_traits, public NonCopyable
+struct Ringbuffer: public Ringbuffer_traits, public NonCopyable
 {
-    struct BufferFull  {};
-    struct BufferEmpty {};
-
     Ringbuffer(unsigned int size)
     : Ringbuffer_traits(sizeof(T), size)
     {
@@ -189,15 +218,17 @@ struct Ringbuffer: protected Ringbuffer_traits, public NonCopyable
     }
 
     /***** GENERIC RANGE/INDEX CALCULATION FUNCTIONS *****/
-    bool may_write(Buffer_table & cache)
+
+  protected:
+    inline bool may_write(const Buffer_table & cache) const
     {
         const unsigned int r = cache.reader.complete;
         const unsigned int w = cache.writer.complete;
 
-        return (((r - w) != 1) && (!(r == 0 && w == _size)));
+        return (((r - w) != 0) && (!(r == 0 && w == _size)));
     }
 
-    bool may_read(Buffer_table & cache)
+    inline bool may_read(const Buffer_table & cache) const
     {
         if ((cache.writer.complete - cache.reader.complete) == 1)
             return false;
@@ -205,7 +236,7 @@ struct Ringbuffer: protected Ringbuffer_traits, public NonCopyable
         return true;
     }
 
-    unsigned int writer_next(Buffer_pointer & cache, Buffer_pointer & index)
+    inline unsigned int writer_next(const Buffer_pointer & cache, Buffer_pointer & index) const
     {
         unsigned int dest = cache.complete - 1,
                      temp = cache.complete + 1;
@@ -218,7 +249,7 @@ struct Ringbuffer: protected Ringbuffer_traits, public NonCopyable
         return dest;
     };
 
-    void reader_next(Buffer_pointer & cache, Buffer_pointer & index)
+    inline void reader_next(const Buffer_pointer & cache, Buffer_pointer & index) const
     {
         unsigned int temp = cache.complete + 1;
 
@@ -230,6 +261,7 @@ struct Ringbuffer: protected Ringbuffer_traits, public NonCopyable
 
     /***** BUFFER FUNCTIONS *****/
 
+  public:
     bool provide(const T & value)
     {
         Buffer_table   cache = _pointers;
@@ -280,9 +312,9 @@ struct Ringbuffer: protected Ringbuffer_traits, public NonCopyable
     }
 
     /* writes everything or nothing */
-    inline bool provide(const T * value, unsigned int amount, bool skip_overwrite = true)
+    inline bool provide(const T * value, unsigned int amount, bool do_not_overwrite = true)
     {
-        return traits_provide((char *)_buffer, (const char *) value, amount, skip_overwrite);
+        return traits_provide((char *)_buffer, (const char *) value, amount, do_not_overwrite);
     }
 
     /* returns the number of items that have been read (atomic_mode == true means 'all or nothing') */
@@ -337,7 +369,7 @@ struct Ringbuffer: protected Ringbuffer_traits, public NonCopyable
 //        fprintf(stderr, "%p> write: %d/%d [%d/%d]\n", this, _pointers.reader, _pointers.writer, _pointers.reader_partial, _pointers.writer_partial);
     }
 
-    T & consumer_start(void)
+    const T & consumer_start(void)
     {
         Buffer_table  cache = _pointers;
 
@@ -391,13 +423,13 @@ struct Ringbuffer: protected Ringbuffer_traits, public NonCopyable
     /* returns the number of items written to from buffer to stream */
     inline unsigned int put(std::ostream &fd, unsigned int amount)
     {
-        return traits_put((char *)_buffer, fd, amount);
+        return traits_put((const char *)_buffer, fd, amount);
     }
 
     /* returns number of items read from stream to buffer */
     inline unsigned int get(std::istream &fd, unsigned int amount)
     {
-        return traits_get((const char *)_buffer, fd, amount);
+        return traits_get((char *)_buffer, fd, amount);
     }
 
     void clear()
diff --git a/src/mod/endpoints/mod_khomp/commons/saved_condition.cpp b/src/mod/endpoints/mod_khomp/commons/base/saved_condition.cpp
similarity index 100%
rename from src/mod/endpoints/mod_khomp/commons/saved_condition.cpp
rename to src/mod/endpoints/mod_khomp/commons/base/saved_condition.cpp
diff --git a/src/mod/endpoints/mod_khomp/commons/saved_condition.hpp b/src/mod/endpoints/mod_khomp/commons/base/saved_condition.hpp
similarity index 100%
rename from src/mod/endpoints/mod_khomp/commons/saved_condition.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/saved_condition.hpp
diff --git a/src/mod/endpoints/mod_khomp/commons/scoped_lock.hpp b/src/mod/endpoints/mod_khomp/commons/base/scoped_lock.hpp
similarity index 100%
rename from src/mod/endpoints/mod_khomp/commons/scoped_lock.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/scoped_lock.hpp
diff --git a/src/mod/endpoints/mod_khomp/commons/simple_lock.hpp b/src/mod/endpoints/mod_khomp/commons/base/simple_lock.hpp
similarity index 96%
rename from src/mod/endpoints/mod_khomp/commons/simple_lock.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/simple_lock.hpp
index 4f6619f456..8f22fe6bdb 100644
--- a/src/mod/endpoints/mod_khomp/commons/simple_lock.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/simple_lock.hpp
@@ -55,7 +55,7 @@
  * implement the "unreference()" method for releasing resources.               */
 
 template < typename Implementor >
-struct SimpleLockCommon: NEW_REFCOUNTER( SimpleLockCommon < Implementor > )
+struct SimpleLockCommon: COUNTER_SUPER( SimpleLockCommon < Implementor > )
 {
     friend class ReferenceCounter < SimpleLockCommon < Implementor > >;
 
@@ -71,7 +71,7 @@ struct SimpleLockCommon: NEW_REFCOUNTER( SimpleLockCommon < Implementor > )
     {};
 
     SimpleLockCommon(const SimpleLockCommon & o)
-    : INC_REFCOUNTER(o, SimpleLockCommon)
+    : COUNTER_REFER(o, SimpleLockCommon)
     {};
 
     virtual ~SimpleLockCommon()
diff --git a/src/mod/endpoints/mod_khomp/commons/strings.cpp b/src/mod/endpoints/mod_khomp/commons/base/strings.cpp
similarity index 87%
rename from src/mod/endpoints/mod_khomp/commons/strings.cpp
rename to src/mod/endpoints/mod_khomp/commons/base/strings.cpp
index 5e1cbc7004..b7b84025a8 100644
--- a/src/mod/endpoints/mod_khomp/commons/strings.cpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/strings.cpp
@@ -141,6 +141,38 @@ unsigned int Strings::tokenize(const std::string & str, Strings::vector_type & t
     return (cur_token - 1);
 }
 
+long Strings::tolong(const std::string & str, int base)
+{
+    return tolong(str.c_str(), base);
+}
+
+unsigned long Strings::toulong(const std::string & str, int base)
+{
+    return toulong(str.c_str(), base);
+}
+
+unsigned long long Strings::toulonglong(const std::string & str, int base)
+{
+    return toulonglong(str.c_str(), base);
+}
+
+double Strings::todouble(const std::string & str)
+{
+    return todouble(str.c_str());
+}
+
+long Strings::tolong(const char * str, int base)
+{
+    char *str_end = 0;
+
+    unsigned long value = strtol(str, &str_end, base);
+
+    if (str_end && *str_end == 0)
+        return value;
+
+    throw invalid_value(str);
+}
+
 bool Strings::toboolean(std::string str)
 {
     std::string tmp(str);
@@ -153,11 +185,11 @@ bool Strings::toboolean(std::string str)
     throw invalid_value(str);
 }
 
-long Strings::tolong(std::string str, int base)
+unsigned long Strings::toulong(const char * str, int base)
 {
     char *str_end = 0;
 
-    unsigned long value = strtol(str.c_str(), &str_end, base);
+    unsigned long value = strtoul(str, &str_end, base);
 
     if (str_end && *str_end == 0)
         return value;
@@ -165,26 +197,14 @@ long Strings::tolong(std::string str, int base)
     throw invalid_value(str);
 }
 
-unsigned long Strings::toulong(std::string str, int base)
-{
-    char *str_end = 0;
-
-    unsigned long value = strtoul(str.c_str(), &str_end, base);
-
-    if (str_end && *str_end == 0)
-        return value;
-
-    throw invalid_value(str);
-}
-
-unsigned long long Strings::toulonglong(std::string str, int base)
+unsigned long long Strings::toulonglong(const char * str, int base)
 {
 #if defined(_WINDOWS) || defined(_Windows) || defined(_WIN32) || defined(WIN32)
     throw not_implemented();
 #else
     char *str_end = 0;
 
-    unsigned long long value = strtoull(str.c_str(), &str_end, base);
+    unsigned long long value = strtoull(str, &str_end, base);
 
     if (str_end && *str_end == 0)
         return value;
@@ -193,11 +213,11 @@ unsigned long long Strings::toulonglong(std::string str, int base)
 #endif
 }
 
-double Strings::todouble(std::string str)
+double Strings::todouble(const char * str)
 {
     char *str_end = 0;
 
-    double value = strtod(str.c_str(), &str_end);
+    double value = strtod(str, &str_end);
 
     if (str_end && *str_end == 0)
         return value;
diff --git a/src/mod/endpoints/mod_khomp/commons/strings.hpp b/src/mod/endpoints/mod_khomp/commons/base/strings.hpp
similarity index 81%
rename from src/mod/endpoints/mod_khomp/commons/strings.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/strings.hpp
index 056b9335c6..947da384d9 100644
--- a/src/mod/endpoints/mod_khomp/commons/strings.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/strings.hpp
@@ -68,6 +68,8 @@ struct Strings
 
         bool empty() { return _list.empty(); };
 
+        const list_type & list() { return _list; };
+
      protected:
         list_type   _list;
     };
@@ -75,8 +77,8 @@ struct Strings
  public:
     struct invalid_value
     {
-        invalid_value(const char  * value): _value(value) {};
-        invalid_value(std::string   value): _value(value) {};
+        invalid_value(const char        * value): _value(value) {};
+        invalid_value(const std::string & value): _value(value) {};
 
         std::string & value() { return _value; }
 
@@ -92,10 +94,15 @@ struct Strings
     static bool        toboolean(std::string);
     static std::string fromboolean(bool);
 
-    static long               tolong(std::string, int base = 10);
-    static unsigned long      toulong(std::string, int base = 10);
-    static unsigned long long toulonglong(std::string, int base = 10);
-    static double             todouble(std::string);
+    static long               tolong(const std::string &, int base = 10);
+    static unsigned long      toulong(const std::string &, int base = 10);
+    static unsigned long long toulonglong(const std::string &, int base = 10);
+    static double             todouble(const std::string &);
+
+    static long               tolong(const char *, int base = 10);
+    static unsigned long      toulong(const char *, int base = 10);
+    static unsigned long long toulonglong(const char *, int base = 10);
+    static double             todouble(const char *);
 
     static std::string lower(std::string);
     static std::string hexadecimal(std::string);
diff --git a/src/mod/endpoints/mod_khomp/commons/freeswitch/saved_condition.cpp b/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/saved_condition.cpp
similarity index 83%
rename from src/mod/endpoints/mod_khomp/commons/freeswitch/saved_condition.cpp
rename to src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/saved_condition.cpp
index 29169f3d54..d4d9861f5c 100644
--- a/src/mod/endpoints/mod_khomp/commons/freeswitch/saved_condition.cpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/saved_condition.cpp
@@ -1,7 +1,7 @@
-/*  
+/*
     KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.  
-  
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
   The contents of this file are subject to the Mozilla Public License Version 1.1
   (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.mozilla.org/MPL/
@@ -23,40 +23,40 @@
 
   The LGPL header follows below:
 
-    This library is free software; you can redistribute it and/or  
-    modify it under the terms of the GNU Lesser General Public  
-    License as published by the Free Software Foundation; either  
-    version 2.1 of the License, or (at your option) any later version.  
-  
-    This library is distributed in the hope that it will be useful,  
-    but WITHOUT ANY WARRANTY; without even the implied warranty of  
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
-    Lesser General Public License for more details.  
-  
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
     You should have received a copy of the GNU Lesser General Public License
     along with this library; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
-  
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include "saved_condition.hpp"
 
 bool SavedCondition::wait(unsigned int msec)
 {
-	bool ret = true;
+    bool ret = true;
 
     switch_mutex_lock(_mutex);
 
     if (!_signaled)
-	{
+    {
         /* msec * 1000 = The amount of time in microseconds to wait. */
-		if (switch_thread_cond_timedwait(_condition, _mutex, (switch_interval_time_t)msec * 1000) != 0)
-			ret = false;
-	}
-        
+        if (switch_thread_cond_timedwait(_condition, _mutex, (switch_interval_time_t)msec * 1000) != 0)
+            ret = false;
+    }
+
     _signaled = false;
 
-	switch_mutex_unlock(_mutex);
+    switch_mutex_unlock(_mutex);
 
-	return ret;
+    return ret;
 }
diff --git a/src/mod/endpoints/mod_khomp/commons/freeswitch/saved_condition.hpp b/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/saved_condition.hpp
similarity index 94%
rename from src/mod/endpoints/mod_khomp/commons/freeswitch/saved_condition.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/saved_condition.hpp
index 8acf0f3e0b..b34e40b0c0 100644
--- a/src/mod/endpoints/mod_khomp/commons/freeswitch/saved_condition.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/saved_condition.hpp
@@ -1,7 +1,7 @@
-/*  
+/*
     KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.  
-  
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
   The contents of this file are subject to the Mozilla Public License Version 1.1
   (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.mozilla.org/MPL/
@@ -23,20 +23,20 @@
 
   The LGPL header follows below:
 
-    This library is free software; you can redistribute it and/or  
-    modify it under the terms of the GNU Lesser General Public  
-    License as published by the Free Software Foundation; either  
-    version 2.1 of the License, or (at your option) any later version.  
-  
-    This library is distributed in the hope that it will be useful,  
-    but WITHOUT ANY WARRANTY; without even the implied warranty of  
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
-    Lesser General Public License for more details.  
-  
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
     You should have received a copy of the GNU Lesser General Public License
     along with this library; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
-  
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #ifndef _SAVED_CONDITION_
@@ -104,7 +104,7 @@ struct SavedCondition : public SavedConditionCommon// : public RefCounter < Save
 
         if (!_signaled)
             switch_thread_cond_wait(_condition, _mutex);
-        
+
         _signaled = false;
 
         switch_mutex_unlock(_mutex);
diff --git a/src/mod/endpoints/mod_khomp/commons/freeswitch/simple_lock.hpp b/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/simple_lock.hpp
similarity index 96%
rename from src/mod/endpoints/mod_khomp/commons/freeswitch/simple_lock.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/simple_lock.hpp
index 530d912ee1..acae57648d 100644
--- a/src/mod/endpoints/mod_khomp/commons/freeswitch/simple_lock.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/simple_lock.hpp
@@ -1,7 +1,7 @@
-/*  
+/*
     KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.  
-  
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
   The contents of this file are subject to the Mozilla Public License Version 1.1
   (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.mozilla.org/MPL/
@@ -23,20 +23,20 @@
 
   The LGPL header follows below:
 
-    This library is free software; you can redistribute it and/or  
-    modify it under the terms of the GNU Lesser General Public  
-    License as published by the Free Software Foundation; either  
-    version 2.1 of the License, or (at your option) any later version.  
-  
-    This library is distributed in the hope that it will be useful,  
-    but WITHOUT ANY WARRANTY; without even the implied warranty of  
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
-    Lesser General Public License for more details.  
-  
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
     You should have received a copy of the GNU Lesser General Public License
     along with this library; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
-  
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #ifndef _SIMPLE_LOCK_HPP_
@@ -72,7 +72,7 @@ struct SimpleLockBasic: public SimpleLockCommon < Implementor >
     {
         /* do nothing */
     };
-    
+
     void unreference()
     {
         switch_mutex_destroy(_mutex);
diff --git a/src/mod/endpoints/mod_khomp/commons/freeswitch/thread.hpp b/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/thread.hpp
similarity index 94%
rename from src/mod/endpoints/mod_khomp/commons/freeswitch/thread.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/thread.hpp
index af50240307..9e5abc4372 100644
--- a/src/mod/endpoints/mod_khomp/commons/freeswitch/thread.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/system/freeswitch/thread.hpp
@@ -1,7 +1,7 @@
-/*  
+/*
     KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.  
-  
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
   The contents of this file are subject to the Mozilla Public License Version 1.1
   (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.mozilla.org/MPL/
@@ -23,20 +23,20 @@
 
   The LGPL header follows below:
 
-    This library is free software; you can redistribute it and/or  
-    modify it under the terms of the GNU Lesser General Public  
-    License as published by the Free Software Foundation; either  
-    version 2.1 of the License, or (at your option) any later version.  
-  
-    This library is distributed in the hope that it will be useful,  
-    but WITHOUT ANY WARRANTY; without even the implied warranty of  
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
-    Lesser General Public License for more details.  
-  
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
     You should have received a copy of the GNU Lesser General Public License
     along with this library; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
-  
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #ifndef _THREAD_HPP_
@@ -66,7 +66,7 @@ struct Thread : ThreadCommon
         T _data;
         A _arg;
     };
-    
+
     template<typename T, typename R>
     struct ThreadData < T, R, void > : ThreadDataCommon
     {
@@ -79,7 +79,7 @@ struct Thread : ThreadCommon
 
         T _data;
     };
-    
+
     template<typename T, typename A>
     struct ThreadData < T, void, A > : ThreadDataCommon
     {
@@ -111,7 +111,7 @@ struct Thread : ThreadCommon
     };
 
     template<typename T>
-    Thread(T obj, switch_memory_pool_t *pool=NULL) : 
+    Thread(T obj, switch_memory_pool_t *pool=NULL) :
             _thread_info(new ThreadData<T, typename DecomposeFunction<T>::Return, void>(obj)),
             _pool(pool),
             _can_delete_pool(false)
@@ -134,7 +134,7 @@ struct Thread : ThreadCommon
         }
 
         switch_threadattr_stacksize_set(
-                (switch_threadattr_t *)_thread_info->_attribute, 
+                (switch_threadattr_t *)_thread_info->_attribute,
                 SWITCH_THREAD_STACKSIZE);
 
         if(!priority())
@@ -143,9 +143,9 @@ struct Thread : ThreadCommon
         }
 
     }
-    
+
     template<typename T, typename A>
-    Thread(T obj, A arg, switch_memory_pool_t *pool=NULL) : 
+    Thread(T obj, A arg, switch_memory_pool_t *pool=NULL) :
             _thread_info(new ThreadData<T, typename DecomposeFunction<T>::Return, A>(obj, arg)),
             _pool(pool),
             _can_delete_pool(false)
@@ -168,7 +168,7 @@ struct Thread : ThreadCommon
         }
 
         switch_threadattr_stacksize_set(
-                (switch_threadattr_t *)_thread_info->_attribute, 
+                (switch_threadattr_t *)_thread_info->_attribute,
                 SWITCH_THREAD_STACKSIZE);
 
         if(!priority())
@@ -178,11 +178,11 @@ struct Thread : ThreadCommon
 
     }
 
-    ~Thread() 
+    ~Thread()
     {
         if(_thread_info)
             delete _thread_info;
-        
+
         if (_can_delete_pool)
             switch_core_destroy_memory_pool(&_pool);
     }
@@ -202,10 +202,10 @@ struct Thread : ThreadCommon
         if(!_pool || !_thread_info->_attribute)
             return false;
 
-        switch_thread_create((switch_thread_t**)&_thread_info->_self, 
-                (switch_threadattr_t *)_thread_info->_attribute, 
-                run, 
-                _thread_info, 
+        switch_thread_create((switch_thread_t**)&_thread_info->_self,
+                (switch_threadattr_t *)_thread_info->_attribute,
+                run,
+                _thread_info,
                 _pool);
 
         if(!_thread_info->_self)
@@ -223,13 +223,13 @@ struct Thread : ThreadCommon
          *
          * SWITCH_DECLARE(switch_status_t) switch_thread_join(switch_status_t *retval, switch_thread_t *thd);
         */
-       
+
         if(!_thread_info->_self)
             return -2;
 
         int retval = 0;
 
-        if(switch_thread_join((switch_status_t*)&retval, 
+        if(switch_thread_join((switch_status_t*)&retval,
                 (switch_thread_t *)_thread_info->_self) != 0)
             return -1;
 
@@ -267,7 +267,7 @@ private:
     {
 #ifndef WIN32
         struct sched_param param;
-        
+
         struct apr_threadattr_t *myattr = (struct apr_threadattr_t *)_thread_info->_attribute;
 
         if (pthread_attr_setschedpolicy(
@@ -307,13 +307,13 @@ protected:
 
     static void *SWITCH_THREAD_FUNC run(BaseThreadType *thread, void * obj)
     {
-        //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 
+        //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
         //        "Starting new Thread\n");
 
         ThreadDataCommon * data = (ThreadDataCommon *)obj;
         int retval = data->run();
 
-        //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, 
+        //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
         //        "Stopping new Thread = %d\n", retval);
 
         ((Thread *)(data->_thread))->exit(retval);
diff --git a/src/mod/endpoints/mod_khomp/commons/tagged_union.hpp b/src/mod/endpoints/mod_khomp/commons/base/tagged_union.hpp
similarity index 84%
rename from src/mod/endpoints/mod_khomp/commons/tagged_union.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/tagged_union.hpp
index 1616268c5f..f46aab0b75 100644
--- a/src/mod/endpoints/mod_khomp/commons/tagged_union.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/tagged_union.hpp
@@ -42,11 +42,14 @@
 #ifndef _TAGGED_UNION_HPP_
 #define _TAGGED_UNION_HPP_
 
-#include <stdexcept>
-
-#include <iostream>
 #include <unistd.h>
 
+#include <typeinfo>
+#include <stdexcept>
+#include <iostream>
+
+#include <format.hpp>
+
 namespace Tagged
 {
     struct EmptyUnion
@@ -69,7 +72,7 @@ namespace Tagged
 
         ~EmptyUnion() { _adjusted = false; };
 
-        bool operator==(const EmptyUnion & o)
+        bool operator==(const EmptyUnion & o) const
         {
             return true;
         };
@@ -80,24 +83,24 @@ namespace Tagged
         void setup(void) { _adjusted = true;  };
 
       protected:
-        bool value_set(void)   { return false; };
-        bool value_get(void)   { return false; };
+        bool value_set(void) const   { return false; };
+        bool value_get(void) const   { return false; };
 
-        bool value_check(void) { return false; };
+        bool value_check(void) const { return false; };
 
         template < typename S >
-        bool value_visit(S & visitor, typename S::ReturnType & ret)
+        bool value_visit(S & visitor, typename S::ReturnType & ret) const
         {
             return false;
         };
 
         template < typename S >
-        bool value_visit_void(S & visitor)
+        bool value_visit_void(S & visitor) const
         {
             return false;
         };
 
-        bool adjusted()  { return _adjusted;  };
+        bool adjusted() const { return _adjusted;  };
 
       private:
         bool _adjusted;
@@ -114,7 +117,7 @@ namespace Tagged
 
         // constructor with initializer
         template < typename U >
-        Union( U value )
+        Union(U value)
         : _value(0)
         {
             set(value);
@@ -123,7 +126,7 @@ namespace Tagged
         // copy constructor
         Union(const Union & o)
         : E(static_cast<const E&>(o)),
-          _value( (o._value ? new const V(*(o._value)) : 0) )
+          _value( (o._value ? new V(*(o._value)) : 0) )
         {};
 
         // copy assignment operator
@@ -137,7 +140,7 @@ namespace Tagged
 
             if (o._value)
             {
-                _value = new const V(*(o._value));
+                _value = new V(*(o._value));
             }
 
             E::operator=(static_cast<const E&>(o));
@@ -163,18 +166,21 @@ namespace Tagged
         }
 
         template < typename U >
-        bool check(void)
+        bool check(void) const
         {
-            return value_check(static_cast<const U * const>(0));
+            return value_check(static_cast< const U * const>(0));
         };
 
         template < typename U >
-        const U & get(void)
+        U & get(void) const
         {
-            const U * res = 0;
+            U * res = 0;
+
+            if (!E::adjusted())
+                throw std::runtime_error("tagged union empty!");
 
             if (!value_get(&res) || !res)
-                throw std::runtime_error("type mismatch");
+                throw std::runtime_error(STG(FMT("type mismatch when asked for '%s'") % typeid(U).name()));
 
             return *res;
         };
@@ -190,7 +196,7 @@ namespace Tagged
         };
 
         template < typename S >
-        typename S::ReturnType visit(S visitor)
+        typename S::ReturnType visit(S visitor) const
         {
             typename S::ReturnType ret;
 
@@ -201,7 +207,7 @@ namespace Tagged
         };
 
         template < typename S >
-        void visit_void(S visitor)
+        void visit_void(S visitor) const
         {
             if (!value_visit_void(visitor))
                 throw std::runtime_error("unable to visit empty value");
@@ -219,7 +225,7 @@ namespace Tagged
         };
 
         // compare (equal) operator
-        bool operator==(const Union & o)
+        bool operator==(const Union & o) const
         {
             bool are_equal = false;
 
@@ -236,7 +242,7 @@ namespace Tagged
         };
 
         // compare types
-        bool sameType(const Union & o)
+        bool sameType(const Union & o) const
         {
             if ((!(_value) && !(o._value)) || (_value && o._value))
                 return E::operator==(static_cast<const E&>(o));
@@ -254,13 +260,13 @@ namespace Tagged
 
         bool value_set(V val)
         {
-            _value = new const V(val);
+            _value = new V(val);
             E::setup();
 
             return true;
         };
 
-        bool value_get(const V ** val)
+        bool value_get(V ** val) const
         {
             if (!_value)
                 return false;
@@ -269,14 +275,14 @@ namespace Tagged
             return true;
         }
 
-        bool value_check(const V * const junk)
+        bool value_check(const V * const junk) const
         {
             (void)junk;
             return (_value != 0);
         };
 
         template < typename S >
-        bool value_visit(S & visitor, typename S::ReturnType & ret)
+        bool value_visit(S & visitor, typename S::ReturnType & ret) const
         {
             if (_value)
             {
@@ -288,7 +294,7 @@ namespace Tagged
         };
 
         template < typename S >
-        bool value_visit_void(S & visitor)
+        bool value_visit_void(S & visitor) const
         {
             if (_value)
             {
@@ -300,7 +306,7 @@ namespace Tagged
         };
 
       private:
-        const V * _value;
+        V * _value;
     };
 };
 
diff --git a/src/mod/endpoints/mod_khomp/commons/thread.hpp b/src/mod/endpoints/mod_khomp/commons/base/thread.hpp
similarity index 100%
rename from src/mod/endpoints/mod_khomp/commons/thread.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/thread.hpp
diff --git a/src/mod/endpoints/mod_khomp/commons/timer.cpp b/src/mod/endpoints/mod_khomp/commons/base/timer.cpp
similarity index 96%
rename from src/mod/endpoints/mod_khomp/commons/timer.cpp
rename to src/mod/endpoints/mod_khomp/commons/base/timer.cpp
index 36e32f521a..0cb0ac4340 100644
--- a/src/mod/endpoints/mod_khomp/commons/timer.cpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/timer.cpp
@@ -276,6 +276,20 @@ bool TimerTraits::traits_restart (TimerTraits::Index & idx, bool force)
     return ret;
 }
 
+void TimerTraits::traits_setup(TimerTraits::Index * idx, unsigned int msecs, const void * func, void * data, unsigned int value)
+{
+    _mutex.lock();
+
+    if (idx->valid)
+    {
+        (void)traits_del_unlocked(*idx);
+    }
+
+    *idx = traits_add_unlocked(msecs, func, data, value);
+
+    _mutex.unlock();
+}
+
 bool TimerTraits::traits_del_unlocked (TimerTraits::Index & idx)
 {
     bool ret = false;
diff --git a/src/mod/endpoints/mod_khomp/commons/timer.hpp b/src/mod/endpoints/mod_khomp/commons/base/timer.hpp
similarity index 93%
rename from src/mod/endpoints/mod_khomp/commons/timer.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/timer.hpp
index 382efa1645..24d115d991 100644
--- a/src/mod/endpoints/mod_khomp/commons/timer.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/timer.hpp
@@ -125,6 +125,8 @@ struct TimerTraits
     bool traits_del (Index & idx);
     bool traits_del (const void * func, const void * data = 0, unsigned int value = 0);
 
+    void traits_setup(Index * idx, unsigned int msecs, const void * func, void * data = 0, unsigned int value = 0);
+
     /* timer start/stop functions */
     bool start(void);
     bool stop(void);
@@ -169,7 +171,7 @@ struct TimerTraits
 };
 
 template < typename F, typename D >
-struct TimerTemplate: NEW_REFCOUNTER(TimerTemplate< F, D >)
+struct TimerTemplate: COUNTER_SUPER(TimerTemplate< F, D >)
 {
     typedef TimerTraits::Index   Index;
     typedef TimerTraits::Control Control;
@@ -179,7 +181,7 @@ struct TimerTemplate: NEW_REFCOUNTER(TimerTemplate< F, D >)
     {};
 
     TimerTemplate(const TimerTemplate< F, D > & o)
-    : INC_REFCOUNTER(o, TimerTemplate< F, D >),
+    : COUNTER_REFER(o, TimerTemplate< F, D >),
       _timer(o._timer)
     {};
 
@@ -192,6 +194,11 @@ struct TimerTemplate: NEW_REFCOUNTER(TimerTemplate< F, D >)
     bool start() { return _timer->start(); }
     bool stop()  { return _timer->stop();  }
 
+    inline void setup(Index * idx, unsigned int msecs, F * func, D data = 0, unsigned int value = 0)
+    {
+        _timer->traits_setup(idx, msecs, (const void *)func, (void *)(data), value);
+    }
+
     inline Index add(unsigned int msecs, F * func, D data = 0, unsigned int value = 0)
     {
         return _timer->traits_add(msecs, (const void *)func, (void *)(data), value);
diff --git a/src/mod/endpoints/mod_khomp/commons/types.hpp b/src/mod/endpoints/mod_khomp/commons/base/types.hpp
similarity index 88%
rename from src/mod/endpoints/mod_khomp/commons/types.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/types.hpp
index adbd8abe36..5ab6d292c6 100644
--- a/src/mod/endpoints/mod_khomp/commons/types.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/types.hpp
@@ -55,15 +55,33 @@
 /*** Used for checking information on classes and stuff.. ***/
 
 template< typename T >
-class IsClass
+struct IsClass
 {
   protected:
-    template< typename X > static char ( &A( void(X::*)() ) )[1];
-    template< typename X > static char ( &A( X ) )[2];
+    template < typename X > static char ( &A( void(X::*)() ) )[1];
+    template < typename X > static char ( &A( X ) )[2];
   public:
     static bool const Result = sizeof( A< T >(0) ) == 1;
 };
 
+template < typename T >
+struct IsConst
+{
+    static bool const Result = false;
+};
+
+template < typename T >
+struct IsConst< const T >
+{
+    static bool const Result = true;
+};
+
+template < typename T >
+struct IsConst< T const * >
+{
+    static bool const Result = true;
+};
+
 /*** Used for template metaprogramming ***/
 
 template < bool Value, typename Then, typename Else >
diff --git a/src/mod/endpoints/mod_khomp/commons/variant.hpp b/src/mod/endpoints/mod_khomp/commons/base/variable.hpp
similarity index 53%
rename from src/mod/endpoints/mod_khomp/commons/variant.hpp
rename to src/mod/endpoints/mod_khomp/commons/base/variable.hpp
index 410a770a6e..efeb0f53b7 100644
--- a/src/mod/endpoints/mod_khomp/commons/variant.hpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/variable.hpp
@@ -11,7 +11,7 @@
   the specific language governing rights and limitations under the License.
 
   Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  "GNU Lesser General Public License 2.1" license (the "LGPL" License), in which
   case the provisions of "LGPL License" are applicable instead of those above.
 
   If you wish to allow use of your version of this file only under the terms of
@@ -41,87 +41,84 @@
 
 #include <refcounter.hpp>
 
-#include <typeinfo>
+#ifndef _VARIABLE_HPP_
+#define _VARIABLE_HPP_
 
-#ifndef _VARIANT_H_
-#define _VARIANT_H_
-
-/* this is internal, should not be used by the user */
-struct NoArgumentDefined {};
-
-template < typename UserReturnType, typename UserArgumentType = NoArgumentDefined >
-struct VariantBaseType
+template < typename R >
+struct VariableBaseTable
 {
-    typedef UserReturnType       ReturnType;
-    typedef UserArgumentType   ArgumentType;
-
-    virtual ~VariantBaseType() {};
-
-    virtual int which() = 0;
-
-    virtual ReturnType visit(void)           { return ReturnType(); };
-    virtual ReturnType visit(ArgumentType)   { return ReturnType(); };
+    R value;
 };
 
-template < typename BaseType = VariantBaseType < void > >
-struct Variant: NEW_REFCOUNTER(Variant < BaseType >)
+struct EmptyVariable {};
+
+template < typename R >
+struct Variable
 {
-    typedef typename BaseType::ReturnType        ReturnType;
-    typedef typename BaseType::ArgumentType    ArgumentType;
+  protected:
+    typedef VariableBaseTable< R >  BaseType;
 
-    struct InvalidType {};
+    typedef const BaseType *    ConstObjType;
+    typedef BaseType *               ObjType;
+    typedef R BaseType::*            VarType;
 
-    Variant(BaseType * value, bool is_owner = false)
-    : _value(value), _is_owner(is_owner) {};
+  public:
+    template < typename ConstructorObjType >
+    Variable(R ConstructorObjType::* v)
+    : _adjusted(true),
+      _variable(reinterpret_cast<const VarType>(v))
+    {};
 
-    Variant(const Variant & v)
-    : INC_REFCOUNTER(v, Variant < BaseType >),
-      _value(v._value), _is_owner(v._is_owner) {};
+    Variable()
+    : _adjusted(false)
+    {};
 
-    virtual ~Variant() {};
-
-    void unreference()
+    template < typename MemberType >
+    void operator=(const MemberType v)
     {
-        if (_is_owner && _value)
-        {
-            delete _value;
-            _value = 0;
-        }
-    };
-
-    template < typename ValueType >
-    ValueType & get(void)
-    {
-        try
-        {
-            ValueType & ret = dynamic_cast < ValueType & > (*_value);
-            return ret;
-        }
-        catch (std::bad_cast & e)
-        {
-            throw InvalidType();
-        }
-    };
-
-    int which()
-    {
-        return _value->which();
+        _adjusted = true;
+        _variable = reinterpret_cast<const VarType>(v);
     }
 
-    ReturnType visit(void)
+    template < typename Type >
+    R & operator()(Type * obj) const
     {
-        return _value->visit();
+        if (!_adjusted)
+            throw EmptyVariable();
+
+        return (reinterpret_cast< ObjType >(obj))->*(_variable);
     }
 
-    ReturnType visit(ArgumentType arg)
+    template < typename Type >
+    R & operator()(Type & obj) const
     {
-        return _value->visit(arg);
+        if (!_adjusted)
+            throw EmptyVariable();
+
+        return (reinterpret_cast< ObjType >(&obj))->*(_variable);
     }
 
- protected:
-    BaseType * _value;
-    bool       _is_owner;
+    template < typename Type >
+    const R & operator()(const Type * obj) const
+    {
+        if (!_adjusted)
+            throw EmptyVariable();
+
+        return (reinterpret_cast< ConstObjType >(obj))->*(_variable);
+    }
+
+    template < typename Type >
+    const R & operator()(const Type & obj) const
+    {
+        if (!_adjusted)
+            throw EmptyVariable();
+
+        return (reinterpret_cast< ConstObjType >(&obj))->*(_variable);
+    }
+
+  protected:
+    bool    _adjusted;
+    VarType _variable;
 };
 
-#endif /* _VARIANT_H_ */
-
+#endif /* _VARIABLE_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/verbose.cpp b/src/mod/endpoints/mod_khomp/commons/base/verbose.cpp
similarity index 82%
rename from src/mod/endpoints/mod_khomp/commons/verbose.cpp
rename to src/mod/endpoints/mod_khomp/commons/base/verbose.cpp
index 182d159ca1..bdc412e231 100644
--- a/src/mod/endpoints/mod_khomp/commons/verbose.cpp
+++ b/src/mod/endpoints/mod_khomp/commons/base/verbose.cpp
@@ -54,11 +54,11 @@
 
 /********************************************/
 
-std::string Verbose::channelStatus(int32 dev, int32 obj, int32 cs, Verbose::Presentation fmt)
+std::string Verbose::channelStatus(const int32 dev, const int32 obj, const int32 cs, const Verbose::Presentation fmt) const
 {
     try
     {
-        K3L_CHANNEL_CONFIG & config = _api.channel_config(dev, obj);
+        const K3L_CHANNEL_CONFIG & config = _api.channel_config(dev, obj);
         return Verbose::channelStatus(config.Signaling, cs, fmt);
     }
     catch (...)
@@ -68,14 +68,14 @@ std::string Verbose::channelStatus(int32 dev, int32 obj, int32 cs, Verbose::Pres
 }
 
 #if K3L_AT_LEAST(2,0,0)
-std::string Verbose::event(int32 obj, K3L_EVENT *ev, R2CountryType r2_country, Verbose::Presentation fmt)
+std::string Verbose::event(const int32 obj, const K3L_EVENT * const ev, const R2CountryType r2_country, const Verbose::Presentation fmt) const
 #else
-std::string Verbose::event(int32 obj, K3L_EVENT *ev, Verbose::Presentation fmt)
+std::string Verbose::event(const int32 obj, const K3L_EVENT * const ev, const Verbose::Presentation fmt) const
 #endif
 {
     try
     {
-        K3L_CHANNEL_CONFIG & config = _api.channel_config(ev->DeviceId, obj);
+        const K3L_CHANNEL_CONFIG & config = _api.channel_config(ev->DeviceId, obj);
 #if K3L_AT_LEAST(2,0,0)
         return Verbose::event(config.Signaling, obj, ev, r2_country, fmt);
 #else
@@ -94,7 +94,7 @@ std::string Verbose::event(int32 obj, K3L_EVENT *ev, Verbose::Presentation fmt)
 
 /********************************************/
 
-std::string Verbose::echoLocation(KEchoLocation ec, Verbose::Presentation fmt)
+std::string Verbose::echoLocation(const KEchoLocation ec, const Verbose::Presentation fmt)
 {
     switch (ec)
     {
@@ -109,7 +109,7 @@ std::string Verbose::echoLocation(KEchoLocation ec, Verbose::Presentation fmt)
     return presentation(fmt, "<unknown>", "Unknown");
 };
 
-std::string Verbose::echoCancellerConfig(KEchoCancellerConfig ec, Verbose::Presentation fmt)
+std::string Verbose::echoCancellerConfig(KEchoCancellerConfig ec, const Verbose::Presentation fmt)
 {
     switch (ec)
     {
@@ -124,21 +124,24 @@ std::string Verbose::echoCancellerConfig(KEchoCancellerConfig ec, Verbose::Prese
     return presentation(fmt, "<unknown>", "Unknown");
 };
 
-// TODO: internal_deviceType / internal_deviceModel
+std::string Verbose::deviceName(const KDeviceType dt, const int32 model, const Verbose::Presentation fmt)
+{
+    return deviceName(dt, model, 0, fmt);
+}
 
-std::string Verbose::deviceName(KDeviceType dt, int32 model, Verbose::Presentation fmt)
+std::string Verbose::deviceName(const KDeviceType dt, const int32 model, const int32 count, const Verbose::Presentation fmt)
 {
     try
     {
         std::string value;
 
-        value += internal_deviceType(dt);
+        value += internal_deviceType(dt, count);
         value += "-";
-        value += internal_deviceModel(dt, model);
+        value += internal_deviceModel(dt, model, count);
 
         return value;
     }
-    catch (internal_not_found & e)
+    catch (internal_not_found e)
     {
         PRESENTATION_CHECK_RETURN(fmt,
             STG(FMT("[type/model='%d/%d']") % (int)dt % (int)model),
@@ -146,13 +149,18 @@ std::string Verbose::deviceName(KDeviceType dt, int32 model, Verbose::Presentati
     }
 }
 
-std::string Verbose::deviceType(KDeviceType dt, Verbose::Presentation fmt)
+std::string Verbose::deviceType(const KDeviceType dt, const Verbose::Presentation fmt)
+{
+    return deviceType(dt, 0, fmt);
+}
+
+std::string Verbose::deviceType(const KDeviceType dt, const int32 count, const Verbose::Presentation fmt)
 {
     try
     {
-        return internal_deviceType(dt);
+        return internal_deviceType(dt, count);
     }
-    catch (internal_not_found & e)
+    catch (internal_not_found e)
     {
         PRESENTATION_CHECK_RETURN(fmt,
             STG(FMT("[type='%d']") % (int)dt),
@@ -160,11 +168,11 @@ std::string Verbose::deviceType(KDeviceType dt, Verbose::Presentation fmt)
     }
 }
 
-std::string Verbose::internal_deviceType(KDeviceType dt)
+std::string Verbose::internal_deviceType(const KDeviceType dt, const int32 count)
 {
     switch (dt)
     {
-        case kdtE1:            return "K2E1";
+        case kdtE1:            return (count > 34 || count == 0 ? "K2E1" : "K1E1");
 
 #if K3L_AT_LEAST(1,6,0)
         case kdtFXO:           return "KFXO";
@@ -183,10 +191,10 @@ std::string Verbose::internal_deviceType(KDeviceType dt)
 #endif
 
 #if K3L_AT_LEAST(1,5,0)
-        case kdtE1IP:          return "K2E1";
+        case kdtE1IP:          return (count > 90 || count == 0 ? "K2E1" : "K1E1");
 #endif
 #if K3L_AT_LEAST(1,5,1)
-        case kdtE1Spx:         return "K2E1";
+        case kdtE1Spx:         return (count > 30 || count == 0 ? "K2E1" : "K1E1");
         case kdtGWIP:          return "KGWIP";
 #endif
 
@@ -202,7 +210,6 @@ std::string Verbose::internal_deviceType(KDeviceType dt)
         case kdtGSMUSBSpx:     return "KGSMUSB";
 
         case kdtE1FXSSpx:      return "KE1FXS";
-        case kdtDevTypeCount:  return "DevTypeCount";
 #endif
 
 #if K3L_EXACT(2,1,0)
@@ -212,18 +219,24 @@ std::string Verbose::internal_deviceType(KDeviceType dt)
 #if K3L_AT_LEAST(2,2,0)
         case kdtE1AdHoc:       return "KE1AdHoc";
 #endif
+        case kdtDevTypeCount:  break;
     }
 
     throw internal_not_found();
 }
 
-std::string Verbose::deviceModel(KDeviceType dt, int32 model, Verbose::Presentation fmt)
+std::string Verbose::deviceModel(const KDeviceType dt, const int32 model, const Verbose::Presentation fmt)
+{
+    return deviceModel(dt, model, 0, fmt);
+};
+
+std::string Verbose::deviceModel(const KDeviceType dt, const int32 model, const int32 count, const Verbose::Presentation fmt)
 {
     try
     {
-        return internal_deviceModel(dt, model);
+        return internal_deviceModel(dt, model, count);
     }
-    catch (internal_not_found & e)
+    catch (internal_not_found e)
     {
         PRESENTATION_CHECK_RETURN(fmt,
             STG(FMT("[model='%d']") % (int)model),
@@ -231,17 +244,17 @@ std::string Verbose::deviceModel(KDeviceType dt, int32 model, Verbose::Presentat
     }
 }
 
-std::string Verbose::internal_deviceModel(KDeviceType dt, int32 model)
+std::string Verbose::internal_deviceModel(const KDeviceType dt, const int32 model, const int32 count)
 {
     switch (dt)
     {
         case kdtE1:
             switch ((KE1DeviceModel)model)
             {
-                case kdmE1600:   return "600";
-                case kdmE1600E:  return "600E";
+                case kdmE1600:   return (count > 34 || count == 0 ? "600" : "300");
+                case kdmE1600E:  return (count > 34 || count == 0 ? "600" : "300");
 #if K3L_AT_LEAST(2,0,0)
-                case kdmE1600EX: return "600EX";
+                case kdmE1600EX: return (count > 34 || count == 0 ? "600" : "300");
 #endif
             }
             throw internal_not_found();
@@ -255,14 +268,38 @@ std::string Verbose::internal_deviceModel(KDeviceType dt, int32 model)
 #endif
             {
 #if K3L_AT_LEAST(1,6,0)
-                case kdmFXO80:    return "80";
-                case kdmFXOHI:    return "HI";
+                case kdmFXO80:
+                    switch (count)
+                    {
+                        case 0: /* default */
+                        case 8: return "80";
+                        case 4: return "40";
+                    }
+                    break;
+
+                case kdmFXOHI:
+                    switch (count)
+                    {
+                        case 0: /* default */
+                        case 8: return "80-HI";
+                        case 4: return "40-HI";
+                    }
+                    break;
+
                 case kdmFXO160HI: return "160HI";
 #if K3L_AT_LEAST(2,1,0)
-        case kdmFXO240HI: return "240HI";
+                case kdmFXO240HI: return "240HI";
 #endif
 #else
-                case kdmFXO80:    return "80";
+                case kdmFXO80:
+                    switch (count)
+                    {
+                        case 0: /* default */
+                        case 8: return "80";
+                        case 4: return "40";
+                    }
+                    break;
+
 #endif
             }
 
@@ -300,13 +337,13 @@ std::string Verbose::internal_deviceModel(KDeviceType dt, int32 model)
             switch ((KE1GWDeviceModel)model)
             {
 #if K3L_AT_LEAST(1,6,0)
-                case kdmE1GW640:  return "640";
+                case kdmE1GW640:    return "640";
 #if K3L_AT_LEAST(2,0,0)
                 case kdmE1GW640EX:  return "640EX";
 #endif
 #else
-                case kdmE1600V:  return "600V";
-                case kdmE1600EV: return "600EV";
+                case kdmE1600V:  return (count > 34 || count == 0 ? "600V"  : "300V" );
+                case kdmE1600EV: return (count > 34 || count == 0 ? "600EV" : "600EV");
 #endif
             }
 
@@ -337,12 +374,12 @@ std::string Verbose::internal_deviceModel(KDeviceType dt, int32 model)
             switch ((KE1IPDeviceModel)model)
             {
 #if K3L_AT_LEAST(1,6,0)
-                case kdmE1IP:  return "E1IP";
+                case kdmE1IP:    return "E1IP";
 #if K3L_AT_LEAST(2,0,0)
                 case kdmE1IPEX:  return "E1IPEX";
 #endif
 #else
-                case kdmE1600EG: return "600EG";
+                case kdmE1600EG: return (count > 90 || count == 0 ? "600EG" : "300EG");
 #endif
             }
 
@@ -353,8 +390,8 @@ std::string Verbose::internal_deviceModel(KDeviceType dt, int32 model)
         case kdtE1Spx:
             switch ((KE1SpxDeviceModel)model)
             {
-                case kdmE1Spx:    return "SPX";
-                case kdm2E1Based: return "SPX-2E1";
+                case kdmE1Spx:      return "SPX";
+                case kdm2E1Based:   return "SPX-2E1";
 #if K3L_AT_LEAST(2,0,0)
                 case kdmE1SpxEX:    return "SPXEX";
 #endif
@@ -367,7 +404,7 @@ std::string Verbose::internal_deviceModel(KDeviceType dt, int32 model)
 #if K3L_AT_LEAST(1,6,0)
                 case kdmGWIP:     return "GWIP";
 #if K3L_AT_LEAST(2,0,0)
-                case kdmGWIPEX:     return "GWIPEX";
+                case kdmGWIPEX:   return "GWIPEX";
 #endif
 #else
                 case kdmGW600G:   return "600G";
@@ -382,9 +419,9 @@ std::string Verbose::internal_deviceModel(KDeviceType dt, int32 model)
         case kdtFXS:
             switch ((KFXSDeviceModel)model)
             {
-                case kdmFXS300:   return "300";
+                case kdmFXS300:   return (count > 30 || count == 0 ? "300"   : "150");
 #if K3L_AT_LEAST(2,0,0)
-                case kdmFXS300EX:   return "300EX";
+                case kdmFXS300EX: return (count > 30 || count == 0 ? "300EX" : "150EX");
 #endif
             }
 
@@ -393,10 +430,10 @@ std::string Verbose::internal_deviceModel(KDeviceType dt, int32 model)
         case kdtFXSSpx:
             switch ((KFXSSpxDeviceModel)model)
             {
-                case kdmFXSSpx300:       return "SPX";
-                case kdmFXSSpx2E1Based:  return "SPX-2E1";
+                case kdmFXSSpx300:      return (count > 30 || count == 0 ? "300-SPX"     : "150-SPX");
+                case kdmFXSSpx2E1Based: return "SPX-2E1";
 #if K3L_AT_LEAST(2,0,0)
-                case kdmFXSSpx300EX:       return "SPXEX";
+                case kdmFXSSpx300EX:    return (count > 30 || count == 0 ? "300-SPXEX"   : "150-SPXEX");
 #endif
             }
 
@@ -405,9 +442,27 @@ std::string Verbose::internal_deviceModel(KDeviceType dt, int32 model)
         case kdtGSM:
             switch ((KGSMDeviceModel)model)
             {
-                case kdmGSM:       return "40";
+                case kdmGSM:
+                    switch (count)
+                    {
+                        case 0: /* default */
+                        case 4: return "40";
+                        case 3: return "30";
+                        case 2: return "20";
+                        case 1: return "10";
+                    }
+                    break;
 #if K3L_AT_LEAST(2,0,0)
-                case kdmGSMEX:     return "40EX";
+                case kdmGSMEX:
+                    switch (count)
+                    {
+                        case 0: /* default */
+                        case 4: return "40EX";
+                        case 3: return "80EX";
+                        case 2: return "20EX";
+                        case 1: return "10EX";
+                    }
+                    break;
 #endif
             }
 
@@ -416,9 +471,27 @@ std::string Verbose::internal_deviceModel(KDeviceType dt, int32 model)
         case kdtGSMSpx:
             switch ((KGSMSpxDeviceModel)model)
             {
-                case kdmGSMSpx:    return "SPX";
+                case kdmGSMSpx:
+                    switch (count)
+                    {
+                        case 0: /* default */
+                        case 4: return "40";
+                        case 3: return "30";
+                        case 2: return "20";
+                        case 1: return "10";
+                    }
+                    break;
 #if K3L_AT_LEAST(2,0,0)
-                case kdmGSMSpxEX:  return "SPXEX";
+                case kdmGSMSpxEX:
+                    switch (count)
+                    {
+                        case 0: /* default */
+                        case 4: return "40-SPXEX";
+                        case 3: return "80-SPXEX";
+                        case 2: return "20-SPXEX";
+                        case 1: return "10-SPXEX";
+                    }
+                    break;
 #endif
             }
 
@@ -444,8 +517,8 @@ std::string Verbose::internal_deviceModel(KDeviceType dt, int32 model)
         case kdtE1FXSSpx:
             switch ((KGSMSpxDeviceModel)model)
             {
-                case kdmE1FXSSpx:   return "SPX";
-                case kdmE1FXSSpxEX: return "SPXEX";
+                case kdmE1FXSSpx:   return "450-SPX";
+                case kdmE1FXSSpxEX: return "450-SPXEX";
             }
 
             throw internal_not_found();
@@ -476,7 +549,7 @@ std::string Verbose::internal_deviceModel(KDeviceType dt, int32 model)
     throw internal_not_found();
 }
 
-std::string Verbose::signaling(KSignaling sig, Verbose::Presentation fmt)
+std::string Verbose::signaling(const KSignaling sig, const Verbose::Presentation fmt)
 {
     switch (sig)
     {
@@ -523,7 +596,7 @@ std::string Verbose::signaling(KSignaling sig, Verbose::Presentation fmt)
         STG(FMT("Unknown signaling (%d)") % (int)sig));
 }
 
-std::string Verbose::systemObject(KSystemObject so, Verbose::Presentation fmt)
+std::string Verbose::systemObject(const KSystemObject so, const Verbose::Presentation fmt)
 {
     switch (so)
     {
@@ -544,7 +617,7 @@ std::string Verbose::systemObject(KSystemObject so, Verbose::Presentation fmt)
         STG(FMT("Unknown object (%d)") % (int)so));
 }
 
-std::string Verbose::mixerTone(KMixerTone mt, Verbose::Presentation fmt)
+std::string Verbose::mixerTone(const KMixerTone mt, const Verbose::Presentation fmt)
 {
     switch (mt)
     {
@@ -567,7 +640,7 @@ std::string Verbose::mixerTone(KMixerTone mt, Verbose::Presentation fmt)
         STG(FMT("Unknonwn tone (%d)") % (int)mt));
 }
 
-std::string Verbose::mixerSource(KMixerSource ms, Verbose::Presentation fmt)
+std::string Verbose::mixerSource(const KMixerSource ms, const Verbose::Presentation fmt)
 {
     switch (ms)
     {
@@ -588,7 +661,7 @@ std::string Verbose::mixerSource(KMixerSource ms, Verbose::Presentation fmt)
         STG(FMT("Unknonwn source (%d)") % (int)ms));
 }
 
-std::string Verbose::channelFeatures(int32 flags, Verbose::Presentation fmt)
+std::string Verbose::channelFeatures(const int32 flags, const Verbose::Presentation fmt)
 {
     if (0x00 != flags)
     {
@@ -603,9 +676,7 @@ std::string Verbose::channelFeatures(int32 flags, Verbose::Presentation fmt)
         if (kcfHighImpEvents & flags)     strs.add(presentation(fmt, "HighImpEvents",     "High Impedance Events"));
 #if K3L_AT_LEAST(1,6,0)
         if (kcfCallAnswerInfo & flags)    strs.add(presentation(fmt, "CallAnswerInfo",    "Call Answer Info"));
-#if !K3L_AT_LEAST(2,2,0)
         if (kcfOutputVolume & flags)      strs.add(presentation(fmt, "OutputVolume",      "Output Volume"));
-#endif
         if (kcfPlayerAGC & flags)         strs.add(presentation(fmt, "PlayerAGC",         "Player AGC"));
 #endif
 
@@ -617,7 +688,7 @@ std::string Verbose::channelFeatures(int32 flags, Verbose::Presentation fmt)
     PRESENTATION_CHECK_RETURN(fmt, "", "No features");
 }
 
-std::string Verbose::seizeFail(KSeizeFail sf, Verbose::Presentation fmt)
+std::string Verbose::seizeFail(const KSeizeFail sf, const Verbose::Presentation fmt)
 {
     switch (sf)
     {
@@ -635,7 +706,7 @@ std::string Verbose::seizeFail(KSeizeFail sf, Verbose::Presentation fmt)
 }
 
 #if K3L_AT_LEAST(1,5,0)
-std::string Verbose::internal_sipFailures(KSIP_Failures code, Verbose::Presentation fmt)
+std::string Verbose::internal_sipFailures(const KSIP_Failures code, const Verbose::Presentation fmt)
 {
     switch (code)
     {
@@ -691,13 +762,13 @@ std::string Verbose::internal_sipFailures(KSIP_Failures code, Verbose::Presentat
     throw internal_not_found();
 }
 
-std::string Verbose::sipFailures(KSIP_Failures code, Verbose::Presentation fmt)
+std::string Verbose::sipFailures(const KSIP_Failures code, const Verbose::Presentation fmt)
 {
     try
     {
         return internal_sipFailures(code, fmt);
     }
-    catch (internal_not_found & e)
+    catch (internal_not_found e)
     {
         PRESENTATION_CHECK_RETURN(fmt,
             STG(FMT("[KSIP_Failures='%d']") % (int)code),
@@ -708,7 +779,7 @@ std::string Verbose::sipFailures(KSIP_Failures code, Verbose::Presentation fmt)
 #endif
 
 #if K3L_AT_LEAST(1,5,1)
-std::string Verbose::internal_isdnCause(KQ931Cause code, Verbose::Presentation fmt)
+std::string Verbose::internal_isdnCause(const KQ931Cause code, const Verbose::Presentation fmt)
 {
     switch (code)
     {
@@ -810,13 +881,13 @@ std::string Verbose::internal_isdnCause(KQ931Cause code, Verbose::Presentation f
     throw internal_not_found();
 }
 
-std::string Verbose::isdnCause(KQ931Cause code, Verbose::Presentation fmt)
+std::string Verbose::isdnCause(const KQ931Cause code, const Verbose::Presentation fmt)
 {
     try
     {
         return internal_isdnCause(code);
     }
-    catch (internal_not_found & e)
+    catch (internal_not_found e)
     {
         return STG(FMT("[KQ931Cause='%d']") % (int)code);
     }
@@ -824,7 +895,7 @@ std::string Verbose::isdnCause(KQ931Cause code, Verbose::Presentation fmt)
 #endif
 
 #if K3L_AT_LEAST(1,5,2)
-std::string Verbose::isdnDebug(int32 flags, Verbose::Presentation fmt)
+std::string Verbose::isdnDebug(const int32 flags, const Verbose::Presentation fmt)
 {
     if (0x00 != flags)
     {
@@ -844,9 +915,9 @@ std::string Verbose::isdnDebug(int32 flags, Verbose::Presentation fmt)
 #endif
 
 #if K3L_AT_LEAST(2,0,0)
-std::string Verbose::internal_signGroupB(KSignGroupB group, R2CountryType country, Verbose::Presentation fmt)
+std::string Verbose::internal_signGroupB(const KSignGroupB group, const R2CountryType country, const Verbose::Presentation fmt)
 #else
-std::string Verbose::internal_signGroupB(KSignGroupB group, Verbose::Presentation fmt)
+std::string Verbose::internal_signGroupB(const KSignGroupB group, const Verbose::Presentation fmt)
 #endif
 {
 #if K3L_AT_LEAST(2,0,0)
@@ -955,9 +1026,9 @@ std::string Verbose::internal_signGroupB(KSignGroupB group, Verbose::Presentatio
 }
 
 #if K3L_AT_LEAST(2,0,0)
-std::string Verbose::signGroupB(KSignGroupB group, R2CountryType r2_country, Verbose::Presentation fmt)
+std::string Verbose::signGroupB(const KSignGroupB group, const R2CountryType r2_country, const Verbose::Presentation fmt)
 #else
-std::string Verbose::signGroupB(KSignGroupB group, Verbose::Presentation fmt)
+std::string Verbose::signGroupB(const KSignGroupB group, const Verbose::Presentation fmt)
 #endif
 {
     try
@@ -968,7 +1039,7 @@ std::string Verbose::signGroupB(KSignGroupB group, Verbose::Presentation fmt)
         return internal_signGroupB(group, fmt);
 #endif
     }
-    catch (internal_not_found & e)
+    catch (internal_not_found e)
     {
         PRESENTATION_CHECK_RETURN(fmt,
             STG(FMT("[KSignGroupB='%d']") % (int)group),
@@ -977,9 +1048,9 @@ std::string Verbose::signGroupB(KSignGroupB group, Verbose::Presentation fmt)
 }
 
 #if K3L_AT_LEAST(2,0,0)
-std::string Verbose::internal_signGroupII(KSignGroupII group, R2CountryType country, Verbose::Presentation fmt)
+std::string Verbose::internal_signGroupII(const KSignGroupII group, const R2CountryType country, const Verbose::Presentation fmt)
 #else
-std::string Verbose::internal_signGroupII(KSignGroupII group, Verbose::Presentation fmt)
+std::string Verbose::internal_signGroupII(const KSignGroupII group, const Verbose::Presentation fmt)
 #endif
 {
 #if K3L_AT_LEAST(2,0,0)
@@ -1085,9 +1156,9 @@ std::string Verbose::internal_signGroupII(KSignGroupII group, Verbose::Presentat
 }
 
 #if K3L_AT_LEAST(2,0,0)
-std::string Verbose::signGroupII(KSignGroupII group, R2CountryType r2_country, Verbose::Presentation fmt)
+std::string Verbose::signGroupII(const KSignGroupII group, const R2CountryType r2_country, const Verbose::Presentation fmt)
 #else
-std::string Verbose::signGroupII(KSignGroupII group, Verbose::Presentation fmt)
+std::string Verbose::signGroupII(const KSignGroupII group, const Verbose::Presentation fmt)
 #endif
 {
     try
@@ -1098,7 +1169,7 @@ std::string Verbose::signGroupII(KSignGroupII group, Verbose::Presentation fmt)
         return internal_signGroupII(group);
 #endif
     }
-    catch (internal_not_found & e)
+    catch (internal_not_found e)
     {
         PRESENTATION_CHECK_RETURN(fmt,
             STG(FMT("[KSignGroupII='%d']") % (int)group),
@@ -1107,9 +1178,9 @@ std::string Verbose::signGroupII(KSignGroupII group, Verbose::Presentation fmt)
 }
 
 #if K3L_AT_LEAST(2,0,0)
-std::string Verbose::callFail(KSignaling sig, R2CountryType country, int32 info, Verbose::Presentation fmt)
+std::string Verbose::callFail(const KSignaling sig, const R2CountryType country, const int32 info, const Verbose::Presentation fmt)
 #else
-std::string Verbose::callFail(KSignaling sig, int32 info, Verbose::Presentation fmt)
+std::string Verbose::callFail(const KSignaling sig, const int32 info, const Verbose::Presentation fmt)
 #endif
 {
     try
@@ -1130,8 +1201,10 @@ std::string Verbose::callFail(KSignaling sig, int32 info, Verbose::Presentation
 #endif
 #if K3L_EXACT(2,1,0)
             case ksigISUP:
+#if !K3L_AT_LEAST(2,2,0)
             case ksigFax:
 #endif
+#endif
 #if K3L_AT_LEAST(1,6,0)
             case ksigCAS_EL7:
             case ksigE1LC:
@@ -1181,7 +1254,7 @@ std::string Verbose::callFail(KSignaling sig, int32 info, Verbose::Presentation
 #endif
         }
     }
-    catch (internal_not_found & e)
+    catch (internal_not_found e)
     {
         /* this exception is used for breaking the control flow */
     }
@@ -1191,7 +1264,7 @@ std::string Verbose::callFail(KSignaling sig, int32 info, Verbose::Presentation
         STG(FMT("Unknown call fail code for '%s' (%d)") % signaling(sig, fmt) % (int)info));
 }
 
-std::string Verbose::channelFail(KSignaling sig, int32 code, Verbose::Presentation fmt)
+std::string Verbose::channelFail(const KSignaling sig, const int32 code, const Verbose::Presentation fmt)
 {
     try
     {
@@ -1202,7 +1275,9 @@ std::string Verbose::channelFail(KSignaling sig, int32 code, Verbose::Presentati
             case ksigSIP:
 #if K3L_EXACT(2,1,0)
             case ksigISUP:
+#if !K3L_AT_LEAST(2,2,0)
             case ksigFax:
+#endif
 #endif
                 throw internal_not_found();
 
@@ -1248,7 +1323,7 @@ std::string Verbose::channelFail(KSignaling sig, int32 code, Verbose::Presentati
 #endif
         }
     }
-    catch (internal_not_found & e)
+    catch (internal_not_found e)
     {
         /* this exception is used for breaking the control flow */
     }
@@ -1258,7 +1333,7 @@ std::string Verbose::channelFail(KSignaling sig, int32 code, Verbose::Presentati
         STG(FMT("Unknown channel fail code for '%s' (%d)") % signaling(sig, fmt) % (int)code));
 }
 
-std::string Verbose::internalFail(KInternalFail inf, Verbose::Presentation fmt)
+std::string Verbose::internalFail(const KInternalFail inf, const Verbose::Presentation fmt)
 {
     switch (inf)
     {
@@ -1277,7 +1352,7 @@ std::string Verbose::internalFail(KInternalFail inf, Verbose::Presentation fmt)
         STG(FMT("Unknown internal failure (%d)") % (int)inf));
 }
 
-std::string Verbose::linkErrorCounter(KLinkErrorCounter ec, Verbose::Presentation fmt)
+std::string Verbose::linkErrorCounter(const KLinkErrorCounter ec, const Verbose::Presentation fmt)
 {
     switch (ec)
     {
@@ -1304,7 +1379,7 @@ std::string Verbose::linkErrorCounter(KLinkErrorCounter ec, Verbose::Presentatio
         STG(FMT("Unknown link error counter (%d)") % (int)ec));
 }
 
-std::string Verbose::callStatus(KCallStatus code, Verbose::Presentation fmt)
+std::string Verbose::callStatus(const KCallStatus code, const Verbose::Presentation fmt)
 {
     switch (code)
     {
@@ -1319,7 +1394,7 @@ std::string Verbose::callStatus(KCallStatus code, Verbose::Presentation fmt)
         STG(FMT("Unknown call status (%d)") % (int)code));
 }
 
-std::string Verbose::linkStatus(KSignaling sig, int32 code, Verbose::Presentation fmt)
+std::string Verbose::linkStatus(const KSignaling sig, const int32 code, const Verbose::Presentation fmt, const bool simpleStatus)
 {
     switch (sig)
     {
@@ -1340,7 +1415,9 @@ std::string Verbose::linkStatus(KSignaling sig, int32 code, Verbose::Presentatio
 #endif
 
 #if K3L_EXACT(2,1,0)
-        case ksigFax:
+#if !K3L_AT_LEAST(2,2,0)
+            case ksigFax:
+#endif
             return presentation(fmt, "[ksigFax]", "FAX");
 #endif
         case ksigContinuousEM:
@@ -1386,9 +1463,18 @@ std::string Verbose::linkStatus(KSignaling sig, int32 code, Verbose::Presentatio
                 if (kesUnknownAlarm & code)       strs.add(presentation(fmt, "UnknownAlarm",       "Slip alarm"));
                 if (kesE1Error & code)            strs.add(presentation(fmt, "E1Error",            "E1 error"));
 
-                PRESENTATION_CHECK_RETURN(fmt,
-                    STG(FMT("kes{%s}") % strs.merge(",")),
-                    strs.merge(", "));
+                if (simpleStatus)
+                {
+                    PRESENTATION_CHECK_RETURN(fmt,
+                        STG(FMT("kes{%s}") % *(strs.list().begin())),
+                            *(strs.list().begin()));
+                }
+                else
+                {
+                    PRESENTATION_CHECK_RETURN(fmt,
+                        STG(FMT("kes{%s}") % strs.merge(",")),
+                            strs.merge(", "));
+                }
             }
     }
 
@@ -1397,7 +1483,7 @@ std::string Verbose::linkStatus(KSignaling sig, int32 code, Verbose::Presentatio
         STG(FMT("Unknown link status for '%s' (%d)") % signaling(sig) % (int)code));
 }
 
-std::string Verbose::channelStatus(KSignaling sig, int32 flags, Verbose::Presentation fmt)
+std::string Verbose::channelStatus(const KSignaling sig, const int32 flags, const Verbose::Presentation fmt)
 {
     try
     {
@@ -1413,8 +1499,10 @@ std::string Verbose::channelStatus(KSignaling sig, int32 flags, Verbose::Present
 #if K3L_EXACT(2,1,0)
             case ksigISUP:
                 return presentation(fmt, "[ksigISUP]", "ISUP trunk");
+#if !K3L_AT_LEAST(2,2,0)
             case ksigFax:
                 return presentation(fmt, "[ksigFax]", "FAX");
+#endif
 #endif
 
             case ksigAnalog:
@@ -1532,7 +1620,7 @@ std::string Verbose::channelStatus(KSignaling sig, int32 flags, Verbose::Present
             }
         }
     }
-    catch (internal_not_found & e)
+    catch (internal_not_found e)
     {
         /* we use this exception to break the control flow */
     }
@@ -1542,7 +1630,7 @@ std::string Verbose::channelStatus(KSignaling sig, int32 flags, Verbose::Present
         STG(FMT("Unknown channel status for '%s' (%d)") % signaling(sig) % flags));
 }
 
-std::string Verbose::status(KLibraryStatus code, Verbose::Presentation fmt)
+std::string Verbose::status(const KLibraryStatus code, const Verbose::Presentation fmt)
 {
     switch (code)
     {
@@ -1569,7 +1657,7 @@ std::string Verbose::status(KLibraryStatus code, Verbose::Presentation fmt)
         STG(FMT("Unknown library status (%d)") % (int)code));
 }
 
-std::string Verbose::h100configIndex(KH100ConfigIndex code, Verbose::Presentation fmt)
+std::string Verbose::h100configIndex(const KH100ConfigIndex code, const Verbose::Presentation fmt)
 {
     switch (code)
     {
@@ -1584,7 +1672,7 @@ std::string Verbose::h100configIndex(KH100ConfigIndex code, Verbose::Presentatio
         case khciCTbusFreq07_04:     return presentation(fmt, "khciCTbusFreq07_04",  "CTBus Frequency 07 04"); // TODO: find better name
         case khciCTbusFreq11_08:     return presentation(fmt, "khciCTbusFreq11_08",  "CTBus Frequency 11 08"); // TODO: find better name
         case khciCTbusFreq15_12:     return presentation(fmt, "khciCTbusFreq15_12",  "CTBus Frequency 15 12"); // TODO: find better name
-        case khciMax:                return presentation(fmt, "khciMax",             "Max"); // TODO: find better name
+        case khciMax:                return presentation(fmt, "khciMax",             "Max");                   // TODO: find better name
         case khciMasterDevId:        return presentation(fmt, "khciMasterDevId",     "Master Device Number");
         case khciSecMasterDevId:     return presentation(fmt, "khciSecMasterDevId",  "Secondary Master Device Number");
         case khciCtNetrefDevId:      return presentation(fmt, "khciCtNetrefDevId",   "CTBus Network Reference Device Number");
@@ -1599,7 +1687,7 @@ std::string Verbose::h100configIndex(KH100ConfigIndex code, Verbose::Presentatio
 }
 
 #if K3L_AT_LEAST(1,6,0)
-std::string Verbose::callStartInfo(KCallStartInfo code, Verbose::Presentation fmt)
+std::string Verbose::callStartInfo(const KCallStartInfo code, const Verbose::Presentation fmt)
 {
     switch (code)
     {
@@ -1615,13 +1703,13 @@ std::string Verbose::callStartInfo(KCallStartInfo code, Verbose::Presentation fm
         STG(FMT("Unknown call answer info (%d)") % (int)code));
 }
 
-std::string Verbose::gsmCallCause(KGsmCallCause code, Verbose::Presentation fmt)
+std::string Verbose::gsmCallCause(const KGsmCallCause code, const Verbose::Presentation fmt)
 {
     try
     {
         return internal_gsmCallCause(code, fmt);
     }
-    catch (internal_not_found & e)
+    catch (internal_not_found e)
     {
         PRESENTATION_CHECK_RETURN(fmt,
             STG(FMT("[KGsmCallCause='%d']") % (int)code),
@@ -1629,7 +1717,7 @@ std::string Verbose::gsmCallCause(KGsmCallCause code, Verbose::Presentation fmt)
     }
 }
 
-std::string Verbose::internal_gsmCallCause(KGsmCallCause code, Verbose::Presentation fmt)
+std::string Verbose::internal_gsmCallCause(const KGsmCallCause code, const Verbose::Presentation fmt)
 {
     switch (code)
     {
@@ -1686,13 +1774,13 @@ std::string Verbose::internal_gsmCallCause(KGsmCallCause code, Verbose::Presenta
     throw internal_not_found();
 }
 
-std::string Verbose::gsmMobileCause(KGsmMobileCause code, Verbose::Presentation fmt)
+std::string Verbose::gsmMobileCause(const KGsmMobileCause code, const Verbose::Presentation fmt)
 {
     try
     {
         return internal_gsmMobileCause(code, fmt);
     }
-    catch (internal_not_found & e)
+    catch (internal_not_found e)
     {
         PRESENTATION_CHECK_RETURN(fmt,
             STG(FMT("[KGsmMobileCause='%d']") % (int)code),
@@ -1700,7 +1788,7 @@ std::string Verbose::gsmMobileCause(KGsmMobileCause code, Verbose::Presentation
     }
 }
 
-std::string Verbose::internal_gsmMobileCause(KGsmMobileCause code, Verbose::Presentation fmt)
+std::string Verbose::internal_gsmMobileCause(const KGsmMobileCause code, const Verbose::Presentation fmt)
 {
     switch (code)
     {
@@ -1792,13 +1880,13 @@ std::string Verbose::internal_gsmMobileCause(KGsmMobileCause code, Verbose::Pres
     throw internal_not_found();
 }
 
-std::string Verbose::gsmSmsCause(KGsmSmsCause code, Verbose::Presentation fmt)
+std::string Verbose::gsmSmsCause(const KGsmSmsCause code, const Verbose::Presentation fmt)
 {
     try
     {
         return internal_gsmSmsCause(code, fmt);
     }
-    catch (internal_not_found & e)
+    catch (internal_not_found e)
     {
         PRESENTATION_CHECK_RETURN(fmt,
             STG(FMT("[KGsmSmsCause='%d']") % (int)code),
@@ -1806,7 +1894,7 @@ std::string Verbose::gsmSmsCause(KGsmSmsCause code, Verbose::Presentation fmt)
     }
 }
 
-std::string Verbose::internal_gsmSmsCause(KGsmSmsCause code, Verbose::Presentation fmt)
+std::string Verbose::internal_gsmSmsCause(const KGsmSmsCause code, const Verbose::Presentation fmt)
 {
     switch (code)
     {
@@ -1890,13 +1978,13 @@ std::string Verbose::internal_gsmSmsCause(KGsmSmsCause code, Verbose::Presentati
     throw internal_not_found();
 }
 
-std::string Verbose::q931ProgressIndication(KQ931ProgressIndication code, Verbose::Presentation fmt)
+std::string Verbose::q931ProgressIndication(const KQ931ProgressIndication code, const Verbose::Presentation fmt)
 {
     try
     {
         return internal_q931ProgressIndication(code);
     }
-    catch (internal_not_found & e)
+    catch (internal_not_found e)
     {
         PRESENTATION_CHECK_RETURN(fmt,
             STG(FMT("[KQ931ProgressIndication='%d']") % (int)code),
@@ -1904,7 +1992,7 @@ std::string Verbose::q931ProgressIndication(KQ931ProgressIndication code, Verbos
     }
 }
 
-std::string Verbose::internal_q931ProgressIndication(KQ931ProgressIndication code, Verbose::Presentation fmt)
+std::string Verbose::internal_q931ProgressIndication(const KQ931ProgressIndication code, const Verbose::Presentation fmt)
 {
     switch (code)
     {
@@ -1924,7 +2012,7 @@ std::string Verbose::internal_q931ProgressIndication(KQ931ProgressIndication cod
 
 
 #if K3L_AT_LEAST(2,1,0)
-std::string Verbose::faxResult(KFaxResult code, Verbose::Presentation fmt)
+std::string Verbose::faxResult(const KFaxResult code, const Verbose::Presentation fmt)
 {
     switch (code)
     {
@@ -1945,7 +2033,7 @@ std::string Verbose::faxResult(KFaxResult code, Verbose::Presentation fmt)
         STG(FMT("Unknown fax result (%d)") % (int)code));
 }
 
-std::string Verbose::faxFileErrorCause(KFaxFileErrorCause code, Verbose::Presentation fmt)
+std::string Verbose::faxFileErrorCause(const KFaxFileErrorCause code, const Verbose::Presentation fmt)
 {
     switch (code)
     {
@@ -1969,307 +2057,12 @@ std::string Verbose::faxFileErrorCause(KFaxFileErrorCause code, Verbose::Present
 
 #endif
 
-
 /********/
 
-std::string Verbose::commandName(int32 code)
-{
-    switch ((kcommand)code)
-    {
-        case K_CM_SEIZE:                    return "CM_SEIZE";
-        case K_CM_SYNC_SEIZE:               return "CM_SYNC_SEIZE";
-        case K_CM_DIAL_DTMF:                return "CM_DIAL_DTMF";
-#if K3L_AT_LEAST(1,6,0)
-        case K_CM_SIP_REGISTER:             return "CM_SIP_REGISTER";
-#endif
-        case K_CM_DISCONNECT:               return "CM_DISCONNECT";
-        case K_CM_CONNECT:                  return "CM_CONNECT";
-        case K_CM_PRE_CONNECT:              return "CM_PRE_CONNECT";
-        case K_CM_CAS_CHANGE_LINE_STT:      return "CM_CAS_CHANGE_LINE_STT";
-        case K_CM_CAS_SEND_MFC:             return "CM_CAS_SEND_MFC";
-        case K_CM_SET_FORWARD_CHANNEL:      return "CM_SET_FORWARD_CHANNEL";
-        case K_CM_CAS_SET_MFC_DETECT_MODE:  return "CM_CAS_SET_MFC_DETECT_MODE";
-        case K_CM_DROP_COLLECT_CALL:        return "CM_DROP_COLLECT_CALL";
-
-#if K3L_AT_LEAST(1,5,0)
-        case K_CM_MAKE_CALL:                return "CM_MAKE_CALL";
-#endif
-
-#if K3L_AT_LEAST(1,4,0)
-        case K_CM_RINGBACK:                 return "CM_RINGBACK";
-#endif
-
-#if K3L_AT_LEAST(1,5,1)
-        case K_CM_USER_INFORMATION:         return "CM_USER_INFORMATION";
-#endif
-
-#if K3L_AT_LEAST(1,4,0) && !K3L_AT_LEAST(2,2,0)
-        case K_CM_VOIP_SEIZE:               return "CM_VOIP_SEIZE";
-
-#if !K3L_AT_LEAST(2,0,0)
-        /* internal commands */
-        case K_CM_VOIP_START_DEBUG:         return "CM_VOIP_START_DEBUG";
-        case K_CM_VOIP_STOP_DEBUG:          return "CM_VOIP_STOP_DEBUG";
-        case K_CM_VOIP_DUMP_STAT:           return "CM_VOIP_DUMP_STAT";
-#endif
-#endif
-
-#if K3L_AT_LEAST(1,5,2) && !K3L_AT_LEAST(2,0,0)
-        /* internal command */
-        case K_CM_ISDN_DEBUG:               return "CM_ISDN_DEBUG";
-#endif
-
-        case K_CM_LOCK_INCOMING:            return "CM_LOCK_INCOMING";
-        case K_CM_UNLOCK_INCOMING:          return "CM_UNLOCK_INCOMING";
-        case K_CM_LOCK_OUTGOING:            return "CM_LOCK_OUTGOING";
-        case K_CM_UNLOCK_OUTGOING:          return "CM_UNLOCK_OUTGOING";
-
-        case K_CM_START_SEND_FAIL:          return "CM_START_SEND_FAIL";
-        case K_CM_STOP_SEND_FAIL:           return "CM_STOP_SEND_FAIL";
-
-#if K3L_AT_LEAST(1,5,3)
-        case K_CM_END_OF_NUMBER:            return "CM_END_OF_NUMBER";
-#endif
-
-#if K3L_AT_LEAST(1,6,0)
-        case K_CM_SS_TRANSFER:              return "CM_SS_TRANSFER";
-        case K_CM_GET_SMS:                  return "CM_GET_SMS";
-        case K_CM_PREPARE_SMS:              return "CM_PREPARE_SMS";
-        case K_CM_SEND_SMS:                 return "CM_SEND_SMS";
-#endif
-#if K3L_HAS_MPTY_SUPPORT
-        case K_CM_HOLD_SWITCH:              return "CM_HOLD_SWITCH";
-        case K_CM_MPTY_CONF:                return "CM_MPTY_CONF";
-        case K_CM_MPTY_SPLIT:               return "CM_MPTY_SPLIT";
-#endif
-
-        case K_CM_ENABLE_DTMF_SUPPRESSION:  return "CM_ENABLE_DTMF_SUPPRESSION";
-        case K_CM_DISABLE_DTMF_SUPPRESSION: return "CM_DISABLE_DTMF_SUPPRESSION";
-        case K_CM_ENABLE_AUDIO_EVENTS:      return "CM_ENABLE_AUDIO_EVENTS";
-        case K_CM_DISABLE_AUDIO_EVENTS:     return "CM_DISABLE_AUDIO_EVENTS";
-        case K_CM_ENABLE_CALL_PROGRESS:     return "CM_ENABLE_CALL_PROGRESS";
-        case K_CM_DISABLE_CALL_PROGRESS:    return "CM_DISABLE_CALL_PROGRESS";
-        case K_CM_FLASH:                    return "CM_FLASH";
-        case K_CM_ENABLE_PULSE_DETECTION:   return "CM_ENABLE_PULSE_DETECTION";
-        case K_CM_DISABLE_PULSE_DETECTION:  return "CM_DISABLE_PULSE_DETECTION";
-        case K_CM_ENABLE_ECHO_CANCELLER:    return "CM_ENABLE_ECHO_CANCELLER";
-        case K_CM_DISABLE_ECHO_CANCELLER:   return "CM_DISABLE_ECHO_CANCELLER";
-        case K_CM_ENABLE_AGC:               return "CM_ENABLE_AGC";
-        case K_CM_DISABLE_AGC:              return "CM_DISABLE_AGC";
-        case K_CM_ENABLE_HIGH_IMP_EVENTS:   return "CM_ENABLE_HIGH_IMP_EVENTS";
-        case K_CM_DISABLE_HIGH_IMP_EVENTS:  return "CM_DISABLE_HIGH_IMP_EVENTS";
-
-#if K3L_AT_LEAST(1,6,0)
-        case K_CM_ENABLE_CALL_ANSWER_INFO:  return "CM_ENABLE_CALL_ANSWER_INFO";
-        case K_CM_DISABLE_CALL_ANSWER_INFO: return "CM_DISABLE_CALL_ANSWER_INFO";
-#endif
-
-        case K_CM_RESET_LINK:               return "CM_RESET_LINK";
-
-#if K3L_AT_LEAST(1,6,0)
-        case K_CM_CLEAR_LINK_ERROR_COUNTER: return "CM_CLEAR_LINK_ERROR_COUNTER";
-#endif
-
-        case K_CM_SEND_DTMF:                return "CM_SEND_DTMF";
-        case K_CM_STOP_AUDIO:               return "CM_STOP_AUDIO";
-        case K_CM_HARD_RESET:               return "CM_HARD_RESET";
-
-        case K_CM_SEND_TO_CTBUS:            return "CM_SEND_TO_CTBUS";
-        case K_CM_RECV_FROM_CTBUS:          return "CM_RECV_FROM_CTBUS";
-        case K_CM_SETUP_H100:               return "CM_SETUP_H100";
-
-        case K_CM_MIXER:                    return "CM_MIXER";
-        case K_CM_CLEAR_MIXER:              return "CM_CLEAR_MIXER";
-        case K_CM_PLAY_FROM_FILE:           return "CM_PLAY_FROM_FILE";
-        case K_CM_RECORD_TO_FILE:           return "CM_RECORD_TO_FILE";
-        case K_CM_PLAY_FROM_STREAM:         return "CM_PLAY_FROM_STREAM";
-        case K_CM_STOP_PLAY:                return "CM_STOP_PLAY";
-        case K_CM_STOP_RECORD:              return "CM_STOP_RECORD";
-        case K_CM_PAUSE_PLAY:               return "CM_PAUSE_PLAY";
-        case K_CM_PAUSE_RECORD:             return "CM_PAUSE_RECORD";
-        case K_CM_INCREASE_VOLUME:          return "CM_INCREASE_VOLUME";
-        case K_CM_DECREASE_VOLUME:          return "CM_DECREASE_VOLUME";
-        case K_CM_LISTEN:                   return "CM_LISTEN";
-        case K_CM_STOP_LISTEN:              return "CM_STOP_LISTEN";
-        case K_CM_PREPARE_FOR_LISTEN:       return "CM_PREPARE_FOR_LISTEN";
-
-        case K_CM_PLAY_SOUND_CARD:          return "CM_PLAY_SOUND_CARD";
-        case K_CM_STOP_SOUND_CARD:          return "CM_STOP_SOUND_CARD";
-
-        case K_CM_MIXER_CTBUS:              return "CM_MIXER_CTBUS";
-        case K_CM_PLAY_FROM_STREAM_EX:      return "CM_PLAY_FROM_STREAM_EX";
-        case K_CM_ENABLE_PLAYER_AGC:        return "CM_ENABLE_PLAYER_AGC";
-        case K_CM_DISABLE_PLAYER_AGC:       return "CM_DISABLE_PLAYER_AGC";
-        case K_CM_START_STREAM_BUFFER:      return "CM_START_STREAM_BUFFER";
-        case K_CM_ADD_STREAM_BUFFER:        return "CM_ADD_STREAM_BUFFER";
-        case K_CM_STOP_STREAM_BUFFER:       return "CM_STOP_STREAM_BUFFER";
-        case K_CM_SEND_BEEP:                return "CM_SEND_BEEP";
-        case K_CM_SEND_BEEP_CONF:           return "CM_SEND_BEEP_CONF";
-        case K_CM_ADD_TO_CONF:              return "CM_ADD_TO_CONF";
-        case K_CM_REMOVE_FROM_CONF:         return "CM_REMOVE_FROM_CONF";
-        case K_CM_RECORD_TO_FILE_EX:        return "CM_RECORD_TO_FILE_EX";
-
-#if K3L_AT_LEAST(1,5,4)
-        case K_CM_SET_VOLUME:               return "CM_SET_VOLUME";
-#endif
-        case K_CM_SET_LINE_CONDITION:       return "CM_SET_LINE_CONDITION";
-        case K_CM_SEND_LINE_CONDITION:      return "CM_SEND_LINE_CONDITION";
-        case K_CM_SET_CALLER_CATEGORY:      return "CM_SET_CALLER_CATEGORY";
-        case K_CM_DIAL_MFC:                 return "CM_DIAL_MFC";
-
-        case K_CM_INTERNAL_PLAY:            return "CM_INTERNAL_PLAY";
-        case K_CM_RESUME_PLAY:              return "CM_RESUME_PLAY";
-        case K_CM_RESUME_RECORD:            return "CM_RESUME_RECORD";
-        case K_CM_INTERNAL_PLAY_EX:         return "CM_INTERNAL_PLAY_EX";
-#if !K3L_AT_LEAST(2,0,0)
-        case K_CM_PING:                     return "CM_PING";
-#if K3L_AT_LEAST(1,6,0)
-        case K_CM_LOG_REQUEST:              return "CM_LOG_REQUEST";
-        case K_CM_LOG_CREATE_DISPATCHER:    return "CM_LOG_CREATE_DISPATCHER";
-        case K_CM_LOG_DESTROY_DISPATCHER:   return "CM_LOG_DESTROY_DISPATCHER";
-#endif
-#endif
-
-#if K3L_AT_LEAST(1,6,0)
-        case K_CM_START_CADENCE:            return "CM_START_CADENCE";
-        case K_CM_STOP_CADENCE:             return "CM_STOP_CADENCE";
-        case K_CM_CHECK_NEW_SMS:            return "CM_CHECK_NEW_SMS";
-        case K_CM_SEND_TO_MODEM:            return "CM_SEND_TO_MODEM";
-#endif
-#if K3L_AT_LEAST(2,1,0)
-        case K_CM_START_FAX_TX:             return "CM_START_FAX_TX";
-        case K_CM_STOP_FAX_TX:              return "CM_STOP_FAX_TX";
-        case K_CM_ADD_FAX_FILE:             return "CM_ADD_FAX_FILE";
-        case K_CM_ADD_FAX_PAGE_BREAK:       return "CM_ADD_FAX_PAGE_BREAK";
-        case K_CM_START_FAX_RX:             return "CM_START_FAX_RX";
-        case K_CM_STOP_FAX_RX:              return "CM_STOP_FAX_RX";
-        case K_CM_SIM_CARD_SELECT:          return "CM_SIM_CARD_SELECT";
-#endif
-
-#if K3L_AT_LEAST(2,1,0)
-       case K_CM_NOTIFY_WATCHDOG:           return "CM_NOTIFY_WATCHDOG";
-       case K_CM_STOP_WATCHDOG:             return "CM_STOP_WATCHDOG";
-       case K_CM_WATCHDOG_COUNT:            return "CM_WATCHDOG_COUNT";
-       case K_CM_START_WATCHDOG:            return "CM_START_WATCHDOG";
-#endif
-
-    }
-
-    return STG(FMT("[command='%d']") % code);
-}
-
-std::string Verbose::eventName(int32 code)
-{
-    switch ((kevent)code)
-    {
-        case K_EV_CHANNEL_FREE:         return "EV_CHANNEL_FREE";
-        case K_EV_CONNECT:              return "EV_CONNECT";
-        case K_EV_DISCONNECT:           return "EV_DISCONNECT";
-        case K_EV_CALL_SUCCESS:         return "EV_CALL_SUCCESS";
-        case K_EV_CALL_FAIL:            return "EV_CALL_FAIL";
-        case K_EV_NO_ANSWER:            return "EV_NO_ANSWER";
-        case K_EV_BILLING_PULSE:        return "EV_BILLING_PULSE";
-        case K_EV_SEIZE_SUCCESS:        return "EV_SEIZE_SUCCESS";
-        case K_EV_SEIZE_FAIL:           return "EV_SEIZE_FAIL";
-        case K_EV_SEIZURE_START:        return "EV_SEIZURE_START";
-        case K_EV_CAS_LINE_STT_CHANGED: return "EV_CAS_LINE_STT_CHANGED";
-        case K_EV_CAS_MFC_RECV:         return "EV_CAS_MFC_RECV";
-
-#if K3L_AT_LEAST(1,5,0)
-        case K_EV_NEW_CALL:             return "EV_NEW_CALL";
-#endif
-
-#if K3L_AT_LEAST(1,5,1)
-        case K_EV_USER_INFORMATION:     return "EV_USER_INFORMATION";
-#endif
-
-#if K3L_AT_LEAST(1,5,3)
-        case K_EV_DIALED_DIGIT:         return "EV_DIALED_DIGIT";
-#endif
-
-#if K3L_AT_LEAST(1,6,0)
-        case K_EV_SIP_REGISTER_INFO:    return "EV_SIP_REGISTER_INFO";
-#endif
-
-#if K3L_AT_LEAST(1,4,0)
-        case K_EV_CALL_HOLD_START:      return "EV_CALL_HOLD_START";
-        case K_EV_CALL_HOLD_STOP:       return "EV_CALL_HOLD_STOP";
-#endif
-
-#if K3L_AT_LEAST(1,6,0)
-        case K_EV_SS_TRANSFER_FAIL:     return "EV_SS_TRANSFER_FAIL";
-        case K_EV_FLASH:                return "EV_FLASH";
-#endif
-
-        case K_EV_DTMF_DETECTED:        return "EV_DTMF_DETECTED";
-        case K_EV_DTMF_SEND_FINISH:     return "EV_DTMF_SEND_FINISH";
-        case K_EV_AUDIO_STATUS:         return "EV_AUDIO_STATUS";
-        case K_EV_CADENCE_RECOGNIZED:   return "EV_CADENCE_RECOGNIZED";
-
-        case K_EV_END_OF_STREAM:        return "EV_END_OF_STREAM";
-        case K_EV_PULSE_DETECTED:       return "EV_PULSE_DETECTED";
-
-#if K3L_AT_LEAST(1,5,1)
-        case K_EV_POLARITY_REVERSAL:    return "EV_POLARITY_REVERSAL";
-#endif
-
-#if K3L_AT_LEAST(1,6,0)
-        case K_EV_ISDN_PROGRESS_INDICATOR: return "EV_ISDN_PROGRESS_INDICATOR";
-        case K_EV_CALL_ANSWER_INFO:        return "EV_CALL_ANSWER_INFO";
-        case K_EV_COLLECT_CALL:            return "EV_COLLECT_CALL";
-        case K_EV_SIP_DTMF_DETECTED:       return "EV_SIP_DTMF_DETECTED";
-
-        case K_EV_RECV_FROM_MODEM:      return "EV_RECV_FROM_MODEM";
-        case K_EV_NEW_SMS:              return "EV_NEW_SMS";
-        case K_EV_SMS_INFO:             return "EV_SMS_INFO";
-        case K_EV_SMS_DATA:             return "EV_SMS_DATA";
-        case K_EV_SMS_SEND_RESULT:      return "EV_SMS_SEND_RESULT";
-        case K_EV_RING_DETECTED:        return "EV_RING_DETECTED";
-        case K_EV_PHYSICAL_LINK_DOWN:   return "EV_PHYSICAL_LINK_DOWN";
-        case K_EV_PHYSICAL_LINK_UP:     return "EV_PHYSICAL_LINK_UP";
-#endif
-#if K3L_HAS_MPTY_SUPPORT
-        case K_EV_CALL_MPTY_START:      return "EV_CALL_MPTY_START";
-        case K_EV_CALL_MPTY_STOP:       return "EV_CALL_MPTY_STOP";
-        case K_EV_GSM_COMMAND_STATUS:   return "EV_GSM_COMMAND_STATUS";
-#endif
-#if !K3L_AT_LEAST(2,0,0)
-        case K_EV_PONG:                 return "EV_PONG";
-#endif
-        case K_EV_CHANNEL_FAIL:         return "EV_CHANNEL_FAIL";
-        case K_EV_REFERENCE_FAIL:       return "EV_REFERENCE_FAIL";
-        case K_EV_INTERNAL_FAIL:        return "EV_INTERNAL_FAIL";
-        case K_EV_HARDWARE_FAIL:        return "EV_HARDWARE_FAIL";
-        case K_EV_LINK_STATUS:          return "EV_LINK_STATUS";
-
-#if K3L_AT_LEAST(1,4,0)
-        case K_EV_CLIENT_RECONNECT:     return "EV_CLIENT_RECONNECT";
-        case K_EV_VOIP_SEIZURE:         return "EV_VOIP_SEIZURE";
-#endif
-        case K_EV_SEIZURE:              return "EV_SEIZURE";
-#if K3L_AT_LEAST(2,1,0)
-        case K_EV_FAX_CHANNEL_FREE:     return "EV_FAX_CHANNEL_FREE";
-        case K_EV_FAX_FILE_SENT:        return "EV_FAX_FILE_SENT";
-        case K_EV_FAX_FILE_FAIL:        return "EV_FAX_FILE_FAIL";
-    /*case K_EV_FAX_MESSAGE_CONFIRMATION:return "EV_FAX_MESSAGE_CONFIRMATION";*/
-        case K_EV_FAX_TX_TIMEOUT:       return "EV_FAX_TX_TIMEOUT";
-        case K_EV_FAX_PAGE_CONFIRMATION:return "EV_FAX_PAGE_CONFIRMATION";
-        case K_EV_FAX_REMOTE_INFO:      return "EV_FAX_REMOTE_INFO";
-#endif
-
-#if K3L_AT_LEAST(2,1,0)
-        case K_EV_WATCHDOG_COUNT:       return "EV_WATCHDOG_COUNT";
-#endif
-    }
-
-    return STG(FMT("[event='%d']") % code);
-}
-
-
 #if K3L_AT_LEAST(2,0,0)
-std::string Verbose::command(int32 dev, K3L_COMMAND *k3lcmd, R2CountryType r2_country, Verbose::Presentation fmt)
+std::string Verbose::command(const int32 dev, const K3L_COMMAND * const k3lcmd, const R2CountryType r2_country, const Verbose::Presentation fmt)
 #else
-std::string Verbose::command(int32 dev, K3L_COMMAND *k3lcmd, Verbose::Presentation fmt)
+std::string Verbose::command(const int32 dev, const K3L_COMMAND * const k3lcmd, const Verbose::Presentation fmt)
 #endif
 {
 #if K3L_AT_LEAST(2,0,0)
@@ -2280,106 +2073,107 @@ std::string Verbose::command(int32 dev, K3L_COMMAND *k3lcmd, Verbose::Presentati
 }
 
 #if K3L_AT_LEAST(2,0,0)
-std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const char * params, R2CountryType r2_country, Verbose::Presentation fmt)
+std::string Verbose::command(const int32 cmd_code, const int32 dev_idx, const int32 obj_idx, const char * const params, const R2CountryType r2_country, const Verbose::Presentation fmt)
 #else
-std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const char * params, Verbose::Presentation fmt)
+std::string Verbose::command(const int32 cmd_code, const int32 dev_idx, const int32 obj_idx, const char * const params, const Verbose::Presentation fmt)
 #endif
 {
     unsigned short int dev = (unsigned short int) dev_idx;
     unsigned short int obj = (unsigned short int) obj_idx;
 
-    kcommand code = (kcommand) cmd_code;
+    VerboseTraits::Command code = (VerboseTraits::Command) cmd_code;
 
     std::string buf, extra;
 
     switch (code)
     {
-        case K_CM_SEIZE:
-        case K_CM_SYNC_SEIZE:
-        //case K_CM_VOIP_SEIZE://deprecated
-        case K_CM_DIAL_MFC:
-        case K_CM_DIAL_DTMF:
+        case VerboseTraits::K_CM_SEIZE:
+        case VerboseTraits::K_CM_SYNC_SEIZE:
+        case VerboseTraits::K_CM_VOIP_SEIZE:
+        case VerboseTraits::K_CM_DIAL_MFC:
+        case VerboseTraits::K_CM_DIAL_DTMF:
 
-        case K_CM_CONNECT:
-        case K_CM_PRE_CONNECT:
-        case K_CM_DISCONNECT:
-        case K_CM_DROP_COLLECT_CALL:
+        case VerboseTraits::K_CM_CONNECT:
+        case VerboseTraits::K_CM_PRE_CONNECT:
+        case VerboseTraits::K_CM_DISCONNECT:
+        case VerboseTraits::K_CM_DROP_COLLECT_CALL:
 
-        case K_CM_START_SEND_FAIL:
-        case K_CM_STOP_SEND_FAIL:
+        case VerboseTraits::K_CM_START_SEND_FAIL:
+        case VerboseTraits::K_CM_STOP_SEND_FAIL:
 
-        case K_CM_ENABLE_DTMF_SUPPRESSION:
-        case K_CM_DISABLE_DTMF_SUPPRESSION:
-        case K_CM_ENABLE_AUDIO_EVENTS:
-        case K_CM_DISABLE_AUDIO_EVENTS:
-        case K_CM_ENABLE_CALL_PROGRESS:
-        case K_CM_DISABLE_CALL_PROGRESS:
-        case K_CM_ENABLE_PULSE_DETECTION:
-        case K_CM_DISABLE_PULSE_DETECTION:
-        case K_CM_ENABLE_ECHO_CANCELLER:
-        case K_CM_DISABLE_ECHO_CANCELLER:
-        case K_CM_ENABLE_AGC:
-        case K_CM_DISABLE_AGC:
-        case K_CM_ENABLE_HIGH_IMP_EVENTS:
-        case K_CM_DISABLE_HIGH_IMP_EVENTS:
+        case VerboseTraits::K_CM_ENABLE_DTMF_SUPPRESSION:
+        case VerboseTraits::K_CM_DISABLE_DTMF_SUPPRESSION:
+        case VerboseTraits::K_CM_ENABLE_AUDIO_EVENTS:
+        case VerboseTraits::K_CM_DISABLE_AUDIO_EVENTS:
+        case VerboseTraits::K_CM_ENABLE_CALL_PROGRESS:
+        case VerboseTraits::K_CM_DISABLE_CALL_PROGRESS:
+        case VerboseTraits::K_CM_ENABLE_PULSE_DETECTION:
+        case VerboseTraits::K_CM_DISABLE_PULSE_DETECTION:
+        case VerboseTraits::K_CM_ENABLE_ECHO_CANCELLER:
+        case VerboseTraits::K_CM_DISABLE_ECHO_CANCELLER:
+        case VerboseTraits::K_CM_ENABLE_AGC:
+        case VerboseTraits::K_CM_DISABLE_AGC:
+        case VerboseTraits::K_CM_ENABLE_HIGH_IMP_EVENTS:
+        case VerboseTraits::K_CM_DISABLE_HIGH_IMP_EVENTS:
 
-        case K_CM_FLASH:
-        case K_CM_RESET_LINK:
-        case K_CM_CLEAR_MIXER:
+        case VerboseTraits::K_CM_FLASH:
+        case VerboseTraits::K_CM_RESET_LINK:
+        case VerboseTraits::K_CM_CLEAR_MIXER:
 
-        case K_CM_LOCK_INCOMING:
-        case K_CM_UNLOCK_INCOMING:
-        case K_CM_LOCK_OUTGOING:
-        case K_CM_UNLOCK_OUTGOING:
+        case VerboseTraits::K_CM_LOCK_INCOMING:
+        case VerboseTraits::K_CM_UNLOCK_INCOMING:
+        case VerboseTraits::K_CM_LOCK_OUTGOING:
+        case VerboseTraits::K_CM_UNLOCK_OUTGOING:
 
-        case K_CM_INCREASE_VOLUME:
-        case K_CM_DECREASE_VOLUME:
+        case VerboseTraits::K_CM_INCREASE_VOLUME:
+        case VerboseTraits::K_CM_DECREASE_VOLUME:
 
-        case K_CM_STOP_RECORD:
-        case K_CM_PAUSE_RECORD:
-        case K_CM_RESUME_RECORD:
+        case VerboseTraits::K_CM_STOP_RECORD:
+        case VerboseTraits::K_CM_PAUSE_RECORD:
+        case VerboseTraits::K_CM_RESUME_RECORD:
 
-        case K_CM_STOP_LISTEN:
+        case VerboseTraits::K_CM_STOP_LISTEN:
 
-        case K_CM_PLAY_SOUND_CARD:
-        case K_CM_STOP_SOUND_CARD:
-        case K_CM_RINGBACK:
+        case VerboseTraits::K_CM_PLAY_SOUND_CARD:
+        case VerboseTraits::K_CM_STOP_SOUND_CARD:
+        case VerboseTraits::K_CM_RINGBACK:
 #if K3L_AT_LEAST(1,4,0) && !K3L_AT_LEAST(2,0,0)
-        case K_CM_VOIP_START_DEBUG:
-        case K_CM_VOIP_STOP_DEBUG:
-        case K_CM_VOIP_DUMP_STAT:
+        case VerboseTraits::K_CM_VOIP_START_DEBUG:
+        case VerboseTraits::K_CM_VOIP_STOP_DEBUG:
+        case VerboseTraits::K_CM_VOIP_DUMP_STAT:
 #endif
 
 #if K3L_AT_LEAST(1,5,3)
-        case K_CM_END_OF_NUMBER:
+        case VerboseTraits::K_CM_END_OF_NUMBER:
 #endif
 
 #if K3L_AT_LEAST(1,5,4)
-        case K_CM_SET_VOLUME:
+        case VerboseTraits::K_CM_SET_VOLUME:
 #endif
 
 #if K3L_AT_LEAST(1,6,0)
-        case K_CM_ENABLE_CALL_ANSWER_INFO:
-        case K_CM_DISABLE_CALL_ANSWER_INFO:
+        case VerboseTraits::K_CM_ENABLE_CALL_ANSWER_INFO:
+        case VerboseTraits::K_CM_DISABLE_CALL_ANSWER_INFO:
 
-        case K_CM_SS_TRANSFER:
+        case VerboseTraits::K_CM_SS_TRANSFER:
 
-        case K_CM_CHECK_NEW_SMS:
-        case K_CM_GET_SMS:
-        case K_CM_PREPARE_SMS:
-        case K_CM_SEND_SMS:
+        case VerboseTraits::K_CM_CHECK_NEW_SMS:
+        case VerboseTraits::K_CM_GET_SMS:
+        case VerboseTraits::K_CM_PREPARE_SMS:
+        case VerboseTraits::K_CM_SEND_SMS:
 
-        case K_CM_START_CADENCE:
-        case K_CM_STOP_CADENCE:
-        case K_CM_SEND_TO_MODEM:
+        case VerboseTraits::K_CM_START_CADENCE:
+        case VerboseTraits::K_CM_STOP_CADENCE:
+        case VerboseTraits::K_CM_SEND_TO_MODEM:
 #endif
 #if K3L_HAS_MPTY_SUPPORT
-        case K_CM_HOLD_SWITCH:
-        case K_CM_MPTY_CONF:
-        case K_CM_MPTY_SPLIT:
+        case VerboseTraits::K_CM_HOLD_SWITCH:
+        case VerboseTraits::K_CM_MPTY_CONF:
+        case VerboseTraits::K_CM_MPTY_SPLIT:
 #endif
 #if K3L_AT_LEAST(2,1,0)
-        case K_CM_SIM_CARD_SELECT:
+        case VerboseTraits::K_CM_SIM_CARD_SELECT:
+        case VerboseTraits::K_CM_CT_TRANSFER:
 #endif
             if (params != NULL)
             {
@@ -2394,12 +2188,12 @@ std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const
                 return show(buf, commandName(code), Target(CHANNEL, dev, obj));
             }
 
-        case K_CM_SEND_DTMF: /* ?? */
+        case VerboseTraits::K_CM_SEND_DTMF: /* ?? */
             return show(buf, commandName(code), Target(CHANNEL, dev, obj));
 
         /****/
 
-        case K_CM_STOP_AUDIO:
+        case VerboseTraits::K_CM_STOP_AUDIO:
             extra  = "stop='";
             switch ((params ? (int)(*params) : -1))
             {
@@ -2415,7 +2209,7 @@ std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const
         /****/
 
 #if K3L_AT_LEAST(1,5,2) && !K3L_AT_LEAST(2,0,0)
-        case K_CM_ISDN_DEBUG:
+        case VerboseTraits::K_CM_ISDN_DEBUG:
             extra  = "flags='";
             extra += isdnDebug((unsigned long)params);
             extra += "'";
@@ -2426,7 +2220,7 @@ std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const
         /****/
 
 #if K3L_AT_LEAST(1,5,1)
-        case K_CM_USER_INFORMATION:
+        case VerboseTraits::K_CM_USER_INFORMATION:
 #endif
             if (params != NULL)
             {
@@ -2448,7 +2242,7 @@ std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const
 
 
 
-        case K_CM_CAS_CHANGE_LINE_STT:
+        case VerboseTraits::K_CM_CAS_CHANGE_LINE_STT:
         {
             const char status = (params ? *params : 0x00);
 
@@ -2462,7 +2256,7 @@ std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const
             return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
         }
 
-        case K_CM_CAS_SEND_MFC:
+        case VerboseTraits::K_CM_CAS_SEND_MFC:
         {
             char mfc = (params ? *params : 0xff);
 
@@ -2471,7 +2265,7 @@ std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const
             return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
         }
 
-        case K_CM_CAS_SET_MFC_DETECT_MODE:
+        case VerboseTraits::K_CM_CAS_SET_MFC_DETECT_MODE:
         {
             int mode = (params ? *((int *)params) : -1);
 
@@ -2480,7 +2274,7 @@ std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const
             return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
         }
 
-        case K_CM_SET_FORWARD_CHANNEL:
+        case VerboseTraits::K_CM_SET_FORWARD_CHANNEL:
         {
             int channel = (params ? *((int*) params) : -1);
 
@@ -2490,7 +2284,7 @@ std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const
         }
 
 #if K3L_AT_LEAST(1,5,0)
-        case K_CM_MAKE_CALL:
+        case VerboseTraits::K_CM_MAKE_CALL:
             extra  = "options='";
             extra += (params ? params : "<empty>");
             extra += "'";
@@ -2498,8 +2292,8 @@ std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const
             return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
 #endif
 
-        case K_CM_MIXER:
-        case K_CM_MIXER_CTBUS:
+        case VerboseTraits::K_CM_MIXER:
+        case VerboseTraits::K_CM_MIXER_CTBUS:
         {
             if (params)
             {
@@ -2537,29 +2331,29 @@ std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const
             return show(buf, commandName(code), Target(MIXER, dev, obj), extra);
         };
 
-        case K_CM_PLAY_FROM_FILE:
+        case VerboseTraits::K_CM_PLAY_FROM_FILE:
             extra  = "file='";
             extra += (params ? params : "<empty>");
             extra += "'";
 
             return show(buf, commandName(code), Target(PLAYER, dev, obj), extra);
 
-        case K_CM_RECORD_TO_FILE:
+        case VerboseTraits::K_CM_RECORD_TO_FILE:
             extra  = "file='";
             extra += (params ? params : "<empty>");
             extra += "'";
 
             return show(buf, commandName(code), Target(PLAYER, dev, obj), extra);
 
-        case K_CM_RECORD_TO_FILE_EX:
+        case VerboseTraits::K_CM_RECORD_TO_FILE_EX:
             extra  = "params='";
             extra += (params ? params : "<empty>");
             extra += "'";
 
             return show(buf, commandName(code), Target(PLAYER, dev, obj), extra);
 
-        case K_CM_PLAY_FROM_STREAM:
-        case K_CM_ADD_STREAM_BUFFER:
+        case VerboseTraits::K_CM_PLAY_FROM_STREAM:
+        case VerboseTraits::K_CM_ADD_STREAM_BUFFER:
         {
             struct buffer_param
             {
@@ -2576,7 +2370,7 @@ std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const
             return show(buf, commandName(code), Target(PLAYER, dev, obj), extra);
         }
 
-        case K_CM_PLAY_FROM_STREAM_EX:
+        case VerboseTraits::K_CM_PLAY_FROM_STREAM_EX:
         {
             struct buffer_param
             {
@@ -2604,24 +2398,24 @@ std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const
             return show(buf, commandName(code), Target(PLAYER, dev, obj), extra);
         }
 
-        case K_CM_STOP_PLAY:
-        case K_CM_PAUSE_PLAY:
-        case K_CM_RESUME_PLAY:
+        case VerboseTraits::K_CM_STOP_PLAY:
+        case VerboseTraits::K_CM_PAUSE_PLAY:
+        case VerboseTraits::K_CM_RESUME_PLAY:
 
-        case K_CM_START_STREAM_BUFFER:
-        case K_CM_STOP_STREAM_BUFFER:
+        case VerboseTraits::K_CM_START_STREAM_BUFFER:
+        case VerboseTraits::K_CM_STOP_STREAM_BUFFER:
 
-        case K_CM_ENABLE_PLAYER_AGC:
-        case K_CM_DISABLE_PLAYER_AGC:
+        case VerboseTraits::K_CM_ENABLE_PLAYER_AGC:
+        case VerboseTraits::K_CM_DISABLE_PLAYER_AGC:
 
-        case K_CM_SEND_BEEP:
-        case K_CM_SEND_BEEP_CONF:
+        case VerboseTraits::K_CM_SEND_BEEP:
+        case VerboseTraits::K_CM_SEND_BEEP_CONF:
 
-        case K_CM_INTERNAL_PLAY:
-        case K_CM_INTERNAL_PLAY_EX:
+        case VerboseTraits::K_CM_INTERNAL_PLAY:
+        case VerboseTraits::K_CM_INTERNAL_PLAY_EX:
             return show(buf, commandName(code), Target(PLAYER, dev, obj));
 
-        case K_CM_ADD_TO_CONF:
+        case VerboseTraits::K_CM_ADD_TO_CONF:
             extra += "conference='";
             extra += (params ? (int) (*params) : -1);
             extra += "'";
@@ -2631,8 +2425,8 @@ std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const
         case CM_REMOVE_FROM_CONF:
             return show(buf, commandName(code), Target(MIXER, dev, obj));
 
-        case K_CM_LISTEN:
-        case K_CM_PREPARE_FOR_LISTEN:
+        case VerboseTraits::K_CM_LISTEN:
+        case VerboseTraits::K_CM_PREPARE_FOR_LISTEN:
         {
             int msecs = (params ? *((int*)params) : -1);
 
@@ -2641,8 +2435,8 @@ std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const
             return show(buf, commandName(code), Target(PLAYER, dev, obj), extra);
         }
 
-        case K_CM_SEND_TO_CTBUS:
-        case K_CM_RECV_FROM_CTBUS:
+        case VerboseTraits::K_CM_SEND_TO_CTBUS:
+        case VerboseTraits::K_CM_RECV_FROM_CTBUS:
         {
             KCtbusCommand *p = (KCtbusCommand*)(params);
 
@@ -2652,8 +2446,8 @@ std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const
             return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
         }
 
-        case K_CM_SET_LINE_CONDITION:
-        case K_CM_SEND_LINE_CONDITION:
+        case VerboseTraits::K_CM_SET_LINE_CONDITION:
+        case VerboseTraits::K_CM_SEND_LINE_CONDITION:
             extra  = "condition='";
 #if K3L_AT_LEAST(2,0,0)
             extra += signGroupB((KSignGroupB) *((int *) params), r2_country);
@@ -2664,7 +2458,7 @@ std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const
 
             return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
 
-        case K_CM_SET_CALLER_CATEGORY:
+        case VerboseTraits::K_CM_SET_CALLER_CATEGORY:
             extra  = "category='";
 #if K3L_AT_LEAST(2,0,0)
             extra += signGroupII((KSignGroupII) *((int *) params), r2_country);
@@ -2676,10 +2470,10 @@ std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const
             return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
 
 #if K3L_AT_LEAST(1,6,0)
-        case K_CM_CLEAR_LINK_ERROR_COUNTER:
+        case VerboseTraits::K_CM_CLEAR_LINK_ERROR_COUNTER:
             return show(buf, commandName(code), Target(LINK, dev, obj));
 
-        case K_CM_SIP_REGISTER:
+        case VerboseTraits::K_CM_SIP_REGISTER:
             if (params != NULL)
             {
                 extra += "param='";
@@ -2694,7 +2488,7 @@ std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const
             }
 #endif
 
-        case K_CM_SETUP_H100:
+        case VerboseTraits::K_CM_SETUP_H100:
             extra += "option='";
             extra += h100configIndex((KH100ConfigIndex)obj_idx);
             extra += "'value='";
@@ -2703,38 +2497,38 @@ std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const
 
             return show(buf, commandName(code), Target(DEVICE, dev), extra);
 
-        case K_CM_HARD_RESET:
+        case VerboseTraits::K_CM_HARD_RESET:
             return show(buf, commandName(code), Target(LINK, dev, obj));
 
 #if !K3L_AT_LEAST(2,0,0)
         /* como funciona? */
-        case K_CM_LOG_REQUEST:
-        case K_CM_LOG_CREATE_DISPATCHER:
-        case K_CM_LOG_DESTROY_DISPATCHER:
+        case VerboseTraits::K_CM_LOG_REQUEST:
+        case VerboseTraits::K_CM_LOG_CREATE_DISPATCHER:
+        case VerboseTraits::K_CM_LOG_DESTROY_DISPATCHER:
 
-        case K_CM_PING:
+        case VerboseTraits::K_CM_PING:
 #endif
             return show(buf, commandName(code), Target(NONE));
 #if K3L_AT_LEAST(2,1,0)
-        case K_CM_START_FAX_TX:
-        case K_CM_START_FAX_RX:
-        case K_CM_ADD_FAX_FILE:
+        case VerboseTraits::K_CM_START_FAX_TX:
+        case VerboseTraits::K_CM_START_FAX_RX:
+        case VerboseTraits::K_CM_ADD_FAX_FILE:
             extra  = "params='";
             extra += (params ? params : "<empty>");
             extra += "'";
             return show(buf, commandName(code), Target(CHANNEL, dev, obj), extra);
-        case K_CM_STOP_FAX_TX:
-        case K_CM_STOP_FAX_RX:
-        case K_CM_ADD_FAX_PAGE_BREAK:
+        case VerboseTraits::K_CM_STOP_FAX_TX:
+        case VerboseTraits::K_CM_STOP_FAX_RX:
+        case VerboseTraits::K_CM_ADD_FAX_PAGE_BREAK:
             return show(buf, commandName(code), Target(CHANNEL, dev, obj));
 #endif
 
 #if K3L_AT_LEAST(2,1,0)
-        case K_CM_NOTIFY_WATCHDOG:
-        case K_CM_STOP_WATCHDOG:
-        case K_CM_START_WATCHDOG:
+        case VerboseTraits::K_CM_NOTIFY_WATCHDOG:
+        case VerboseTraits::K_CM_STOP_WATCHDOG:
+        case VerboseTraits::K_CM_START_WATCHDOG:
             return show(buf, commandName(code) , Target(DEVICE, obj));
-        case K_CM_WATCHDOG_COUNT:
+        case VerboseTraits::K_CM_WATCHDOG_COUNT:
             return show(buf, commandName(code) , Target(NONE));
 #endif
 
@@ -2745,65 +2539,66 @@ std::string Verbose::command(int32 cmd_code, int32 dev_idx, int32 obj_idx, const
 }
 
 #if K3L_AT_LEAST(2,0,0)
-std::string Verbose::event(KSignaling sig, int32 obj_idx, K3L_EVENT *ev, R2CountryType r2_country, Verbose::Presentation fmt)
+std::string Verbose::event(const KSignaling sig, const int32 obj_idx, const K3L_EVENT * const ev, const R2CountryType r2_country, const Verbose::Presentation fmt)
 #else
-std::string Verbose::event(KSignaling sig, int32 obj_idx, K3L_EVENT *ev, Verbose::Presentation fmt)
+std::string Verbose::event(const KSignaling sig, const int32 obj_idx, const K3L_EVENT * const ev, const Verbose::Presentation fmt)
 #endif
 {
     unsigned short int dev = (unsigned short int) ev->DeviceId;
     unsigned short int obj = (unsigned short int) obj_idx;
 
-    kevent code = (kevent) ev->Code;
+    VerboseTraits::Event code = (VerboseTraits::Event) ev->Code;
 
-    std::string buf, extra;
+    std::string buf;
+    std::string extra;
 
     switch (code)
     {
-        case K_EV_CHANNEL_FREE:
-        case K_EV_SEIZE_SUCCESS:
-        case K_EV_CALL_SUCCESS:
-        case K_EV_NO_ANSWER:
-        case K_EV_CONNECT:
-        case K_EV_DTMF_SEND_FINISH:
-        case K_EV_SEIZURE_START:
-        case K_EV_BILLING_PULSE:
-        case K_EV_REFERENCE_FAIL:
+        case VerboseTraits::VerboseTraits::K_EV_CHANNEL_FREE:
+        case VerboseTraits::VerboseTraits::K_EV_SEIZE_SUCCESS:
+        case VerboseTraits::VerboseTraits::K_EV_CALL_SUCCESS:
+        case VerboseTraits::VerboseTraits::K_EV_NO_ANSWER:
+        case VerboseTraits::VerboseTraits::K_EV_CONNECT:
+        case VerboseTraits::VerboseTraits::K_EV_DTMF_SEND_FINISH:
+        case VerboseTraits::VerboseTraits::K_EV_SEIZURE_START:
+        case VerboseTraits::VerboseTraits::K_EV_BILLING_PULSE:
+        case VerboseTraits::VerboseTraits::K_EV_REFERENCE_FAIL:
 
 #if K3L_AT_LEAST(1,4,0)
-        case K_EV_CALL_HOLD_START:
-        case K_EV_CALL_HOLD_STOP:
+        case VerboseTraits::VerboseTraits::K_EV_CALL_HOLD_START:
+        case VerboseTraits::VerboseTraits::K_EV_CALL_HOLD_STOP:
 #endif
 
 #if K3L_AT_LEAST(1,5,0)
-        case K_EV_NEW_CALL:
+        case VerboseTraits::VerboseTraits::K_EV_NEW_CALL:
 #endif
 
 #if K3L_AT_LEAST(1,6,0)
-        case K_EV_FLASH:
-        case K_EV_POLARITY_REVERSAL:
-        case K_EV_COLLECT_CALL:
-        case K_EV_SS_TRANSFER_FAIL:
-        case K_EV_RING_DETECTED:
+        case VerboseTraits::VerboseTraits::K_EV_FLASH:
+        case VerboseTraits::VerboseTraits::K_EV_POLARITY_REVERSAL:
+        case VerboseTraits::VerboseTraits::K_EV_COLLECT_CALL:
+        case VerboseTraits::VerboseTraits::K_EV_RING_DETECTED:
+        case VerboseTraits::VerboseTraits::K_EV_SS_TRANSFER_FAIL:
 #endif
 #if K3L_HAS_MPTY_SUPPORT
-        case K_EV_CALL_MPTY_START:
-        case K_EV_CALL_MPTY_STOP:
+        case VerboseTraits::VerboseTraits::K_EV_CALL_MPTY_START:
+        case VerboseTraits::VerboseTraits::K_EV_CALL_MPTY_STOP:
 #endif
             break;
 
 #if K3L_AT_LEAST(1,6,0)
-        case K_EV_RECV_FROM_MODEM:
-        case K_EV_SMS_INFO:
-        case K_EV_SMS_DATA:
+        case VerboseTraits::VerboseTraits::K_EV_RECV_FROM_MODEM:
+        case VerboseTraits::VerboseTraits::K_EV_SMS_INFO:
+        case VerboseTraits::VerboseTraits::K_EV_SMS_DATA:
+#endif
             extra  = "data='";
             extra += (ev->Params ? (const char *)(ev->Params) : "<empty>");
             extra += "'";
 
             return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
-#endif
 
 #if K3L_AT_LEAST(1,6,0)
-        case K_EV_SMS_SEND_RESULT:
+        case VerboseTraits::VerboseTraits::K_EV_SMS_SEND_RESULT:
             extra  = "result='";
 #if K3L_AT_LEAST(2,0,0)
             extra += gsmSmsCause((KGsmSmsCause)ev->AddInfo);
@@ -2814,20 +2609,20 @@ std::string Verbose::event(KSignaling sig, int32 obj_idx, K3L_EVENT *ev, Verbose
             return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
 
 #if K3L_HAS_MPTY_SUPPORT
-        case K_EV_GSM_COMMAND_STATUS:
+        case VerboseTraits::VerboseTraits::K_EV_GSM_COMMAND_STATUS:
             extra  = "result='";
             extra += gsmMobileCause((KGsmMobileCause)ev->AddInfo);
             extra += "'";
             return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
 #endif
 
-        case K_EV_CALL_ANSWER_INFO:
+        case VerboseTraits::VerboseTraits::K_EV_CALL_ANSWER_INFO:
             extra  = "info='";
             extra += callStartInfo((KCallStartInfo)ev->AddInfo);
             extra += "'";
             return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
 
-        case K_EV_NEW_SMS:
+        case VerboseTraits::VerboseTraits::K_EV_NEW_SMS:
             if (ev->AddInfo != 0)
             {
                 extra  = "messages='";
@@ -2840,7 +2635,7 @@ std::string Verbose::event(KSignaling sig, int32 obj_idx, K3L_EVENT *ev, Verbose
                 return show(buf, eventName(code), Target(CHANNEL, dev, obj));
             }
 
-        case K_EV_ISDN_PROGRESS_INDICATOR:
+        case VerboseTraits::VerboseTraits::K_EV_ISDN_PROGRESS_INDICATOR:
             if (ev->AddInfo != 0)
             {
                 extra  = "indication='";
@@ -2854,19 +2649,19 @@ std::string Verbose::event(KSignaling sig, int32 obj_idx, K3L_EVENT *ev, Verbose
             }
 #endif
 
-        case K_EV_CAS_LINE_STT_CHANGED:
+        case VerboseTraits::VerboseTraits::K_EV_CAS_LINE_STT_CHANGED:
             extra = STG(FMT("[a=%d,b=%d,c=%d,d=%d]")
                 % ((ev->AddInfo & 0x8) >> 3) % ((ev->AddInfo & 0x4) >> 2)
                 % ((ev->AddInfo & 0x2) >> 1) %  (ev->AddInfo & 0x1));
 
             return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
 
-        case K_EV_CAS_MFC_RECV:
+        case VerboseTraits::VerboseTraits::K_EV_CAS_MFC_RECV:
             extra = STG(FMT("digit='%d'") % ev->AddInfo);
 
             return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
 
-        case K_EV_CALL_FAIL:
+        case VerboseTraits::VerboseTraits::K_EV_CALL_FAIL:
             extra  = "cause='";
 #if K3L_AT_LEAST(2,0,0)
             extra += callFail(sig, r2_country, ev->AddInfo);
@@ -2887,7 +2682,7 @@ std::string Verbose::event(KSignaling sig, int32 obj_idx, K3L_EVENT *ev, Verbose
 
             return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
 
-        case K_EV_DISCONNECT:
+        case VerboseTraits::VerboseTraits::K_EV_DISCONNECT:
             switch (sig)
             {
 #if K3L_AT_LEAST(1,5,1)
@@ -2921,16 +2716,16 @@ std::string Verbose::event(KSignaling sig, int32 obj_idx, K3L_EVENT *ev, Verbose
             break;
 
 #if K3L_AT_LEAST(1,6,0)
-        case K_EV_SIP_DTMF_DETECTED:
+        case VerboseTraits::VerboseTraits::K_EV_SIP_DTMF_DETECTED:
 #endif
-        case K_EV_DTMF_DETECTED:
-        case K_EV_PULSE_DETECTED:
-        case K_EV_DIALED_DIGIT:
+        case VerboseTraits::VerboseTraits::K_EV_DTMF_DETECTED:
+        case VerboseTraits::VerboseTraits::K_EV_PULSE_DETECTED:
+        case VerboseTraits::VerboseTraits::K_EV_DIALED_DIGIT:
             extra = STG(FMT("digit='%c'") % (char)ev->AddInfo);
 
             return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
 
-        case K_EV_SEIZURE:
+        case VerboseTraits::VerboseTraits::K_EV_SEIZURE:
         {
             KIncomingSeizeParams *n = (KIncomingSeizeParams *)
                 ( ((char*)ev) + sizeof(K3L_EVENT) );
@@ -2945,7 +2740,7 @@ std::string Verbose::event(KSignaling sig, int32 obj_idx, K3L_EVENT *ev, Verbose
         }
 
 #if K3L_AT_LEAST(1,4,0)
-        case K_EV_VOIP_SEIZURE:
+        case VerboseTraits::VerboseTraits::K_EV_VOIP_SEIZURE:
         {
             char *numB = ((char*)ev) + sizeof(K3L_EVENT);
             char *numA = numB + 61;
@@ -2961,43 +2756,43 @@ std::string Verbose::event(KSignaling sig, int32 obj_idx, K3L_EVENT *ev, Verbose
 #endif
 
 
-        case K_EV_END_OF_STREAM:
+        case VerboseTraits::VerboseTraits::K_EV_END_OF_STREAM:
             return show(buf, eventName(code), Target(PLAYER, dev, obj));
 
-        case K_EV_AUDIO_STATUS:
+        case VerboseTraits::VerboseTraits::K_EV_AUDIO_STATUS:
             extra  = "tone='";
             extra += mixerTone((KMixerTone)ev->AddInfo);
             extra += "'";
 
             return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
 
-        case K_EV_CADENCE_RECOGNIZED:
+        case VerboseTraits::VerboseTraits::K_EV_CADENCE_RECOGNIZED:
             extra = STG(FMT("cadence='%c'") % (char)(ev->AddInfo));
 
             return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
 
-        case K_EV_CHANNEL_FAIL:
+        case VerboseTraits::VerboseTraits::K_EV_CHANNEL_FAIL:
             extra  = "reason='";
             extra += channelFail(sig, ev->AddInfo);
             extra += "'";
 
             return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
 
-        case K_EV_SEIZE_FAIL:
+        case VerboseTraits::VerboseTraits::K_EV_SEIZE_FAIL:
             extra  = "reason='";
             extra += seizeFail((KSeizeFail) ev->AddInfo);
             extra += "'";
 
             return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
 
-        case K_EV_INTERNAL_FAIL:
+        case VerboseTraits::VerboseTraits::K_EV_INTERNAL_FAIL:
             extra  = "reason='";
             extra += internalFail((KInternalFail) ev->AddInfo);
             extra += "'";
 
             return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
 
-        case K_EV_HARDWARE_FAIL:
+        case VerboseTraits::VerboseTraits::K_EV_HARDWARE_FAIL:
             extra  = "component='";
             extra += systemObject((KSystemObject) ev->AddInfo);
             extra += "'";
@@ -3018,18 +2813,18 @@ std::string Verbose::event(KSignaling sig, int32 obj_idx, K3L_EVENT *ev, Verbose
             }
 
 
-        case K_EV_LINK_STATUS:
+        case VerboseTraits::VerboseTraits::K_EV_LINK_STATUS:
             // EV_LINK_STATUS has always zero in ObjectInfo (and AddInfo!)
             /* fall throught... */
 
 #if K3L_AT_LEAST(1,6,0)
-        case K_EV_PHYSICAL_LINK_UP:
-        case K_EV_PHYSICAL_LINK_DOWN:
+        case VerboseTraits::VerboseTraits::K_EV_PHYSICAL_LINK_UP:
+        case VerboseTraits::VerboseTraits::K_EV_PHYSICAL_LINK_DOWN:
             return show(buf, eventName(code), Target(LINK, dev, obj));
 #endif
 
 #if K3L_AT_LEAST(1,5,1)
-        case K_EV_USER_INFORMATION:
+        case VerboseTraits::VerboseTraits::K_EV_USER_INFORMATION:
         {
             KUserInformation *info = (KUserInformation *)(ev->Params);
 
@@ -3044,7 +2839,7 @@ std::string Verbose::event(KSignaling sig, int32 obj_idx, K3L_EVENT *ev, Verbose
 #endif
 
 #if K3L_AT_LEAST(1,6,0)
-        case K_EV_SIP_REGISTER_INFO:
+        case VerboseTraits::VerboseTraits::K_EV_SIP_REGISTER_INFO:
             extra  = "params='";
             extra += (ev->Params ? (const char *) (ev->Params) : "<unknown>");
             extra += "',status='";
@@ -3055,28 +2850,28 @@ std::string Verbose::event(KSignaling sig, int32 obj_idx, K3L_EVENT *ev, Verbose
 #endif
 
 #if !K3L_AT_LEAST(2,0,0)
-        case K_EV_PONG:
+        case VerboseTraits::VerboseTraits::K_EV_PONG:
 #endif
 
 #if K3L_AT_LEAST(1,4,0)
-        case K_EV_CLIENT_RECONNECT:
+        case VerboseTraits::VerboseTraits::K_EV_CLIENT_RECONNECT:
 #endif
             return show(buf, eventName(code), Target(NONE));
 
 #if K3L_AT_LEAST(2,1,0)
-        case K_EV_FAX_CHANNEL_FREE:
+        case VerboseTraits::VerboseTraits::K_EV_FAX_CHANNEL_FREE:
             extra  = "status='";
             extra += faxResult((KFaxResult)ev->AddInfo);
             extra += "'";
             return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
 
-        case K_EV_FAX_FILE_SENT:
+        case VerboseTraits::VerboseTraits::K_EV_FAX_FILE_SENT:
             extra  = "filename='";
             extra += (ev->Params ? (const char *) (ev->Params) : "<unknown>");
             extra += "'";
             return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
 
-        case K_EV_FAX_FILE_FAIL:
+        case VerboseTraits::VerboseTraits::K_EV_FAX_FILE_FAIL:
             extra  = "cause='";
             extra += faxFileErrorCause((KFaxFileErrorCause)ev->AddInfo);
             extra += "',filename='";
@@ -3084,22 +2879,29 @@ std::string Verbose::event(KSignaling sig, int32 obj_idx, K3L_EVENT *ev, Verbose
             extra += "'";
             return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
 
-        case K_EV_FAX_REMOTE_INFO:
+        case VerboseTraits::VerboseTraits::K_EV_FAX_REMOTE_INFO:
             extra = ((ev->Params && ev->ParamSize != 0) ? (const char *) ev->Params : "");
             return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
 
-        /*case K_EV_FAX_MESSAGE_CONFIRMATION:*/
-        case K_EV_FAX_PAGE_CONFIRMATION:
-        case K_EV_FAX_TX_TIMEOUT:
+        case VerboseTraits::VerboseTraits::K_EV_FAX_PAGE_CONFIRMATION:
+        case VerboseTraits::VerboseTraits::K_EV_FAX_TX_TIMEOUT:
             return show(buf, eventName(code), Target(CHANNEL, dev, obj));
 #endif
 
 #if K3L_AT_LEAST(2,1,0)
-        case K_EV_WATCHDOG_COUNT:
+        case VerboseTraits::VerboseTraits::K_EV_WATCHDOG_COUNT:
             extra = STG(FMT("count='%d'") % (char)ev->AddInfo);
             return show(buf , eventName(code), Target(NONE), extra);
 #endif
 
+#if K3L_AT_LEAST(2,1,0)
+        case VerboseTraits::VerboseTraits::K_EV_CT_TRANSFER_FAIL:
+            extra  = "cause='";
+            extra += isdnCause((KQ931Cause)ev->AddInfo);
+            extra += "'";
+
+            return show(buf, eventName(code), Target(CHANNEL, dev, obj), extra);
+#endif
     }
 
     // default handler...
@@ -3117,7 +2919,7 @@ std::string Verbose::event(KSignaling sig, int32 obj_idx, K3L_EVENT *ev, Verbose
 
 /********************************************/
 
-std::string Verbose::show(std::string & buf, std::string name, Target tgt, std::string & extra)
+std::string Verbose::show(std::string & buf, const std::string & name, const Target tgt, const std::string & extra)
 {
     if (tgt.type == NONE)
     {
@@ -3134,7 +2936,7 @@ std::string Verbose::show(std::string & buf, std::string name, Target tgt, std::
     return buf;
 }
 
-std::string Verbose::show(std::string & buf, std::string name, Target tgt)
+std::string Verbose::show(std::string & buf, const std::string & name, const Target tgt)
 {
     std::string tmp("");
 
@@ -3142,7 +2944,7 @@ std::string Verbose::show(std::string & buf, std::string name, Target tgt)
     return buf;
 }
 
-void Verbose::generate(std::string &buf, std::string &name, Target tgt, std::string &extra)
+void Verbose::generate(std::string & buf, const std::string & name, const Target tgt, const std::string & extra)
 {
     switch (tgt.type)
     {
diff --git a/src/mod/endpoints/mod_khomp/commons/base/verbose.hpp b/src/mod/endpoints/mod_khomp/commons/base/verbose.hpp
new file mode 100644
index 0000000000..a0ea290b7e
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/base/verbose.hpp
@@ -0,0 +1,303 @@
+/*
+    KHOMP generic endpoint/channel library.
+    Copyright (C) 2007-2009 Khomp Ind. & Com.
+
+  The contents of this file are subject to the Mozilla Public License Version 1.1
+  (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.mozilla.org/MPL/
+
+  Software distributed under the License is distributed on an "AS IS" basis,
+  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+  the specific language governing rights and limitations under the License.
+
+  Alternatively, the contents of this file may be used under the terms of the
+  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
+  case the provisions of "LGPL License" are applicable instead of those above.
+
+  If you wish to allow use of your version of this file only under the terms of
+  the LGPL License and not to allow others to use your version of this file under
+  the MPL, indicate your decision by deleting the provisions above and replace them
+  with the notice and other provisions required by the LGPL License. If you do not
+  delete the provisions above, a recipient may use your version of this file under
+  either the MPL or the LGPL License.
+
+  The LGPL header follows below:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this library; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#ifndef _VERBOSE_HPP_
+#define _VERBOSE_HPP_
+
+#include <string>
+#include <sstream>
+#include <map>
+
+#include <k3l.h>
+
+// k3lApiMajorVersion
+#ifndef CM_PING
+# include <k3lVersion.h>
+# include <KTools.h>
+#endif
+
+#include <types.hpp>
+#include <k3lapi.hpp>
+#include <format.hpp>
+
+#include <verbose_traits.hpp>
+
+struct Verbose
+{
+    typedef enum
+    {
+        R2_COUNTRY_BRA = 1,
+        R2_COUNTRY_ARG = 2,
+        R2_COUNTRY_CHI = 3,
+        R2_COUNTRY_MEX = 4,
+        R2_COUNTRY_URY = 5,
+        R2_COUNTRY_VEN = 6
+    }
+    R2CountryType;
+
+    typedef enum
+    {
+        HUMAN,
+        EXACT
+    }
+    Presentation;
+
+    /* dynamic (object) stuff */
+
+    Verbose(const K3LAPI & api)
+    : _api(api) {};
+
+#if K3L_AT_LEAST(2,0,0)
+    std::string event(const int32, const K3L_EVENT * const,
+                      const R2CountryType r2_country = R2_COUNTRY_BRA,
+                      const Presentation fmt = HUMAN) const;
+#else
+    std::string event(const int32, const K3L_EVENT * const,
+                      const Presentation fmt = HUMAN) const;
+#endif
+
+    std::string channelStatus(const int32, const int32, const int32,
+                              const Presentation fmt = HUMAN) const;
+
+    /* end of dynamic (object) stuff */
+
+ protected:
+    const K3LAPI & _api;
+
+    /* used internally */
+    struct internal_not_found {};
+
+ public:
+
+    /* static (class) stuff */
+
+    static std::string echoLocation(const KEchoLocation, const Presentation fmt = HUMAN);
+    static std::string echoCancellerConfig(const KEchoCancellerConfig, const Presentation fmt = HUMAN);
+
+#if K3L_AT_LEAST(2,0,0)
+    static std::string event(const KSignaling, const int32, const K3L_EVENT * const,
+                             const R2CountryType = R2_COUNTRY_BRA, Presentation fmt = HUMAN);
+#else
+    static std::string event(const KSignaling, const int32, const K3L_EVENT * const,
+                             const Presentation fmt = HUMAN);
+#endif
+
+#if K3L_AT_LEAST(2,0,0)
+    static std::string command(const int32, const K3L_COMMAND * const,
+                               const R2CountryType = R2_COUNTRY_BRA,
+                               const Presentation fmt = HUMAN);
+
+    static std::string command(const int32, const int32, const int32, const char * const,
+                               const R2CountryType = R2_COUNTRY_BRA,
+                               const Presentation fmt = HUMAN);
+#else
+    static std::string command(const int32, const K3L_COMMAND * const,
+                               const Presentation fmt = HUMAN);
+
+    static std::string command(const int32, const int32, const int32, const char * const,
+                               const Presentation fmt = HUMAN);
+#endif
+
+    static std::string deviceName(const KDeviceType, const int32, const int32 count = 0, const Presentation fmt = HUMAN);
+    static std::string deviceName(const KDeviceType, const int32, const Presentation fmt);
+
+    static std::string deviceType(const KDeviceType, const int32 count = 0, const Presentation fmt = HUMAN);
+    static std::string deviceType(const KDeviceType, const Presentation fmt);
+
+    static std::string deviceModel(const KDeviceType, const int32, const int32 count = 0, const Presentation fmt = HUMAN);
+    static std::string deviceModel(const KDeviceType, const int32, const Presentation fmt);
+
+    static std::string channelFeatures(const int32, const Presentation fmt = HUMAN);
+    static std::string signaling(const KSignaling, const Presentation fmt = HUMAN);
+    static std::string systemObject(const KSystemObject, const Presentation fmt = HUMAN);
+    static std::string mixerTone(const KMixerTone, const Presentation fmt = HUMAN);
+    static std::string mixerSource(const KMixerSource, const Presentation fmt = HUMAN);
+
+    static std::string seizeFail(const KSeizeFail, const Presentation fmt = HUMAN);
+
+#if K3L_AT_LEAST(2,0,0)
+    static std::string callFail(const KSignaling, const R2CountryType, const int32, const Presentation fmt = HUMAN);
+#else
+    static std::string callFail(const KSignaling, const int32, const Presentation fmt = HUMAN);
+#endif
+
+    static std::string channelFail(const KSignaling, const int32, const Presentation fmt = HUMAN);
+    static std::string internalFail(const KInternalFail, const Presentation fmt = HUMAN);
+
+    static std::string linkErrorCounter(const KLinkErrorCounter, const Presentation fmt = HUMAN);
+
+    static std::string linkStatus(const KSignaling, const int32, const Presentation fmt = HUMAN, const bool simpleStatus = false);
+    static std::string channelStatus(const KSignaling, const int32, const Presentation fmt = HUMAN);
+    static std::string callStatus(const KCallStatus, const Presentation fmt = HUMAN);
+    static std::string status(const KLibraryStatus, const Presentation fmt = HUMAN);
+
+#if K3L_AT_LEAST(2,0,0)
+    static std::string signGroupB(const KSignGroupB, const R2CountryType contry = R2_COUNTRY_BRA,
+        Presentation fmt = HUMAN);
+#else
+    static std::string signGroupB(const KSignGroupB, const Presentation fmt = HUMAN);
+#endif
+
+#if K3L_AT_LEAST(2,0,0)
+    static std::string signGroupII(const KSignGroupII, const R2CountryType contry = R2_COUNTRY_BRA,
+        Presentation fmt = HUMAN);
+#else
+    static std::string signGroupII(const KSignGroupII, const Presentation fmt = HUMAN);
+#endif
+
+    static std::string h100configIndex(const KH100ConfigIndex, const Presentation fmt = HUMAN);
+
+    static std::string eventName(const int32 value)
+    {
+        return VerboseTraits::eventName((VerboseTraits::Event)value);
+    };
+
+    static std::string commandName(const int32 value)
+    {
+        return VerboseTraits::commandName((VerboseTraits::Command)value);
+    };
+
+#if K3L_AT_LEAST(1,5,0)
+    static std::string sipFailures(const KSIP_Failures, const Presentation fmt = HUMAN);
+#endif
+
+#if K3L_AT_LEAST(1,5,1)
+    static std::string isdnCause(const KQ931Cause, const Presentation fmt = HUMAN);
+#endif
+
+#if K3L_AT_LEAST(1,5,2)
+    static std::string isdnDebug(const int32, const Presentation fmt = HUMAN);
+#endif
+
+#if K3L_AT_LEAST(1,6,0)
+    static std::string callStartInfo(const KCallStartInfo, const Presentation fmt = HUMAN);
+
+    static std::string gsmCallCause(const KGsmCallCause, const Presentation fmt = HUMAN);
+    static std::string gsmMobileCause(const KGsmMobileCause, const Presentation fmt = HUMAN);
+    static std::string gsmSmsCause(const KGsmSmsCause, const Presentation fmt = HUMAN);
+
+    static std::string q931ProgressIndication(const KQ931ProgressIndication,
+        Presentation fmt = HUMAN);
+#endif
+
+#if K3L_AT_LEAST(2,1,0)
+    static std::string faxResult(const KFaxResult code, const Presentation fmt = HUMAN);
+    static std::string faxFileErrorCause(const KFaxFileErrorCause code, const Presentation fmt = HUMAN);
+#endif
+
+    /* end of static (class) stuff */
+
+ private:
+    static std::string internal_deviceType(const KDeviceType, const int32);
+    static std::string internal_deviceModel(const KDeviceType, const int32, const int32);
+
+#if K3L_AT_LEAST(1,5,0)
+    static std::string internal_sipFailures(const KSIP_Failures, const Presentation fmt = HUMAN);
+#endif
+#if K3L_AT_LEAST(1,5,1)
+    static std::string internal_isdnCause(const KQ931Cause, const Presentation fmt = HUMAN);
+#endif
+
+#if K3L_AT_LEAST(2,0,0)
+    static std::string internal_signGroupB(const KSignGroupB, const R2CountryType contry, const Presentation fmt = HUMAN);
+    static std::string internal_signGroupII(const KSignGroupII, const R2CountryType contry, const Presentation fmt = HUMAN);
+#else
+    static std::string internal_signGroupB(const KSignGroupB, const Presentation fmt = HUMAN);
+    static std::string internal_signGroupII(const KSignGroupII, const Presentation fmt = HUMAN);
+#endif
+
+#if K3L_AT_LEAST(1,6,0)
+    static std::string internal_gsmCallCause(const KGsmCallCause, const Presentation fmt = HUMAN);
+    static std::string internal_gsmMobileCause(const KGsmMobileCause, const Presentation fmt = HUMAN);
+    static std::string internal_gsmSmsCause(const KGsmSmsCause, const Presentation fmt = HUMAN);
+
+    static std::string internal_q931ProgressIndication(const KQ931ProgressIndication, const Presentation fmt = HUMAN);
+#endif
+
+ private:
+    enum Type
+    {
+        DEVICE,
+        CHANNEL,
+        PLAYER,
+        MIXER,
+        LINK,
+        NONE
+    };
+
+    struct Target
+    {
+        Target(Type _type)
+        : type(_type), device(-1), object(-1)
+        {};
+
+        Target(Type _type, int32 _device)
+        : type(_type), device(_device), object(-1)
+        {};
+
+        Target(Type _type, int32 _device, int32 _object)
+        : type(_type), device(_device), object(_object)
+        {};
+
+        const Type    type;
+        const int32 device;
+        const int32 object;
+    };
+
+    static void generate(std::string &, const std::string &, const Target, const std::string &);
+
+    static std::string show(std::string &, const std::string &, const Target, const std::string &);
+    static std::string show(std::string &, const std::string &, const Target);
+
+    template < typename ReturnType >
+    static ReturnType presentation(const Presentation fmt, ReturnType str_exact, ReturnType str_human)
+    {
+        switch (fmt)
+        {
+            case HUMAN: return str_human;
+            case EXACT: return str_exact;
+        };
+
+        return str_exact;
+    }
+};
+
+#endif /* _VERBOSE_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/config_options.cpp b/src/mod/endpoints/mod_khomp/commons/config_options.cpp
deleted file mode 100644
index 5383855f65..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/config_options.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (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.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this library; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <config_options.hpp>
-
-ConfigOption::ConfigOption(std::string name, const ConfigOption::StringType & value, const ConfigOption::StringType defvalue, string_allowed_type allowed, bool list_me)
-: _my_name(name), _value_data(new StringData(const_cast<StringType &>(value), defvalue, allowed), true),
-  _list_me(list_me), _values(NULL), _loaded(false)
-{};
-
-ConfigOption::ConfigOption(std::string name, const ConfigOption::StringType & value, const ConfigOption::StringType defvalue, bool list_me)
-: _my_name(name), _value_data(new StringData(const_cast<StringType &>(value), defvalue, string_allowed_type()), true),
-  _list_me(list_me), _values(NULL), _loaded(false)
-{};
-
-ConfigOption::ConfigOption(std::string name, const ConfigOption::SignedIntType & value, const ConfigOption::SignedIntType defvalue,
-                             ConfigOption::SignedIntType min, ConfigOption::SignedIntType max, ConfigOption::SignedIntType step, bool list_me)
-: _my_name(name), _value_data(new SignedIntData(const_cast<SignedIntType &>(value), defvalue, Range<SignedIntType>(min, max, step)), true),
-  _list_me(list_me), _values(NULL), _loaded(false)
-{};
-
-ConfigOption::ConfigOption(std::string name, const ConfigOption::UnsignedIntType & value, const ConfigOption::UnsignedIntType defvalue,
-                             ConfigOption::UnsignedIntType min, ConfigOption::UnsignedIntType max, ConfigOption::UnsignedIntType step, bool list_me)
-: _my_name(name), _value_data(new UnsignedIntData(const_cast<UnsignedIntType &>(value), defvalue, Range<UnsignedIntType>(min, max, step)), true),
-  _list_me(list_me), _values(NULL), _loaded(false)
-{};
-
-ConfigOption::ConfigOption(std::string name, const ConfigOption::BooleanType & value, const ConfigOption::BooleanType defvalue, bool list_me)
-: _my_name(name), _value_data(new BooleanData(const_cast<BooleanType &>(value), defvalue), true),
-  _list_me(list_me), _values(NULL), _loaded(false)
-{};
-
-ConfigOption::ConfigOption(std::string name, ConfigOption::FunctionType fun, std::string defvalue, string_allowed_type allowed, bool list_me)
-: _my_name(name), _value_data(new FunctionData(fun, defvalue, allowed), true),
-  _list_me(list_me), _values(NULL), _loaded(false)
-{};
-
-ConfigOption::ConfigOption(std::string name, ConfigOption::FunctionType fun, std::string defvalue, bool list_me)
-: _my_name(name), _value_data(new FunctionData(fun, defvalue, string_allowed_type()), true),
-  _list_me(list_me), _values(NULL), _loaded(false)
-{};
-
-ConfigOption::ConfigOption(const ConfigOption & o)
-: _my_name(o._my_name), _value_data(o._value_data),
-  _list_me(o._list_me), _values(o._values), _loaded(o._loaded)
-{};
-
-ConfigOption::~ConfigOption(void)
-{
-    if (_values)
-    {
-        for (unsigned int i = 0; _values[i] != NULL; i++)
-            delete _values[i];
-
-        delete[] _values;
-        _values = NULL;
-    }
-};
-
-void ConfigOption::set(ConfigOption::StringType value)
-{
-    switch (_value_data.which())
-    {
-        case ID_STRING:
-        {
-            try
-            {
-                StringData & tmp = _value_data.get<StringData>();
-
-                if (tmp.string_allowed.empty())
-                {
-                    tmp.string_val = value;
-                    _loaded = true;
-                }
-                else
-                {
-                    if (tmp.string_allowed.find(value) != tmp.string_allowed.end())
-                    {
-                        tmp.string_val = value;
-                        _loaded = true;
-                        return;
-                    }
-
-                    std::string allowed_string;
-
-                    for (string_allowed_type::iterator i = tmp.string_allowed.begin(); i != tmp.string_allowed.end(); i++)
-                    {
-                        allowed_string += " '";
-                        allowed_string += (*i);
-                        allowed_string += "'";
-                    }
-
-                    throw ConfigProcessFailure(STG(FMT("value '%s' not allowed for option '%s' (allowed values:%s)")
-                        % value % _my_name % allowed_string));
-                }
-                break;
-            }
-            catch(ValueType::InvalidType & e)
-            {
-                throw;
-            }
-        }
-
-        case ID_FUN:
-        {
-            try
-            {
-                FunctionData & tmp = _value_data.get<FunctionData>();
-                tmp.fun_val(value);
-                _loaded = true;
-                break;
-            }
-            catch(ValueType::InvalidType & e)
-            {
-                throw;
-            }
-
-        }
-
-        default:
-        {
-            throw ConfigProcessFailure(STG(FMT("option '%s' is not of type string, nor function defined") % _my_name));
-        }
-    }
-}
-
-void ConfigOption::set(ConfigOption::SignedIntType value)
-{
-    try
-    {
-        SignedIntData & tmp = _value_data.get<SignedIntData>();
-
-        if (value < tmp.sint_Range.minimum)
-            throw ConfigProcessFailure(STG(FMT("value '%d' out-of-Range for option '%s' (too low)") % value % _my_name));
-
-        if (value > tmp.sint_Range.maximum)
-            throw ConfigProcessFailure(STG(FMT("value '%d' out-of-Range for option '%s' (too high)") % value % _my_name));
-
-        if (((value - tmp.sint_Range.minimum) % tmp.sint_Range.step) != 0)
-            throw ConfigProcessFailure(STG(FMT("value '%d' out-of-Range for option '%s' (outside allowed step)") % value % _my_name));
-
-        tmp.sint_val = value;
-        _loaded = true;
-    }
-    catch(ValueType::InvalidType & e)
-    {
-        throw;
-    }
-}
-
-void ConfigOption::set(ConfigOption::UnsignedIntType value)
-{
-    try
-    {
-        UnsignedIntData & tmp = _value_data.get<UnsignedIntData>();
-
-        if (value < tmp.uint_Range.minimum)
-            throw ConfigProcessFailure(STG(FMT("value '%d' out-of-Range for option '%s' (too low)") % value % _my_name));
-
-        if (value > tmp.uint_Range.maximum)
-            throw ConfigProcessFailure(STG(FMT("value '%d' out-of-Range for option '%s' (too high)") % value % _my_name));
-
-        if (((value - tmp.uint_Range.minimum) % tmp.uint_Range.step) != 0)
-            throw ConfigProcessFailure(STG(FMT("value '%d' out-of-Range for option '%s' (outside allowed step)") % value % _my_name));
-
-        tmp.uint_val = value;
-        _loaded = true;
-    }
-    catch(ValueType::InvalidType & e)
-    {
-        throw;
-    }
-}
-
-void ConfigOption::set(ConfigOption::BooleanType value)
-{
-    try
-    {
-        BooleanData & tmp = _value_data.get<BooleanData>();
-        tmp.bool_val = value;
-        _loaded = true;
-    }
-    catch(ValueType::InvalidType & e)
-    {
-        throw;
-    }
-}
-
-std::string & ConfigOption::name(void) { return _my_name; };
-
-ConfigOption::value_id_type ConfigOption::type(void)
-{
-    return (value_id_type) _value_data.which();
-};
-
-const char ** ConfigOption::values(void)
-{
-    if (_values != NULL)
-        return _values;
-
-    switch ((value_id_type) _value_data.which())
-    {
-        case ConfigOption::ID_BOOL:
-        {
-            _values = new const char*[3];
-
-            _values[0] = strdup("yes");
-            _values[1] = strdup("no");
-            _values[2] = NULL;
-
-            return _values;
-        }
-
-        case ConfigOption::ID_SINT:
-        {
-            try
-            {
-                SignedIntData & tmp = _value_data.get<SignedIntData>();
-
-
-                unsigned int count = ((tmp.sint_Range.maximum - tmp.sint_Range.minimum) / tmp.sint_Range.step) + 1;
-                unsigned int index = 0;
-
-                _values = new const char*[count + 1];
-
-                for (SignedIntType i = tmp.sint_Range.minimum; i <= tmp.sint_Range.maximum; i += tmp.sint_Range.step, index++)
-                    _values[index] = strdup(STG(FMT("%d") % i).c_str());
-
-                _values[index] = NULL;
-
-                return _values;
-            }
-            catch(ValueType::InvalidType & e)
-            {
-                throw;
-            }
-        }
-
-        case ConfigOption::ID_UINT:
-        {
-            try
-            {
-                UnsignedIntData & tmp = _value_data.get<UnsignedIntData>();
-
-                unsigned int count = ((tmp.uint_Range.maximum - tmp.uint_Range.minimum) / tmp.uint_Range.step) + 1;
-                unsigned int index = 0;
-
-                _values = new const char*[count + 1];
-
-                for (UnsignedIntType i = tmp.uint_Range.minimum; i <= tmp.uint_Range.maximum; i += tmp.uint_Range.step, index++)
-                    _values[index] = strdup(STG(FMT("%d") % i).c_str());
-
-                _values[index] = NULL;
-
-                return _values;
-            }
-            catch(ValueType::InvalidType & e)
-            {
-                throw;
-            }
-        }
-
-        case ConfigOption::ID_STRING:
-        {
-            try
-            {
-                StringData & tmp = _value_data.get<StringData>();
-
-                _values = new const char*[ tmp.string_allowed.size() + 1 ];
-
-                unsigned int index = 0;
-
-                for (string_allowed_type::iterator i = tmp.string_allowed.begin(); i != tmp.string_allowed.end(); i++, index++)
-                    _values[index] = strdup((*i).c_str());
-
-                _values[index] = NULL;
-
-                return _values;
-            }
-            catch(ValueType::InvalidType & e)
-            {
-                throw;
-            }
-        }
-
-        case ConfigOption::ID_FUN:
-        {
-            try
-            {
-                FunctionData & tmp = _value_data.get<FunctionData>();
-
-                _values = new const char*[ tmp.fun_allowed.size() + 1 ];
-
-                unsigned int index = 0;
-
-                for (string_allowed_type::iterator i = tmp.fun_allowed.begin(); i != tmp.fun_allowed.end(); i++, index++)
-                    _values[index] = strdup((*i).c_str());
-
-                _values[index] = NULL;
-                return _values;
-            }
-            catch(ValueType::InvalidType & e)
-            {
-                throw;
-            }
-
-        }
-
-        default:
-            throw ConfigProcessFailure(STG(FMT("unknown type identifier '%d'") % _value_data.which()));
-    }
-};
-
-void ConfigOption::reset(void)
-{
-    _loaded = false;
-};
-
-void ConfigOption::commit(void)
-{
-    if (_loaded)
-        return;
-
-    switch ((value_id_type) _value_data.which())
-    {
-        case ConfigOption::ID_BOOL:
-        {
-            try
-            {
-                BooleanData & tmp = _value_data.get<BooleanData>();
-                tmp.bool_val = tmp.bool_default;
-            }
-            catch(ValueType::InvalidType & e)
-            {
-                throw;
-            }
-
-            break;
-        }
-
-        case ConfigOption::ID_SINT:
-        {
-            try
-            {
-                SignedIntData & tmp = _value_data.get<SignedIntData>();
-                tmp.sint_val = tmp.sint_default;
-            }
-            catch(ValueType::InvalidType & e)
-            {
-                throw;
-            }
-            break;
-        }
-
-        case ConfigOption::ID_UINT:
-        {
-            try
-            {
-                UnsignedIntData & tmp = _value_data.get<UnsignedIntData>();
-                tmp.uint_val = tmp.uint_default;
-            }
-            catch(ValueType::InvalidType & e)
-            {
-                throw;
-            }
-            break;
-        }
-
-        case ConfigOption::ID_STRING:
-        {
-            try
-            {
-                StringData & tmp = _value_data.get<StringData>();
-                tmp.string_val = tmp.string_default;
-            }
-            catch(ValueType::InvalidType & e)
-            {
-                throw;
-            }
-            break;
-        }
-
-        case ConfigOption::ID_FUN:
-        {
-            try
-            {
-                FunctionData & tmp = _value_data.get<FunctionData>();
-                tmp.fun_val(tmp.fun_default);
-            }
-            catch(ValueType::InvalidType & e)
-            {
-                throw;
-            }
-            break;
-        }
-
-        default:
-            throw ConfigProcessFailure(STG(FMT("unknown type identifier '%d'") % _value_data.which()));
-    }
-
-    _loaded = true;
-};
-
-void ConfigOption::copy_from(ConfigOption & src)
-{
-    if (src._value_data.which() != _value_data.which())
-        throw ConfigProcessFailure(STG(FMT("unable to copy options, source type differs from destination.")));
-
-    if (!src._loaded)
-        return;
-
-    switch ((value_id_type) _value_data.which())
-    {
-        case ConfigOption::ID_BOOL:
-        {
-            try
-            {
-                BooleanData & stmp = src._value_data.get<BooleanData>();
-                BooleanData & dtmp = _value_data.get<BooleanData>();
-                /* do not copy references, but values.. */
-                bool tmpval = stmp.bool_val;
-                dtmp.bool_val = tmpval;
-            }
-            catch(ValueType::InvalidType & e)
-            {
-                throw;
-            }
-
-            break;
-        }
-
-        case ConfigOption::ID_SINT:
-        {
-            try
-            {
-                SignedIntData & stmp = src._value_data.get<SignedIntData>();
-                SignedIntData & dtmp = _value_data.get<SignedIntData>();
-                /* do not copy references, but values.. */
-                int tmpval = stmp.sint_val;
-                dtmp.sint_val = tmpval;
-            }
-            catch(ValueType::InvalidType & e)
-            {
-                throw;
-            }
-
-            break;
-        }
-
-        case ConfigOption::ID_UINT:
-        {
-            try
-            {
-                UnsignedIntData & stmp = src._value_data.get<UnsignedIntData>();
-                UnsignedIntData & dtmp = _value_data.get<UnsignedIntData>();
-                /* do not copy references, but values.. */
-                unsigned int tmpval = stmp.uint_val;
-                dtmp.uint_val = tmpval;
-            }
-            catch(ValueType::InvalidType & e)
-            {
-                throw;
-            }
-
-
-            break;
-        }
-
-        case ConfigOption::ID_STRING:
-        {
-            try
-            {
-                StringData & stmp = src._value_data.get<StringData>();
-                StringData & dtmp = _value_data.get<StringData>();
-                /* do not copy references, but values.. */
-                std::string tmpval = stmp.string_val;
-                dtmp.string_val = tmpval;
-            }
-            catch(ValueType::InvalidType & e)
-            {
-                throw;
-            }
-
-            break;
-        }
-
-        case ConfigOption::ID_FUN:
-        {
-            /* TO IMPLEMENT (NEEDS ANOTHER METHOD ON FUNCTION FOR GETTING VALUE) */
-
-//            FunctionData & tmp = boost::get<FunctionData>(_value_data);
-//
-//            if (!tmp.loaded)
-//            {
-//                tmp.fun_val(tmp.fun_default);
-//                tmp.loaded = true;
-//            }
-            break;
-        }
-
-        default:
-            throw ConfigProcessFailure(STG(FMT("unknown type identifier '%d'") % _value_data.which()));
-    }
-
-    _loaded = true;
-};
-
-/*********************************/
-
-bool ConfigOptions::add(ConfigOption option)
-{
-    //option_map_type::iterator iter2 = _map.begin();
-
-    //boost::tie(iter2, ok2)
-    std::pair<option_map_type::iterator, bool> ret = _map.insert(option_pair_type(option.name(), option));
-
-    return ret.second;
-}
-
-bool ConfigOptions::synonym(std::string equiv_opt, std::string main_opt)
-{
-    //syn_option_map_type::iterator iter = _syn_map.begin();
-
-    //boost::tie(iter, ok)
-    std::pair<syn_option_map_type::iterator, bool> ret = _syn_map.insert(syn_option_pair_type(equiv_opt, main_opt));
-
-    return ret.second;
-}
-
-ConfigOptions::string_set ConfigOptions::options(void)
-{
-    string_set res;
-
-    for (option_map_type::iterator i = _map.begin(); i != _map.end(); i++)
-        res.insert((*i).first);
-
-    return res;
-}
-
-void ConfigOptions::process(const char * name, const char * value)
-{
-    option_map_type::iterator iter = find_option(name);
-
-    if (iter == _map.end())
-        throw ConfigProcessFailure(STG(FMT("unknown option '%s'") % name));
-
-    try
-    {
-        switch ((*iter).second.type())
-        {
-            case ConfigOption::ID_SINT:
-                set<ConfigOption::SignedIntType>((*iter).first, Strings::toulong(value));
-                return;
-            case ConfigOption::ID_UINT:
-                set<ConfigOption::UnsignedIntType>((*iter).first, Strings::tolong(value));
-                return;
-            case ConfigOption::ID_BOOL:
-                set<ConfigOption::BooleanType>((*iter).first, Strings::toboolean(value));
-                return;
-            case ConfigOption::ID_STRING:
-            case ConfigOption::ID_FUN:
-                set<ConfigOption::StringType>((*iter).first, std::string(value));
-                return;
-            default:
-                throw ConfigProcessFailure(STG(FMT("unknown type identifier '%d'") % (*iter).second.type()));
-        }
-    }
-    catch (Strings::invalid_value & e)
-    {
-        throw ConfigProcessFailure(STG(FMT("invalid value '%s' for option '%s'") % value % name));
-    }
-}
-
-const char ** ConfigOptions::values(const char * name)
-{
-    option_map_type::iterator iter = find_option(name);
-
-    if (iter == _map.end())
-        throw ConfigProcessFailure(STG(FMT("unknown option '%s'") % name));
-
-    return (*iter).second.values();
-}
-
-const char ** ConfigOptions::values(void)
-{
-    if (_values != NULL)
-        return _values;
-
-    unsigned int count = 0;
-
-    for (option_map_type::iterator i = _map.begin(); i != _map.end(); i++)
-        if ((*i).second.list_me())
-            ++count;
-
-    _values = new const char*[ count + 1 ];
-
-    unsigned int index = 0;
-
-    for (option_map_type::iterator i = _map.begin(); i != _map.end(); i++)
-    {
-        if ((*i).second.list_me())
-        {
-            _values[index] = strdup((*i).first.c_str());
-            ++index;
-        }
-    }
-
-    _values[index] = NULL;
-
-    return _values;
-}
-
-void ConfigOptions::reset(void)
-{
-    for (option_map_type::iterator i = _map.begin(); i != _map.end(); i++)
-        (*i).second.reset();
-}
-
-ConfigOptions::messages_type ConfigOptions::commit(void)
-{
-    messages_type msgs;
-
-    for (option_map_type::iterator i = _map.begin(); i != _map.end(); i++)
-    {
-        try
-        {
-            (*i).second.commit();
-        }
-        catch (ConfigProcessFailure & e)
-        {
-            msgs.push_back(e.msg);
-        }
-    }
-
-    return msgs;
-}
-
-bool ConfigOptions::loaded(std::string name)
-{
-    option_map_type::iterator iter = find_option(name);
-
-    if (iter == _map.end())
-        return false;
-
-    return iter->second.loaded();
-}
-
-void ConfigOptions::copy_from(ConfigOptions & source, std::string name)
-{
-    option_map_type::iterator iter_src = source.find_option(name);
-    option_map_type::iterator iter_dst = find_option(name);
-
-    if (iter_src == source._map.end())
-        throw ConfigProcessFailure(STG(FMT("unknown option '%s' on source") % name));
-
-    if (iter_dst == _map.end())
-        throw ConfigProcessFailure(STG(FMT("unknown option '%s' on destination") % name));
-
-    iter_dst->second.copy_from(iter_src->second);
-}
-
-ConfigOptions::option_map_type::iterator ConfigOptions::find_option(std::string name)
-{
-    syn_option_map_type::iterator syn_iter = _syn_map.find(name);
-
-    if (syn_iter != _syn_map.end())
-        name = syn_iter->second;
-
-    option_map_type::iterator iter = _map.find(name);
-
-    return iter;
-}
diff --git a/src/mod/endpoints/mod_khomp/commons/config_options.hpp b/src/mod/endpoints/mod_khomp/commons/config_options.hpp
deleted file mode 100644
index 3cfe2e1c78..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/config_options.hpp
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (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.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this library; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <set>
-#include <map>
-#include <vector>
-
-#include <strings.hpp>
-
-#include <function.hpp>
-#include <variant.hpp>
-#include <format.hpp>
-
-#ifndef _CONFIG_OPTIONS_HPP_
-#define _CONFIG_OPTIONS_HPP_
-
-struct ConfigProcessFailure
-{
-    ConfigProcessFailure(std::string _msg): msg(_msg) {};
-    std::string msg;
-};
-
-struct ConfigOption
-{
-    typedef int          SignedIntType;
-    typedef unsigned int UnsignedIntType;
-    typedef bool         BooleanType;
-    typedef std::string  StringType;
-
-    typedef Function::Function1 < void, std::string > FunctionType;
-
-    typedef std::set < StringType >     string_allowed_type;
-
-    /* this should reflect 'variant.which()'! */
-    typedef enum
-    {
-        ID_SINT   = 0,
-        ID_UINT   = 1,
-        ID_BOOL   = 2,
-        ID_STRING = 3,
-        ID_FUN    = 4,
-    }
-    value_id_type;
-
-    template < typename number_type >
-    struct Range
-    {
-        Range(number_type _minimum, number_type _maximum, number_type _step)
-        : minimum(_minimum), maximum(_maximum), step(_step) {};
-
-        number_type minimum, maximum, step;
-    };
-
-    struct SignedIntData : public VariantBaseType < void >
-    {
-        SignedIntData(SignedIntType & _sint_val, SignedIntType _sint_default, Range< SignedIntType > _sint_Range)
-        : sint_val(_sint_val), sint_default(_sint_default), sint_Range(_sint_Range) {};
-
-        int which()
-        {
-            return ID_SINT;
-        }
-
-        SignedIntType        & sint_val;
-        SignedIntType          sint_default;
-        Range<SignedIntType>   sint_Range;
-    };
-
-    struct UnsignedIntData : public VariantBaseType < void >
-    {
-        UnsignedIntData(UnsignedIntType & _uint_val, UnsignedIntType _uint_default, Range< UnsignedIntType > _uint_Range)
-        : uint_val(_uint_val), uint_default(_uint_default), uint_Range(_uint_Range) {};
-
-        int which()
-        {
-            return ID_UINT;
-        }
-
-        UnsignedIntType        & uint_val;
-        UnsignedIntType          uint_default;
-        Range<UnsignedIntType>   uint_Range;
-    };
-
-    struct BooleanData : public VariantBaseType < void >
-    {
-        BooleanData(BooleanType & _bool_val, BooleanType _bool_default)
-        : bool_val(_bool_val), bool_default(_bool_default) {};
-
-        int which()
-        {
-            return ID_BOOL;
-        }
-
-        BooleanType      & bool_val;
-        BooleanType        bool_default;
-    };
-
-    struct StringData : public VariantBaseType < void >
-    {
-        StringData(std::string & _string_val, std::string _string_default, string_allowed_type _string_allowed)
-        : string_val(_string_val), string_default(_string_default), string_allowed(_string_allowed) {};
-
-        int which()
-        {
-            return ID_STRING;
-        }
-
-        std::string         & string_val;
-        std::string           string_default;
-        string_allowed_type   string_allowed;
-    };
-
-    struct FunctionData : public VariantBaseType < void >
-    {
-        FunctionData(FunctionType _fun_val, std::string _fun_default, string_allowed_type _fun_allowed)
-        : fun_val(_fun_val), fun_default(_fun_default), fun_allowed(_fun_allowed) {};
-
-        int which()
-        {
-            return ID_FUN;
-        }
-
-        FunctionType             fun_val;
-        std::string          fun_default;
-        string_allowed_type  fun_allowed;
-    };
-
-
-    typedef Variant < VariantBaseType < void > >  ValueType;
-
-    ConfigOption(std::string, const StringType &, const StringType, string_allowed_type allowed, bool list_me = true);
-    ConfigOption(std::string, const StringType &, const StringType = "", bool list_me = true);
-    ConfigOption(std::string, const SignedIntType &, const SignedIntType = 0, SignedIntType min = -INT_MAX, SignedIntType max = INT_MAX, SignedIntType step = 1, bool list_me = true);
-    ConfigOption(std::string, const UnsignedIntType &, const UnsignedIntType = 0, UnsignedIntType min = 0, UnsignedIntType max = UINT_MAX, UnsignedIntType step = 1, bool list_me = true);
-    ConfigOption(std::string, const BooleanType &, const BooleanType = false, bool list_me = true);
-    ConfigOption(std::string, FunctionType, std::string defvalue, string_allowed_type allowed, bool list_me = true);
-    ConfigOption(std::string, FunctionType, std::string defvalue = "", bool list_me = true);
-
-    ConfigOption(const ConfigOption & o);
-
-    ~ConfigOption(void);
-
-    void set(StringType value);
-
-    void set(SignedIntType value);
-    void set(UnsignedIntType value);
-    void set(BooleanType value);
-
-    BooleanType get_bool(){ return _value_data.get<BooleanData>().bool_val; }
-    std::string get_str(){ return _value_data.get<StringData>().string_val; }
-    SignedIntType get_sint(){ return _value_data.get<SignedIntData>().sint_val; }
-    UnsignedIntType get_uint(){ return _value_data.get<UnsignedIntData>().uint_val; }
-
-    std::string    & name(void);
-    value_id_type    type(void);
-
-    const char **  values(void);
-
-    void            reset(void);
-    void           commit(void);
-
-    bool          list_me(void) { return _list_me; };
-    bool           loaded(void) { return _loaded;  };
-
-    void        copy_from(ConfigOption &);
-
- protected:
-    std::string       _my_name;
-    ValueType     _value_data;
-
-    bool              _list_me;
-    const char **      _values;
-    bool               _loaded;
-};
-
-struct ConfigOptions
-{
-    typedef std::vector < std::string >    messages_type;
-
-    ConfigOptions(void): _values(NULL) {};
-
-    typedef std::set < std::string >  string_set;
-
-    typedef std::map  < std::string, ConfigOption >   option_map_type;
-    typedef std::pair < std::string, ConfigOption >  option_pair_type;
-
-    typedef std::map  < std::string, std::string >   syn_option_map_type;
-    typedef std::pair < std::string, std::string >  syn_option_pair_type;
-
-    bool add(ConfigOption option);
-
-    /* only valid in "process" (for backwards compatibility config files) */
-    bool synonym(std::string, std::string);
-
-    template <typename ValueType>
-    void set(std::string name, ValueType value)
-    {
-        option_map_type::iterator iter = _map.find(name);
-
-        if (iter == _map.end())
-            throw ConfigProcessFailure(STG(FMT("unknown option: %s") % name));
-
-        (*iter).second.set(value);
-    }
-
-    std::string get(std::string name)
-    {
-        option_map_type::iterator iter = _map.find(name);
-
-        if (iter == _map.end())
-            throw ConfigProcessFailure(STG(FMT("unknown option: %s") % name));
-
-        switch((*iter).second.type())
-        {
-            case ConfigOption::ID_BOOL: return (*iter).second.get_bool() ? "yes" : "no";
-            case ConfigOption::ID_STRING: return (*iter).second.get_str();
-            case ConfigOption::ID_UINT: return STG(FMT("%d") % (*iter).second.get_uint());
-            case ConfigOption::ID_SINT: return STG(FMT("%d") % (*iter).second.get_sint());
-            case ConfigOption::ID_FUN: return "";
-        }
-    }
-
-    string_set options(void);
-
-    void process(const char *, const char *); /* process option from file */
-
-    void           reset(void);         /* reset loaded opts */
-    messages_type commit(void);         /* set defaults */
-
-    const char ** values(const char *); /* option value */
-    const char ** values(void);         /* values from options */
-
-    bool          loaded(std::string);  /* return if config was loaded */
-
-    void          copy_from(ConfigOptions &, std::string);
-
- protected:
-    option_map_type::iterator find_option(std::string);
-
- protected:
-    option_map_type      _map;
-    syn_option_map_type  _syn_map;
-
-    const char ** _values;
-};
-
-#endif /* _CONFIG_OPTIONS_HPP_ */
-
diff --git a/src/mod/endpoints/mod_khomp/commons/configurator/configfile.cpp b/src/mod/endpoints/mod_khomp/commons/configurator/configfile.cpp
deleted file mode 100644
index 6aa2e59201..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/configurator/configfile.cpp
+++ /dev/null
@@ -1,241 +0,0 @@
-/*  
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.  
-  
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (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.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    This library is free software; you can redistribute it and/or  
-    modify it under the terms of the GNU Lesser General Public  
-    License as published by the Free Software Foundation; either  
-    version 2.1 of the License, or (at your option) any later version.  
-  
-    This library is distributed in the hope that it will be useful,  
-    but WITHOUT ANY WARRANTY; without even the implied warranty of  
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
-    Lesser General Public License for more details.  
-  
-    You should have received a copy of the GNU Lesser General Public License
-    along with this library; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
-  
-*/
-#include <errno.h>
-
-#include <configurator/configfile.hpp>
-
-#if _MSC_VER >= 1400
-#undef close
-#endif
-
-void Configfile::ignore(std::string str)
-{
-	_ignores.insert(str);
-};
-
-bool Configfile::select(Section **ptr, std::string str)
-{
-	/* default section == this! */
-	*ptr = this;
-	
-	/* always success by default */
-	return true;
-};
-
-bool Configfile::adjust(Section * section, std::string & opt, std::string & val)
-{
-	return section->load(opt, val);
-};
-
-bool Configfile::deserialize(std::ifstream& fd)
-{
-	Section * section = NULL;
-	
-	/* default selection! */
-	if (!select(&section))
-	{
-		_errors.push_back("default selection has failed!");
-		return false;
-	}
-
-	size_t count = 0;
-
-	while (fd.good())
-	{
-		std::string str;
-
-		/* read one line! */
-		std::getline(fd, str);
-
-		size_t lst = str.size() - 1;
-
-		if (str.size() >= 1 && str[lst] == '\r') //cuida das quebras de linha do tipo \r\n
-		{
-			str.erase(lst,1);
-			--lst;
-		}
-
-		/* empty line! */
-		if (str.size() == 0)
-			continue;
-
-		/* comment! */
-		if (str[0] == '#')
-			continue;
-
-		++count;
-
-		if (str[0] == '[' && str[lst] == ']')
-		{
-			str.erase(0,1);   --lst;
-			str.erase(lst,1); --lst;
-
-			if (!select(&section, str))
-			{
-				_errors.push_back(STG(FMT("erroneous section '%s'") % str));
-
-				/* ignore this section */
-				section = NULL;
-				continue;
-			}
-		}
-		else
-		{
-			std::string::size_type pos = str.find('=');
-
-			if (pos == std::string::npos)
-			{
-				_errors.push_back(STG(FMT("erroneous separator '%s'") % str));
-				continue;
-			};
-
-			if (section == NULL)
-			{
-				_errors.push_back(STG(FMT("no section for option '%s'") % str));
-				continue;
-			}
-
-			std::string  opt(str.substr(0,pos));
-			std::string  val(str.substr(pos+1));
-
-			if (_ignores.find(opt) != _ignores.end())
-				continue;
-
-			if (val == "@") val = "";
-
-			if (adjust(section, opt, val))
-				continue;
-
-			_errors.push_back(STG(FMT("option '%s' does "
-				"not exist or '%s' is not a valid value (at section '%s')")
-				% opt % val % section->name()));
-		}
-	}
-
-	// retorna 'true' se arquivo tinha alguma coisa valida.
-	return (count != 0);
-}
-
-bool Configfile::obtain()
-{
-	std::ifstream fd(_filename.c_str());
-
-	if (!fd.is_open())
-	{
-		_errors.push_back(STG(FMT("unable to open file '%s': %s")
-			% _filename % strerror(errno)));
-		return false;
-	};
-
-	if (!deserialize(fd))
-	{
-		fd.close();
-		return false;
-	}
-
-	fd.close();
-	return true;
-};
-
-void Configfile::recurse(std::ofstream& fd, Section * section)
-{
-	typedef Section::SectionMap::iterator section_iter;
-	typedef Section::OptionMap::iterator  option_iter;
-
-	for (option_iter i = section->option_begin(); i != section->option_end(); i++)
-	{
-		std::string res;
-
-		if ((*i).second.store(res))
-		{
-			if (res == "") res = "@";
-			fd << (*i).first << "=" << res << std::endl;
-		}
-	}
-	
-	if (!section->recursive())
-		return;
-	
-	for (section_iter j = section->section_begin(); j != section->section_end(); j++)
-		recurse(fd, (*j).second);
-}
-
-bool Configfile::serialize(std::ofstream& fd)
-{
-	recurse(fd, this);
-	return true;
-}
-
-bool Configfile::provide()
-{
-	std::string tmp(_filename);
-	tmp += ".new";
-
-	std::ofstream fd(tmp.c_str());
-
-	if (!fd.good())
-	{
-		_errors.push_back(STG(FMT("unable to open file '%s': %s")
-			% tmp % strerror(errno)));
-		return false;
-	}
-
-	if (!serialize(fd))
-	{
-		fd.close();
-		return false;
-	}
-
-	fd.close();
-
-	if (rename(tmp.c_str(), _filename.c_str()) != 0)
-	{
-		_errors.push_back(STG(FMT("unable to replace config file '%s': %s")
-			% _filename % strerror(errno)));
-		return false;
-	}
-
-	return true;
-}
-
-#if _MSC_VER >= 1400
-#define close _close
-#endif
\ No newline at end of file
diff --git a/src/mod/endpoints/mod_khomp/commons/configurator/option.cpp b/src/mod/endpoints/mod_khomp/commons/configurator/option.cpp
deleted file mode 100644
index 083883e63f..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/configurator/option.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-/*  
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.  
-  
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (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.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    This library is free software; you can redistribute it and/or  
-    modify it under the terms of the GNU Lesser General Public  
-    License as published by the Free Software Foundation; either  
-    version 2.1 of the License, or (at your option) any later version.  
-  
-    This library is distributed in the hope that it will be useful,  
-    but WITHOUT ANY WARRANTY; without even the implied warranty of  
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
-    Lesser General Public License for more details.  
-  
-    You should have received a copy of the GNU Lesser General Public License
-    along with this library; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
-  
-*/
-
-#include <configurator/option.hpp>
-
-bool Option::equals(std::string & value)
-{
-	switch (_restriction.numeral())
-	{
-		case Restriction::N_UNIQUE:
-		{
-			Restriction::Value my_value;
-
-			if (!_restriction.get(Restriction::F_USER, my_value))
-				return false;
-
-			return (my_value == value);
-		}
-		case Restriction::N_MULTIPLE:
-		{
-			Restriction::Vector my_values;
-
-			if (!_restriction.get(Restriction::F_USER, my_values))
-				return false;
-
-			for (Restriction::Vector::iterator i = my_values.begin(); i != my_values.end(); i++)
-			{
-				if ((*i) == value)
-					return true;
-			}
-			
-			return false;
-		}
-	}
-
-	return false;
-}
-
-bool Option::load(std::string & value)
-{
-	bool ret = _restriction.set(Restriction::F_FILE, value);
-
-	if (ret) _modified = false;
-
-	return ret;
-}
-
-bool Option::change(std::string & value)
-{
-	bool ret = _restriction.set(Restriction::F_FILE, value);
-
-	if (ret) _modified = true;
-
-	return ret;
-}
-
-bool Option::store(std::string & value)
-{
-	switch  (_restriction.numeral())
-	{
-		case Restriction::N_UNIQUE:
-			return _restriction.get(Restriction::F_FILE, value);
-		
-		case Restriction::N_MULTIPLE:
-		{
-			Restriction::Vector values;
-			
-			if (!_restriction.get(Restriction::F_FILE, values))
-				return false;
-
-			Strings::Merger strs;
- 
-			for (Restriction::Vector::iterator i = values.begin(); i != values.end(); i++)
-				strs.add(*i);
- 
-			value = strs.merge(","); 
-
-			return true;
-		}
-		
-		default:
-			return false;
-	}
-}
-
-Option::Flags Option::set(const char * value)
-{
-	std::string str_value(value);
-	return set(str_value);
-}
-
-
-Option::Flags Option::set(Restriction::Value & value)
-{
-	Restriction::Value  last_value, curr_value;
-	Flags               flags;
-	
-	bool ret1 = _restriction.get(Restriction::F_USER, last_value);
-	
-	if (!_restriction.set(Restriction::F_USER, value))
-		return flags;
-	
-	flags[F_ADJUSTED] = true;
-
-	bool ret2 = _restriction.get(Restriction::F_USER, curr_value);
-	
-	if (!ret1 || (ret2 && (last_value != curr_value)))
-	{
-		flags[F_MODIFIED] = true;
-		_modified = true;
-	}
-
-	return flags;
-}
-
-Option::Flags Option::set(Restriction::Vector & values)
-{
-	Restriction::Vector  last_values, curr_values;
-	Flags                flags;
-	
-	bool ret1 = _restriction.get(Restriction::F_USER, last_values);
-
-	if (!_restriction.set(Restriction::F_USER, values))
-		return flags;
-		
-	flags[F_ADJUSTED] = true;
-
-	bool ret2 = _restriction.get(Restriction::F_USER, curr_values);
-
-	if (!ret1 || (ret2 && (last_values != curr_values)))
-	{
-		flags[F_MODIFIED] = true;
-		_modified = true;
-	}
-
-	return flags;
-}
-
-bool Option::get(Restriction::Value & value)
-{
-	return _restriction.get(Restriction::F_USER, value);
-}
-
-bool Option::get(Restriction::Vector & values)
-{
-	return _restriction.get(Restriction::F_USER, values);
-}
diff --git a/src/mod/endpoints/mod_khomp/commons/configurator/restriction.cpp b/src/mod/endpoints/mod_khomp/commons/configurator/restriction.cpp
deleted file mode 100644
index 9653a7c608..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/configurator/restriction.cpp
+++ /dev/null
@@ -1,353 +0,0 @@
-/*  
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.  
-  
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (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.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    This library is free software; you can redistribute it and/or  
-    modify it under the terms of the GNU Lesser General Public  
-    License as published by the Free Software Foundation; either  
-    version 2.1 of the License, or (at your option) any later version.  
-  
-    This library is distributed in the hope that it will be useful,  
-    but WITHOUT ANY WARRANTY; without even the implied warranty of  
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
-    Lesser General Public License for more details.  
-  
-    You should have received a copy of the GNU Lesser General Public License
-    along with this library; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
-  
-*/
-
-#include <math.h>
-#include <string.h>
-
-#include <iostream>
-#include <strings.hpp>
-
-#include <configurator/restriction.hpp>
-
-/* internal helper! */
-bool Restriction::equalNumber(const double a, const double b)
-{
-    char tmp1[64];
-    char tmp2[64];
-
-    snprintf(tmp1, sizeof(tmp1), "%.3f", a);
-    snprintf(tmp2, sizeof(tmp2), "%.3f", b);
-
-    if (strncmp(tmp1, tmp2, sizeof(tmp1)))
-        return false;
-
-    return true;
-}
-
-/* process value to our internal representation */
-
-bool Restriction::process(Restriction::Format fmt,
-		const Restriction::Value & value, Restriction::Value & final)
-{
-	switch (_bounds)
-	{
-		case B_RANGE:
-		{
-			if (_kind != K_NUMBER)
-				return false;
-
-            std::string tmpvalue;
-            
-            Restriction::Value::const_iterator itr = value.begin();
-            Restriction::Value::const_iterator end = value.end();
-            
-            tmpvalue.reserve(value.size());
-
-            // f*cking dot/comma notation!
-            for (; itr != end; ++itr)
-                tmpvalue += ((*itr) != ',' ? (*itr) : '.');
-
-            try
-            {
-    			double newvalue = Strings::todouble(tmpvalue);
-
-                if (newvalue < _init && newvalue > _fini)
-                    return false;
-
-                double res = (newvalue - _init) / _step;
-
-                if (!equalNumber(res, rint(res)))
-                    return false;
-    
-		    	final = value;
-			    return true;
-            }
-            catch (...)
-            {
-                return false;
-            }
-		}
-		
-		case B_LIST:
-	 		for (List::iterator i = _list.begin(); i != _list.end(); i++)
-			{
-				Value & tmp = (*i);
-						
-				if (tmp == value)
-				{
-					final = value;
-					return true;
-				}
-			}
-			return false;
-
-		case B_MAPS:
-			switch (fmt)
-			{
-				case F_USER:
-				{
-		 			Map::iterator i = _map_from_usr.find(std::string(value));
-
-					if (i == _map_from_usr.end())
-						return false;
-
-					Value & tmp = (*i).second;
-
-					final = tmp;
-					return true;
-				}
-
-				case F_FILE:
-				{
-		 			Map::iterator i = _map_from_cfg.find(std::string(value));
-
-					if (i == _map_from_cfg.end())
-						return false;
-
-					final = value;
-					return true;
-				}
-
-				default:
-					break;
-			}
-			return false;
-					
-		case B_FREE:
-			final = value;
-			return true;
-
-		default:
-			break;
-	}
-
-	return false;
-}
-
-/* unprocess the value (outputs the external representation) */
-
-bool Restriction::unprocess(Restriction::Format fmt,
-		const Restriction::Value & value, Restriction::Value & final)
-{
-	switch (_bounds)
-	{
-		case B_MAPS:
-
-			switch (fmt)
-			{
-				case F_USER:
-				{
- 					Map::iterator i = _map_from_cfg.find(std::string(value));
-
-					if (i == _map_from_cfg.end())
-						return false;
-
-					final = (*i).second;
-					return true;
-				}
-				default:
-					break;
-			}
-
-		default:
-			final = value;
-			return true;
-	}
-}
-
-/***************************** *****************************/
-
-bool Restriction::get(Restriction::Format fmt, Restriction::Value & value)
-{
-	if (_numeral != N_UNIQUE)
-		return false;
-
-	if (!unprocess(fmt, _value._unique, value))
-		return false;
-
-	return true;
-}
-
-bool Restriction::get(Restriction::Format fmt, Restriction::Vector & values)
-{
-	if (_numeral != N_MULTIPLE)
-		return false;
-
-    List & my_values = _value._multiple;
-
-	for (List::iterator i = my_values.begin(); i != my_values.end(); i++)
-	{
-		Value & value = (*i);
-		Value   final;
-				
-		if (!unprocess(fmt, value, final))
-			return false;
-
-		values.push_back(final);
-	};
-
-	return true;
-}
-
-/***************************** *****************************/
-
-bool Restriction::set(Restriction::Format fmt, Restriction::Value &value)
-{
-	switch (_numeral)
-	{
-		case N_UNIQUE:
-		{
-			Value final;
-
-			if (!process(fmt, value, final))
-				return false;
-
-			_value._unique = final;
-			return true;
-		}
-		
-		case N_MULTIPLE:
-		{
-			if (value == "@" || value == "#" || value == "")
-			{
-				_value._multiple.clear();
-				return true;
-			}
-			
-			Strings::vector_type values;
-			Strings::tokenize(value, values, ",");
-			
-			return set(fmt, values);
-		}
-		
-		default:
-			return false;
-	}
-}
-
-bool Restriction::set(Restriction::Format fmt, Restriction::Vector & values)
-{
-	if (_numeral != N_MULTIPLE)
-		return false;
-
-	if (values.empty())
-	{
-		_value._multiple.clear();
-	}
-	else
-	{
-		/* list needed to store temporary values */
-	    List finals;
-
-		for (Vector::iterator i = values.begin(); i != values.end(); i++)
-		{
-			Value & value = (*i);
-			Value   final;
-			
-			if (!process(fmt, value, final))
-				return false;
-
-			finals.push_back(final);
-		}
-		
-		List & lst = _value._multiple;
-
-		/* need to clear values set before */
-		lst.clear();
-		
-		for (List::iterator i = finals.begin(); i != finals.end(); i++)
-		{
-			Value value = (*i);
-			lst.push_back(value);
-		}
-	};
-
-	return true;
-}
-
-/***************************** *****************************/
-
-void Restriction::allowed(Restriction::Vector &vals)
-{
-	switch (_bounds)
-	{
-		case B_FREE:
-			return;
-
-		case B_LIST:
-			for (List::iterator i = _list.begin(); i != _list.end(); i++)
-				vals.push_back((*i));
-			break;
-
-		case B_MAPS:
-			for (Map::iterator i = _map_from_usr.begin(); i != _map_from_usr.end(); i++)
-				vals.push_back((*i).first);
-			break;
-
-		case B_RANGE:
-        {
-			if (_kind != K_NUMBER)
-				return;
-
-            // is there any fraction?
-            bool has_fraction = (!equalNumber(_init, rint(_init))) || (!equalNumber(_fini, rint(_fini))) || (!equalNumber(_step, rint(_step)));
-
-            const char * format = (has_fraction ? "%.2f" : "%02.0f");
-
-			for (double i = _init; i <= _fini; i += _step)
-			{
-				char tmp[32];
-				snprintf(tmp, sizeof(tmp), format, i);
-				vals.push_back(std::string(tmp));
-			}
-			break;
-        }
-
-		default:
-			break;
-	}
-}
-
-void Restriction::init_class()
-{
-	_value._unique.clear();
-	_value._multiple.clear();
-}
diff --git a/src/mod/endpoints/mod_khomp/commons/configurator/restriction.hpp b/src/mod/endpoints/mod_khomp/commons/configurator/restriction.hpp
deleted file mode 100644
index 0815ede3db..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/configurator/restriction.hpp
+++ /dev/null
@@ -1,321 +0,0 @@
-/*  
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.  
-  
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (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.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    This library is free software; you can redistribute it and/or  
-    modify it under the terms of the GNU Lesser General Public  
-    License as published by the Free Software Foundation; either  
-    version 2.1 of the License, or (at your option) any later version.  
-  
-    This library is distributed in the hope that it will be useful,  
-    but WITHOUT ANY WARRANTY; without even the implied warranty of  
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
-    Lesser General Public License for more details.  
-  
-    You should have received a copy of the GNU Lesser General Public License
-    along with this library; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
-  
-*/
-
-#include <stdarg.h>
-
-#include <string>
-#include <list>
-#include <vector>
-#include <map>
-
-#ifndef _CONFIG_RESTRICTION_HPP_
-#define _CONFIG_RESTRICTION_HPP_
-
-struct Restriction
-{
-	/* generic types */
-	enum Format
-    {
-        F_USER,
-        F_FILE
-    };
-
-    enum Kind
-    {
-//        K_INTEGER,
-//        K_FLOAT,
-        K_STRING,
-        K_NUMBER // = K_INTEGER // compatibility
-    };
-
-    enum Bounds
-    {
-        B_FREE,
-        B_RANGE,
-        B_LIST,
-        B_MAPS
-    };
-
-    enum Numeral
-    {
-        N_UNIQUE,
-        N_MULTIPLE
-    };
-
-	typedef std::string   Value;
-
-	/* types used for data input */
-	struct Pair
-    {
-        const char *pretty;
-        const char *value;
-    };
-
-	typedef std::pair < Value, Value >   PairMap;
-	typedef std::list < PairMap >        ListMap;
-
-	/* types used internally */
-	typedef std::map < Value, Value >           Map;
-	typedef std::vector < Value >            Vector;
-
-	typedef std::list < Value >                List;
-	typedef std::pair < Value, Value >       MapPair;
-
-    struct Generic
-    {
-        Value _unique;
-        List  _multiple;
-    };
-
-	Restriction(Kind kind, Numeral num)
-	: _kind(kind), _bounds(B_FREE), _numeral(num), _unit(""),
-	  _init(-1), _fini(-1), _step(-1)
-	{
-		init_class();
-	}
-
-/*
-	Restriction(Kind kind, Numeral num,
-	            int init, int fini, int step = 1)
-	: _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(unit),
-	  _iinit(init), _ifini(fini), _istep(step),
-	  _finit(-1), _ffini(-1), _fstep(-1)
-	{
-		init_class();
-	}
-
-	Restriction(Kind kind, Numeral num,
-	            const char *unit, int init, int fini, int step = 1)
-	: _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(unit),
-	  _iinit(init), _ifini(fini), _istep(step),
-	  _finit(-1), _ffini(-1), _fstep(-1)
-	{
-		init_class();
-	}
-
-	Restriction(Kind kind, Numeral num,
-	            std::string unit, int init, int fini, int step = 1)
-	: _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(unit),
-	  _iinit(init), _ifini(fini), _istep(step),
-	  _finit(-1), _ffini(-1), _fstep(-1)
-	{
-		init_class();
-	}
-
-	Restriction(Kind kind, Numeral num,
-	            float init, float fini, float step = 1)
-	: _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(unit),
-	  _iinit(-1), _ifini(-1), _istep(-1)
-	  _finit(init), _ffini(fini), _fstep(step),
-	{
-		init_class();
-	}
-
-	Restriction(Kind kind, Numeral num,
-	            const char *unit, float init, float fini, float step = 1.0)
-	: _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(unit),
-	  _iinit(-1), _ifini(-1), _istep(-1)
-	  _finit(init), _ffini(fini), _fstep(step),
-	{
-		init_class();
-	}
-
-	Restriction(Kind kind, Numeral num,
-	            std::string unit, float init, float fini, float step = 1.0)
-	: _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(unit),
-	  _iinit(-1), _ifini(-1), _istep(-1)
-	  _finit(init), _ffini(fini), _fstep(step),
-	{
-		init_class();
-	}
-*/
-
-	Restriction(Kind kind, Numeral num,
-	            double init, double fini, double step = 1)
-	: _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(""),
-	  _init(init), _fini(fini), _step(step)
-	{
-		init_class();
-	}
-
-	Restriction(Kind kind, Numeral num,
-	            const char *unit, double init, double fini, double step = 1.0)
-	: _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(unit),
-	  _init(init), _fini(fini), _step(step)
-	{
-		init_class();
-	}
-
-	Restriction(Kind kind, Numeral num,
-	            std::string unit, double init, double fini, double step = 1.0)
-	: _kind(kind), _bounds(B_RANGE), _numeral(num), _unit(unit),
-	  _init(init), _fini(fini), _step(step)
-	{
-		init_class();
-	}
-
-	Restriction(Kind kind, Numeral num,
-	            const char *first, ...)
-	: _kind(kind), _bounds(B_LIST), _numeral(num), _unit(""),
-	  _init(-1), _fini(-1), _step(-1)
-	{
-		_list.push_back(std::string(first));
-
-		va_list ap;
-		va_start(ap, first);
-
-		while (true)
-		{
-			const char *arg = va_arg(ap, const char *);
-
-			if (arg == NULL) break;
-
-			_list.push_back(std::string(arg));
-		}
-		
-		init_class();
-	}
-	
-	Restriction(Kind kind, const char *unit, Numeral num,
-	            const char *first, ...)
-	: _kind(kind), _bounds(B_LIST), _numeral(num), _unit(unit),
-	  _init(-1), _fini(-1), _step(-1)
-	{
-		_list.push_back(std::string(first));
-
-		va_list ap;
-		va_start(ap, first);
-
-		while (true)
-		{
-			const char *arg = va_arg(ap, const char *);
-
-			if (arg == NULL) break;
-
-			_list.push_back(std::string(arg));
-		}
-		
-		init_class();
-	}
-
-	Restriction(Kind kind, Numeral num,
-	            const struct Pair first, ...)
-	: _kind(kind), _bounds(B_MAPS), _numeral(num), _unit(""),
-	  _init(-1), _fini(-1), _step(-1)
-	{
-		_map_from_usr.insert(MapPair(Value(first.pretty), Value(first.value)));
-		_map_from_cfg.insert(MapPair(Value(first.value), Value(first.pretty)));
-
-		va_list ap;
-		va_start(ap, first);
-
-		while (true)
-		{
-			Pair arg = va_arg(ap, Pair);
-
-			if (arg.pretty == NULL) break;
-
-			_map_from_usr.insert(MapPair(Value(arg.pretty), Value(arg.value)));
-			_map_from_cfg.insert(MapPair(Value(arg.value), Value(arg.pretty)));
-		}
-		
-		init_class();
-	}
-	
-	Restriction(Kind kind, Numeral num, List list)
-	: _kind(kind), _bounds(B_LIST), _numeral(num), _unit(""),
-	  _init(-1), _fini(-1), _step(-1), _list(list)
-	{
-		init_class();
-	}
-
-	Restriction(Kind kind, Numeral num, ListMap map)
-	: _kind(kind), _bounds(B_MAPS), _numeral(num), _unit(""),
-	  _init(-1), _fini(-1), _step(-1)
-	{
-		for (ListMap::iterator i = map.begin(); i != map.end(); i++)
-		{
-			_map_from_usr.insert(MapPair(Value((*i).first), Value((*i).second)));
-			_map_from_cfg.insert(MapPair(Value((*i).second), Value((*i).first)));
-		}
-
-		init_class();
-	}
-
-	Kind      kind()    { return _kind;    };
-	Bounds    bounds()  { return _bounds;  };
-	Numeral   numeral() { return _numeral; };
-
-	Value   unit() { return _unit;    };
-
-	bool  set(Format, Vector &);
-	bool  set(Format, Value &);
-
-	bool  get(Format, Vector &);
-	bool  get(Format, Value &);
-
-	void  allowed(Vector &);
-
- private:
-	bool  process(Format, const Value &, Value &);
-	bool  unprocess(Format, const Value &, Value &);
-	void  init_class();
-
-	bool  equalNumber(const double, const double);
-
- protected:
-	Kind      _kind;
-	Bounds    _bounds;
-	Numeral   _numeral;
-
-	Value     _unit;
-
-	double    _init, _fini, _step;
-
-    Map       _map_from_usr,
-	          _map_from_cfg;
-
-	List      _list;
-	
-	Generic   _value;
-};
-
-#endif /* _CONFIG_RESTRICTION_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/configurator/section.hpp b/src/mod/endpoints/mod_khomp/commons/configurator/section.hpp
deleted file mode 100644
index fdb782308a..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/configurator/section.hpp
+++ /dev/null
@@ -1,226 +0,0 @@
-/*  
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.  
-  
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (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.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    This library is free software; you can redistribute it and/or  
-    modify it under the terms of the GNU Lesser General Public  
-    License as published by the Free Software Foundation; either  
-    version 2.1 of the License, or (at your option) any later version.  
-  
-    This library is distributed in the hope that it will be useful,  
-    but WITHOUT ANY WARRANTY; without even the implied warranty of  
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
-    Lesser General Public License for more details.  
-  
-    You should have received a copy of the GNU Lesser General Public License
-    along with this library; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
-  
-*/
-
-#include <string>
-#include <vector>
-#include <map>
-#include <algorithm>
-#include <iostream>
-
-#include <configurator/option.hpp>
-
-#ifndef _CONFIG_SECTION_HPP_
-#define _CONFIG_SECTION_HPP_
-
-struct Section
-{
-	typedef std::map < std::string, Option >   OptionMap;
-	typedef std::vector< Option * >            OptionVector;
-
-	typedef std::map < std::string, Section * > SectionMap;
-	typedef std::vector < Section * >           SectionVector;
-
-	struct not_found {}; /* exception */
-	
-// protected:
-	Section(std::string name, std::string desc, bool recursive = true)
-	: _name(name), _description(desc), _recursive(recursive) {};
-
-	void add(Option o)
-	{
-		_options.insert(std::pair<std::string,Option>(o.name(), o));
-	};
-
-	void del(std::string name)
-	{
-		_options.erase(name);
-	};
-
-	void add(Section *s)
-	{
-		_sections.insert(std::pair<std::string,Section*>(s->name(), s));
-	};
-
- public:
-	const std::string & name()           { return _name;        };
-	const std::string & description()    { return _description; };
-	const bool		  & recursive()      { return _recursive;   };
-
-	OptionMap::iterator option_begin()   { return _options.begin(); };
-	OptionMap::iterator option_end()     { return _options.end();   };
-
-	SectionMap::iterator section_begin() { return _sections.begin(); };
-	SectionMap::iterator section_end()   { return _sections.end();   };
-
-	/**/
-
-	Option  *  option_find(const char *, bool recurse = false);
-	Section * section_find(const char *, bool recurse = false);
-
-	Option  *  option_find(std::string &, bool recurse = false);
-	Section * section_find(std::string &, bool recurse = false);
-
-	/**/
-
-	void options(OptionVector &);
-	void sections(SectionVector &);
-
-	/**/
-
-	template <typename F>
-	bool search_and_apply(std::string &key, std::string &value, F f)
-	{
-		OptionMap::iterator i = _options.find(key);
-
-		if (i != _options.end())
-			return f((*i).second);
-
-		if (!_recursive)
-			return false;
-
-		return (find_if(_sections.begin(), _sections.end(), f) != _sections.end());
-	}
-
- private:
-	struct key_value
-	{
-		key_value(std::string &k, std::string &v): _k(k), _v(v) {};
-		std::string & _k, & _v;
-	};
-
-	struct load_section: protected key_value
-	{
-		load_section(std::string &k, std::string &v): key_value(k,v) {};
-
-		bool operator()(Option &o)                 { return o.load(_v);            };
-		bool operator()(SectionMap::value_type &v) { return v.second->load(_k,_v); };
-	};
-
-	struct change_section: protected key_value
-	{
-		change_section(std::string &k, std::string &v): key_value(k,v) {};
-
-		bool operator()(Option &o)                 { return o.change(_v);            };
-		bool operator()(SectionMap::value_type &v) { return v.second->change(_k,_v); };
-	};
-
-	struct store_section: protected key_value
-	{
-		store_section(std::string &k, std::string &v): key_value(k,v) {};
-
-		bool operator()(Option &o)                 { return o.store(_v);            };
-		bool operator()(SectionMap::value_type &v) { return v.second->store(_k,_v); };
-	};
-
-	struct set_section: protected key_value
-	{
-		set_section(std::string &k, std::string &v): key_value(k,v) {};
-
-		bool operator()(Option &o)                 { return (o.set(_v))[Option::F_ADJUSTED]; };
-		bool operator()(SectionMap::value_type &v) { return  v.second->set(_k,_v);           };
-	};
-
-	struct get_section: protected key_value
-	{
-		get_section(std::string &k, std::string &v): key_value(k,v) {};
-
-		bool operator()(Option &o)                 { return o.get(_v);            };
-		bool operator()(SectionMap::value_type &v) { return v.second->get(_k,_v); };
-	};
-
-	struct modified_section
-	{
-		bool operator()(OptionMap::value_type  &v) { return v.second.modified();  };
-		bool operator()(SectionMap::value_type &v) { return v.second->modified(); };
-	};
-
- public:
-	bool load(const char * key, std::string value)
-	{
-		std::string skey(key);
-		return search_and_apply(skey, value, load_section(skey, value));
-	}
-
-	bool load(std::string &key, std::string &value)
-	{
-		return search_and_apply(key, value, load_section(key, value));
-	}
-
-	bool change(std::string &key, std::string &value)
-	{
-		return search_and_apply(key, value, change_section(key, value));
-	}
-
-	bool store(std::string &key, std::string &value)
-	{
-		return search_and_apply(key, value, store_section(key, value));
-	}
-
-	bool set(std::string &key, std::string &value)
-	{
-		return search_and_apply(key, value, set_section(key, value));
-	}
-
-	bool get(std::string &key, std::string &value)
-	{
-		return search_and_apply(key, value, get_section(key, value));
-	}
-
-	bool modified()
-	{
-		return ((find_if(_options.begin(), _options.end(), modified_section()) != _options.end()) ||
-		        (find_if(_sections.begin(), _sections.end(), modified_section()) != _sections.end()));
-	}
-
- private:
-	Section() {};
-
- protected:
-    std::string       _name;
-	std::string       _description;
-
-    OptionMap         _options;
-    SectionMap        _sections;
-
-    bool              _recursive;
-};
-
-#endif /* _CONFIG_SECTION_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/commons/ringbuffer.cpp b/src/mod/endpoints/mod_khomp/commons/ringbuffer.cpp
deleted file mode 100644
index 428bd29221..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/ringbuffer.cpp
+++ /dev/null
@@ -1,575 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (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.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this library; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <ringbuffer.hpp>
-
-/********** BUFFER FUNCTIONS **********/
-
-/* writes everything or nothing */
-bool Ringbuffer_traits::traits_provide(char * buffer, const char * value, unsigned int amount, bool skip_overwrite)
-{
-    /* avoid using different values */
-    Buffer_table cache = _pointers;
-
-    const unsigned int reader = cache.reader.complete;
-    const unsigned int writer = cache.writer.complete;
-
-    const unsigned int dest = cache.writer.complete - 1;
-
-    const bool reader_less = cache.reader.complete < cache.writer.complete;
-
-    if (amount >= _size)
-        return false;
-
-    bool ret = true;
-
-    /* should we go around the buffer for writing? */
-    if (((writer + amount) > _size) && (reader_less || !skip_overwrite))
-    {
-        /* Documentation of the formula used in the 'if' below.
-         *
-         * [0|1|2|3|4|5|6|7] => size=8
-         *      |   |
-         *  reader  |
-         *         writer
-         *
-         * => writer has places [5,6,7,0,1] to write (5 places).
-         *
-         * =>  8 - (4-2+1) = 8 - (2+1) = 8 - 3 = 5
-         *
-         * > writer goes 1 up, amount goes 1 down.
-         * > reader goes 1 up, amount goes 1 up.
-         * > size goes 1 down, amount goes 1 down.
-         *
-         */
-
-        if ((_size - (writer - reader + 1)) <= amount)
-        {
-            if (skip_overwrite)
-                return false;
-
-            do
-            {
-                Buffer_pointer extra(cache.reader);
-                extra.complete = (extra.complete + amount) % _size;
-
-                if (update(cache.reader, extra))
-                    break;
-            }
-            while (true);
-
-            ret = false;
-        }
-
-        unsigned int wr1 = _size - writer + 1; /* writer is already 1 position after */
-        unsigned int wr2 = amount - wr1;
-
-//        fprintf(stderr, "%p> partial write: (%d/%d) %d/%d [%d/%d]\n", this, wr1, wr2, amount, _size, reader, writer);
-
-        /* two partial writes (one at the end, another at the beginning) */
-        memcpy((void *) &(buffer[dest]), (const void *)  (value),      _block * wr1);
-        memcpy((void *)  (buffer),       (const void *) &(value[wr1]), _block * wr2);
-    }
-    else
-    {
-        if (!reader_less && ((reader - writer) <= amount))
-        {
-            if (skip_overwrite)
-                return false;
-
-            do
-            {
-                Buffer_pointer extra(cache.reader);
-                extra.complete = (extra.complete + amount) % _size;
-
-                if (update(cache.reader, extra))
-                    break;
-            }
-            while (true);
-
-            ret = false;
-        }
-
-//        fprintf(stderr, "%p> full write: a=%d/s=%d [r=%d/w=%d]\n", this, amount, _size, reader, writer);
-
-        /* we are talking about buffers here, man! */
-        memcpy((void *) &(buffer[dest]), (const void *) value, _block * amount);
-    }
-
-    _pointers.writer.complete = ((dest + amount) % _size) + 1;
-    _pointers.writer.partial  = 1;
-
-//    fprintf(stderr, "%p> write end: %d [block=%d]\n", this, writer, _block);
-
-    return ret;
-}
-
-/* returns the number of itens that have been read */
-unsigned int Ringbuffer_traits::traits_consume(const char * buffer, char * value, unsigned int amount, bool atomic_mode)
-{
-    /* avoid using different values */
-    Buffer_table cache = _pointers;
-
-    const unsigned int writer = _pointers.writer.complete;
-    const unsigned int reader = _pointers.reader.complete;
-
-    const bool writer_less = writer < reader;
-
-    unsigned int total = 0;
-
-    /* should we go around the buffer for reading? */
-    if (writer_less && (reader + amount >= _size))
-    {
-        total = std::min(_size - (reader - writer + 1), amount);
-
-        if ((total == 0) || (atomic_mode && (total < amount)))
-            return 0;
-
-        unsigned int rd1 = _size - reader;
-        unsigned int rd2 = total - rd1;
-
-//        fprintf(stderr, "%p> partial read: (%d/%d) %d/%d [%d/%d]\n", this, rd1, rd2, total, _size, reader, writer);
-
-        /* two partial consumes (one at the end, another at the beginning) */
-        memcpy((void *)  (value),      (const void *) &(buffer[reader]), _block * rd1);
-        memcpy((void *) &(value[rd1]), (const void *)  (buffer),         _block * rd2);
-    }
-    else
-    {
-        total = std::min((!writer_less ? writer - (reader + 1) : amount), amount);
-
-        if ((total == 0) || (atomic_mode && (total < amount)))
-            return 0;
-
-//        fprintf(stderr, "%p> full read: %d/%d [%d/%d]\n", this, total, _size, reader, writer);
-
-        /* we are talking about buffers here, man! */
-        memcpy((void *) value, (const void *) &(buffer[reader]), _block * total);
-    }
-
-    do
-    {
-        /* jump the reader forward */
-        Buffer_pointer index((cache.reader.complete + total) % _size);
-
-        if (update(cache.reader, index))
-            break;
-    }
-    while (true);
-
-//    fprintf(stderr, "%p> read end: %d [block=%d]\n", this, reader, _block);
-
-    return total;
-}
-
-/********** TWO-PHASE BUFFER FUNCTIONS ***********/
-
-/* returns the number of itens that have been read */
-unsigned int Ringbuffer_traits::traits_consume_begins(const char * buffer, char * value, unsigned int amount, bool atomic_mode)
-{
-    Buffer_table cache = _pointers;
-
-    /* avoid using different values */
-    const unsigned int reader = cache.reader.complete;
-    const unsigned int writer = cache.writer.complete;
-
-    const bool writer_less = writer < reader;
-
-    unsigned int total = 0;
-
-    /* should we go around the buffer for reading? */
-    if (writer_less && (reader + amount >= _size))
-    {
-        total = std::min(_size - (reader - writer + 1), amount);
-
-        if ((total == 0) || (atomic_mode && (total < amount)))
-            return 0;
-
-        unsigned int rd1 = _size - reader;
-        unsigned int rd2 = total - rd1;
-
-//        fprintf(stderr, "%p> partial read: (%d/%d) %d/%d [%d/%d]\n", this, rd1, rd2, total, _size, reader, writer);
-
-        /* two partial consumes (one at the end, another at the beginning) */
-        memcpy((void *)  (value),      (const void *) &(buffer[reader]), _block * rd1);
-        memcpy((void *) &(value[rd1]), (const void *)  (buffer),         _block * rd2);
-    }
-    else
-    {
-        total = std::min((!writer_less ? writer - (reader + 1) : amount), amount);
-
-        if ((total == 0) || (atomic_mode && (total < amount)))
-            return 0;
-
-//        fprintf(stderr, "%p> full read: %d/%d [%d/%d]\n", this, total, _size, reader, writer);
-
-        /* we are talking about buffers here, man! */
-        memcpy((void *) value, (const void *) &(buffer[reader]), _block * total);
-    }
-
-//    fprintf(stderr, "%p> read end: %d [%d]\n", this, _reader, _reader_partial);
-
-    return total;
-}
-
-bool Ringbuffer_traits::traits_consume_commit(unsigned int amount)
-{
-   	/* avoid using different values */
-    Buffer_table cache = _pointers;
-
-   	const unsigned int writer = cache.writer.complete;
-    const unsigned int reader = cache.reader.complete;
-
-    const bool writer_less = writer < reader;
-
-    unsigned int total = 0;
-
-    /* should we go around the buffer for reading? */
-    if (writer_less && (reader + amount >= _size))
-    {
-        total = std::min(_size - (reader - writer + 1), amount);
-
-        if (total < amount)
-            return false;
-
-//        fprintf(stderr, "%p> partial read: (%d/%d) %d/%d [%d/%d]\n", this, rd1, rd2, total, _size, reader, writer);
-    }
-    else
-    {
-        total = std::min((!writer_less ? writer - (reader + 1) : amount), amount);
-
-        if (total < amount)
-            return false;
-
-//        fprintf(stderr, "%p> full read: %d/%d [%d/%d]\n", this, total, _size, reader, writer);
-    }
-
-    do
-    {
-        /* jump the reader forward */
-        Buffer_pointer index(cache.reader);
-        index.complete = (index.complete + total) % _size;
-
-        if (update(cache.reader, index))
-            break;
-    }
-    while (true);
-
-//    fprintf(stderr, "%p> read end: %d [%d]\n", this, _reader, _reader_partial);
-
-    return true;
-}
-
-/********** PARTIAL BUFFER FUNCTIONS (bytes) ***********/
-
-/* writes everything or nothing */
-bool Ringbuffer_traits::traits_provide_partial(char * buffer, const char * value, unsigned int amount)
-{
-    /* avoid using different values */
-    Buffer_table cache = _pointers;
-
-    const unsigned int reader = (cache.reader.complete * _block) + cache.reader.partial;
-    const unsigned int writer = ((cache.writer.complete - 1) * _block) + cache.writer.partial;
-
-    const unsigned int size = _size * _block;
-    const unsigned int dest = writer - 1;
-
-//    fprintf(stderr, "%p> provide partial: %d/%d [%d/%d]\n", this, reader, writer, amount, size);
-
-    const bool reader_less = reader < writer;
-
-    /* should we go around the buffer for writing? */
-    if (reader_less && ((writer + amount) > size))
-    {
-        /* Documentation of the formula used in the 'if' below.
-         *
-         * [0|1|2|3|4|5|6|7] => size=8
-         *      |   |
-         *  reader  |
-         *         writer
-         *
-         * => writer has places [5,6,7,0,1] to write (5 places).
-         *
-         * =>  8 - (4-2+1) = 8 - (2+1) = 8 - 3 = 5
-         *
-         * > writer goes 1 up, amount goes 1 down.
-         * > reader goes 1 up, amount goes 1 up.
-         * > size goes 1 down, amount goes 1 down.
-         *
-         */
-
-        if ((size - (writer - reader + 1)) <= amount)
-            return false;
-
-        unsigned int wr1 = size - writer + 1; /* writer is already 1 position after */
-        unsigned int wr2 = amount - wr1;
-
-//        fprintf(stderr, "%p> p partial write: (%d/%d) %d/%d [%d/%d]\n", this, wr1, wr2, amount, size, reader, writer);
-
-        /* two partial writes (one at the end, another at the beginning) */
-        memcpy((void *) &(buffer[dest]), (const void *)  (value),      wr1);
-        memcpy((void *)  (buffer),       (const void *) &(value[wr1]), wr2);
-    }
-    else
-    {
-        if (!reader_less && ((reader - writer) <= amount))
-            return false;
-
-//        fprintf(stderr, "%p> p full write: %d/%d [r=%d/w=%d]\n", this, amount, size, reader, writer);
-
-        /* we are talking about buffers here, man! */
-        memcpy((void *) &(buffer[dest]), (const void *) value, amount);
-    }
-
-    unsigned int new_writer = ((dest + amount) % size) + 1;
-
-    /* update "full length position" */
-    _pointers.writer.complete = (unsigned int)floor((double) new_writer / (double)_block)+1;
-    _pointers.writer.partial  = (unsigned short)(new_writer % _block);
-
-//    fprintf(stderr, "%p> p write end: %d [block=%d]\n", this, new_writer, _block);
-
-    return true;
-}
-
-/* returns the number of bytes that have been read */
-unsigned int Ringbuffer_traits::traits_consume_partial(const char * buffer, char * value, unsigned int amount)
-{
-    /* avoid using different values */
-    Buffer_table cache = _pointers;
-
-    const unsigned int writer = ((cache.writer.complete - 1) * _block) + cache.writer.partial;
-    const unsigned int reader = (cache.reader.complete * _block) + cache.reader.partial;
-
-    const unsigned int size = _size * _block;
-
-//    fprintf(stderr, "%p> consume partial: %d/%d [%d/%d]\n", this, reader, writer, amount, size);
-
-    const bool writer_less = writer < reader;
-
-    unsigned int total = 0;
-
-    /* should we go around the buffer for reading? */
-    if (writer_less && (reader + amount >= size))
-    {
-        total = std::min(size - (reader - writer + 1), amount);
-
-        if (total == 0)
-            return 0;
-
-        unsigned int rd1 = size - reader;
-        unsigned int rd2 = total - rd1;
-
-//        fprintf(stderr, "%p> p partial read: (%d/%d) %d/%d [%d/%d]\n", this, rd1, rd2, total, size, reader, writer);
-
-        /* two partial consumes (one at the end, another at the beginning) */
-        memcpy((void *)  (value),      (const void *) &(buffer[reader]), rd1);
-        memcpy((void *) &(value[rd1]), (const void *)  (buffer),         rd2);
-    }
-    else
-    {
-        total = std::min((writer_less ? amount : writer - (reader + 1)), amount);
-
-        if (total == 0)
-            return 0;
-
-//        fprintf(stderr, "%p> p full read: %d/%d [r=%d/w=%d]\n", this, total, size, reader, writer);
-
-        /* we are talking about buffers here, man! */
-        memcpy((void *) value, (const void *) &(buffer[reader]), total);
-    }
-
-    do
-    {
-        unsigned int new_reader = (((cache.reader.complete * _block) + cache.reader.partial) + total) % size;
-
-        /* jump the reader forward */
-        Buffer_pointer index((unsigned int)floor((double)new_reader / (double)_block),
-            (unsigned short)(new_reader % _block));
-
-        if (update(cache.reader, index))
-        {
-//            fprintf(stderr, "%p> p read end: %d [block=%d]\n", this, new_reader, _block);
-            break;
-        }
-    }
-    while (true);
-
-    return total;
-}
-
-
-
-/********** IO FUNCTIONS **********/
-
-/* returns the number of items written to from buffer to stream */
-unsigned int Ringbuffer_traits::traits_put(const char * buffer, std::ostream &fd, unsigned int amount)
-{
-    /* avoid using different values */
-    Buffer_table cache = _pointers;
-
-    const unsigned int reader = cache.reader.complete;
-    const unsigned int writer = cache.writer.complete;
-
-    const bool writer_less = writer < reader;
-
-    unsigned int total = 0;
-
-    /* should we go around the buffer for reading? */
-    if (writer_less && (reader + amount >= _size))
-    {
-        total = std::min(_size - (reader - writer + 1), amount);
-
-        if (total == 0)
-            return 0;
-
-        unsigned int rd1 = _size - reader;
-        unsigned int rd2 = total - rd1;
-
-//        fprintf(stderr, "%p> partial read: (%d/%d) %d/%d [%d/%d]\n", this, rd1, rd2, total, _size, reader, writer);
-
-        /* two partial consumes (one at the end, another at the beginning) */
-        fd.write((const char *) &(buffer[reader]), _block * rd1);
-        fd.write((const char *)  (buffer),         _block * rd2);
-    }
-    else
-    {
-        total = std::min((!writer_less ? writer - (reader + 1) : amount), amount);
-
-        if (total == 0)
-            return 0;
-
-//        fprintf(stderr, "%p> full read: %d/%d [%d/%d]\n", this, total, _size, reader, writer);
-
-        /* we are talking about buffers here, man! */
-        fd.write((const char *) &(buffer[reader]), _block * total);
-    }
-
-    do
-    {
-        /* jump the reader forward */
-        Buffer_pointer index(cache.reader);
-        index.complete = (index.complete + total) % _size;
-
-        if (update(cache.reader, index))
-            break;
-    }
-    while (true);
-
-    return total;
-}
-
-/* returns number of items read from stream to buffer */
-unsigned int Ringbuffer_traits::traits_get(char * buffer, std::istream &fd, unsigned int amount)
-{
-    /* avoid using different values */
-    Buffer_table cache = _pointers;
-
-    const unsigned int reader = cache.reader.complete;
-    const unsigned int writer = cache.writer.complete;
-
-    const unsigned int dest = writer - 1;
-
-    const bool reader_less = reader < writer;
-
-    unsigned int real_amount = 0;
-
-    /* should we go around the buffer for writing? */
-    if (reader_less && ((writer + amount) > _size))
-    {
-        /* Documentation of the formula used in the 'if' below.
-         *
-         * [0|1|2|3|4|5|6|7] => size=8
-         *      |   |
-         *  reader  |
-         *         writer
-         *
-         * => writer has places [5,6,7,0,1] to write (5 places).
-         *
-         * =>  8 - (4-2+1) = 8 - (2+1) = 8 - 3 = 5
-         *
-         * > writer goes 1 up, amount goes 1 down.
-         * > reader goes 1 up, amount goes 1 up.
-         * > size goes 1 down, amount goes 1 down.
-         *
-         */
-
-        if ((_size - (writer - reader + 1)) <= amount)
-            return false;
-
-        unsigned int wr1 = _size - writer + 1; /* writer is already 1 position after */
-        unsigned int wr2 = amount - wr1;
-
-//        fprintf(stderr, "%p> partial write: (%d/%d) %d/%d [%d/%d]\n", this, wr1, wr2, amount, _size, reader, writer);
-
-        unsigned int char_amount = 0;
-
-        /* one partial write on the buffer (at the end) */
-        fd.read((char *) &(buffer[dest]), _block * wr1);
-        char_amount += fd.gcount();
-
-        if (fd.gcount() == (int)(_block * wr1))
-        {
-            /* another partial write on the buffer (at the beginning) */
-            fd.read((char *) (buffer), _block * wr2);
-            char_amount += fd.gcount();
-        }
-
-        real_amount = char_amount / _block;
-    }
-    else
-    {
-        if (!reader_less && ((reader - writer) <= amount))
-            return false;
-
-//        fprintf(stderr, "%p> full write: %d/%d [%d/%d]\n", this, amount, _size, reader, writer);
-
-        /* we are talking about buffers here, man! */
-        fd.read((char *) &(buffer[dest]), _block * amount);
-
-        real_amount = fd.gcount() / _block;
-    }
-
-    _pointers.writer.complete = ((dest + real_amount) % _size) + 1;
-    _pointers.writer.partial  = 1;
-
-    return real_amount;
-}
diff --git a/src/mod/endpoints/mod_khomp/commons/tools/generate-verbose-headers.sh b/src/mod/endpoints/mod_khomp/commons/tools/generate-verbose-headers.sh
new file mode 100755
index 0000000000..7b9012baea
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/commons/tools/generate-verbose-headers.sh
@@ -0,0 +1,183 @@
+#!/bin/sh
+
+cut_defines ()
+{
+    cut -b9- | cut -f1 | cut -d' ' -f1
+}
+
+list_commands ()
+{
+    egrep -h 'define.+CM_' "$@" | cut_defines
+}
+
+list_events ()
+{
+    # list and remove deprecations
+    egrep -h 'define.+EV_' "$@" | cut_defines | \
+        grep -v 'EV_CALL_PROGRESS\|EV_FAX_MESSAGE_CONFIRMATION'
+}
+
+make_enumeration_one_by_one ()
+{
+    while read line
+    do
+        local size=$[50 - $(expr length "${line}")]
+
+        echo -n "        K_${line}"
+
+        for ((i=0;i<size;i++))
+        do
+            echo -n " "
+        done
+
+        echo "= ${line},"
+    done
+}
+
+make_enumeration ()
+{
+    local name="$1"; shift
+    local func="$1"; shift
+
+    echo "    typedef enum"
+    echo "    {"
+    "${func}" "$@" | make_enumeration_one_by_one
+    echo "    }"
+    echo "    ${name};"
+}
+
+make_switch_case_one_by_one ()
+{
+    while read line
+    do
+        local size=$[50 - $(expr length "${line}")]
+
+        echo -n "        case K_${line}:"
+
+        for ((i=0;i<size;i++))
+        do
+            echo -n " "
+        done
+
+        echo "return \"${line}\";"
+    done
+}
+
+make_switch_case ()
+{
+    local type="$1"; shift
+    local name="$1"; shift
+    local func="$1"; shift
+
+    echo "std::string VerboseTraits::${name}Name(const ${type} value)"
+    echo "{"
+    echo "    switch(value)"
+    echo "    {"
+    "${func}" "$@" | make_switch_case_one_by_one
+    echo "    }"
+    echo "    return STG(FMT(\"${name}=%d\") % ((int)value));"
+    echo "}"
+}
+
+make_license ()
+{
+    echo '/*'
+    echo '    KHOMP generic endpoint/channel library.'
+    echo '    Copyright (C) 2007-2010 Khomp Ind. & Com.'
+    echo ''
+    echo '  The contents of this file are subject to the Mozilla Public License Version 1.1'
+    echo '  (the "License"); you may not use this file except in compliance with the'
+    echo '  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/'
+    echo ''
+    echo '  Software distributed under the License is distributed on an "AS IS" basis,'
+    echo '  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for'
+    echo '  the specific language governing rights and limitations under the License.'
+    echo ''
+    echo '  Alternatively, the contents of this file may be used under the terms of the'
+    echo '  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which'
+    echo '  case the provisions of "LGPL License" are applicable instead of those above.'
+    echo ''
+    echo '  If you wish to allow use of your version of this file only under the terms of'
+    echo '  the LGPL License and not to allow others to use your version of this file under'
+    echo '  the MPL, indicate your decision by deleting the provisions above and replace them'
+    echo '  with the notice and other provisions required by the LGPL License. If you do not'
+    echo '  delete the provisions above, a recipient may use your version of this file under'
+    echo '  either the MPL or the LGPL License.'
+    echo ''
+    echo '  The LGPL header follows below:'
+    echo ''
+    echo '    This library is free software; you can redistribute it and/or'
+    echo '    modify it under the terms of the GNU Lesser General Public'
+    echo '    License as published by the Free Software Foundation; either'
+    echo '    version 2.1 of the License, or (at your option) any later version.'
+    echo ''
+    echo '    This library is distributed in the hope that it will be useful,'
+    echo '    but WITHOUT ANY WARRANTY; without even the implied warranty of'
+    echo '    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU'
+    echo '    Lesser General Public License for more details.'
+    echo ''
+    echo '    You should have received a copy of the GNU Lesser General Public License'
+    echo '    along with this library; if not, write to the Free Software Foundation, Inc.,'
+    echo '    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA'
+    echo ''
+    echo '*/'
+
+    echo "/* ****************************************************************************** */"
+    echo "/* ******************* AUTO GENERATED FILE - DO NOT EDIT! *********************** */"
+    echo "/* ****************************************************************************** */"
+    echo
+}
+
+make_header ()
+{
+    make_license
+
+    echo "#ifndef _VERBOSE_TRAITS_H_"
+    echo "#define _VERBOSE_TRAITS_H_"
+    echo
+    echo "#include <string>"
+    echo
+    echo "#include <format.hpp>"
+    echo
+    echo "#include <k3l.h>"
+    echo
+    echo "struct VerboseTraits"
+    echo "{"
+    make_enumeration "Command" list_commands "$@" || return 1
+    echo
+    make_enumeration "Event"   list_events   "$@" || return 1
+    echo
+    echo "    static std::string   eventName(const Event);"
+    echo "    static std::string commandName(const Command);"
+    echo "};"
+    echo
+    echo "#endif /* _VERBOSE_TRAITS_H_ */"
+}
+
+make_source ()
+{
+    make_license
+
+    echo "#include <verbose_traits.hpp>"
+    echo
+
+    make_switch_case "Event"   "event"   list_events   "$@" || return 1
+    echo
+    make_switch_case "Command" "command" list_commands "$@" || return 1
+}
+
+make_run ()
+{
+    local destdir="$1"; shift
+
+    if [ ! -d "${destdir}" ]
+    then
+        echo "ERROR: First argument is not a directory!"
+        return 1
+    fi
+
+    make_header "$@" > "${destdir}/verbose_traits.hpp"
+    make_source "$@" > "${destdir}/verbose_traits.cpp"
+}
+
+make_run "$@"
diff --git a/src/mod/endpoints/mod_khomp/commons/verbose.hpp b/src/mod/endpoints/mod_khomp/commons/verbose.hpp
deleted file mode 100644
index 4668ea6a9f..0000000000
--- a/src/mod/endpoints/mod_khomp/commons/verbose.hpp
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
-    KHOMP generic endpoint/channel library.
-    Copyright (C) 2007-2009 Khomp Ind. & Com.
-
-  The contents of this file are subject to the Mozilla Public License Version 1.1
-  (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.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-  the specific language governing rights and limitations under the License.
-
-  Alternatively, the contents of this file may be used under the terms of the
-  "GNU Lesser General Public License 2.1" license (the “LGPL" License), in which
-  case the provisions of "LGPL License" are applicable instead of those above.
-
-  If you wish to allow use of your version of this file only under the terms of
-  the LGPL License and not to allow others to use your version of this file under
-  the MPL, indicate your decision by deleting the provisions above and replace them
-  with the notice and other provisions required by the LGPL License. If you do not
-  delete the provisions above, a recipient may use your version of this file under
-  either the MPL or the LGPL License.
-
-  The LGPL header follows below:
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this library; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#include <string>
-#include <sstream>
-#include <map>
-
-#include <k3l.h>
-
-// k3lApiMajorVersion
-#ifndef CM_PING
-# include <k3lVersion.h>
-# include <KTools.h>
-#endif
-
-#include <types.hpp>
-#include <k3lapi.hpp>
-#include <format.hpp>
-
-#ifndef _VERBOSE_HPP_
-#define _VERBOSE_HPP_
-
-struct Verbose
-{
-    typedef enum
-    {
-        K_CM_SEIZE                           = CM_SEIZE,
-        K_CM_SYNC_SEIZE                      = CM_SYNC_SEIZE,
-#if K3L_AT_LEAST(1,6,0)
-        K_CM_SIP_REGISTER                    = CM_SIP_REGISTER,
-#endif
-        K_CM_DIAL_DTMF                       = CM_DIAL_DTMF,
-        K_CM_DISCONNECT                      = CM_DISCONNECT,
-        K_CM_CONNECT                         = CM_CONNECT,
-        K_CM_PRE_CONNECT                     = CM_PRE_CONNECT,
-        K_CM_CAS_CHANGE_LINE_STT             = CM_CAS_CHANGE_LINE_STT,
-        K_CM_CAS_SEND_MFC                    = CM_CAS_SEND_MFC,
-        K_CM_SET_FORWARD_CHANNEL             = CM_SET_FORWARD_CHANNEL,
-        K_CM_CAS_SET_MFC_DETECT_MODE         = CM_CAS_SET_MFC_DETECT_MODE,
-        K_CM_DROP_COLLECT_CALL               = CM_DROP_COLLECT_CALL,
-        K_CM_MAKE_CALL                       = CM_MAKE_CALL,
-        K_CM_RINGBACK                        = CM_RINGBACK,
-        K_CM_USER_INFORMATION                = CM_USER_INFORMATION,
-#if !K3L_AT_LEAST(2,2,0)
-        K_CM_VOIP_SEIZE                      = CM_VOIP_SEIZE, //deprecated
-#endif
-        K_CM_LOCK_INCOMING                   = CM_LOCK_INCOMING,
-        K_CM_UNLOCK_INCOMING                 = CM_UNLOCK_INCOMING,
-        K_CM_LOCK_OUTGOING                   = CM_LOCK_OUTGOING,
-        K_CM_UNLOCK_OUTGOING                 = CM_UNLOCK_OUTGOING,
-        K_CM_START_SEND_FAIL                 = CM_START_SEND_FAIL,
-        K_CM_STOP_SEND_FAIL                  = CM_STOP_SEND_FAIL,
-        K_CM_END_OF_NUMBER                   = CM_END_OF_NUMBER,
-#if K3L_AT_LEAST(1,6,0)
-        K_CM_SS_TRANSFER                     = CM_SS_TRANSFER,
-        K_CM_GET_SMS                         = CM_GET_SMS,
-        K_CM_PREPARE_SMS                     = CM_PREPARE_SMS,
-        K_CM_SEND_SMS                        = CM_SEND_SMS,
-#endif
-#if K3L_HAS_MPTY_SUPPORT
-        K_CM_HOLD_SWITCH                     = CM_HOLD_SWITCH,
-        K_CM_MPTY_CONF                       = CM_MPTY_CONF,
-        K_CM_MPTY_SPLIT                      = CM_MPTY_SPLIT,
-#endif
-        K_CM_ENABLE_DTMF_SUPPRESSION         = CM_ENABLE_DTMF_SUPPRESSION,
-        K_CM_DISABLE_DTMF_SUPPRESSION        = CM_DISABLE_DTMF_SUPPRESSION,
-        K_CM_ENABLE_AUDIO_EVENTS             = CM_ENABLE_AUDIO_EVENTS,
-        K_CM_DISABLE_AUDIO_EVENTS            = CM_DISABLE_AUDIO_EVENTS,
-        K_CM_ENABLE_CALL_PROGRESS            = CM_ENABLE_CALL_PROGRESS,
-        K_CM_DISABLE_CALL_PROGRESS           = CM_DISABLE_CALL_PROGRESS,
-        K_CM_FLASH                           = CM_FLASH,
-        K_CM_ENABLE_PULSE_DETECTION          = CM_ENABLE_PULSE_DETECTION,
-        K_CM_DISABLE_PULSE_DETECTION         = CM_DISABLE_PULSE_DETECTION,
-        K_CM_ENABLE_ECHO_CANCELLER           = CM_ENABLE_ECHO_CANCELLER,
-        K_CM_DISABLE_ECHO_CANCELLER          = CM_DISABLE_ECHO_CANCELLER,
-        K_CM_ENABLE_AGC                      = CM_ENABLE_AGC,
-        K_CM_DISABLE_AGC                     = CM_DISABLE_AGC,
-        K_CM_ENABLE_HIGH_IMP_EVENTS          = CM_ENABLE_HIGH_IMP_EVENTS,
-        K_CM_DISABLE_HIGH_IMP_EVENTS         = CM_DISABLE_HIGH_IMP_EVENTS,
-#if K3L_AT_LEAST(1,6,0)
-        K_CM_ENABLE_CALL_ANSWER_INFO         = CM_ENABLE_CALL_ANSWER_INFO,
-        K_CM_DISABLE_CALL_ANSWER_INFO        = CM_DISABLE_CALL_ANSWER_INFO,
-#endif
-        K_CM_RESET_LINK                      = CM_RESET_LINK,
-#if K3L_AT_LEAST(1,6,0)
-        K_CM_CLEAR_LINK_ERROR_COUNTER        = CM_CLEAR_LINK_ERROR_COUNTER,
-#endif
-        K_CM_SEND_DTMF                       = CM_SEND_DTMF,
-        K_CM_STOP_AUDIO                      = CM_STOP_AUDIO,
-        K_CM_HARD_RESET                      = CM_HARD_RESET,
-        K_CM_SEND_TO_CTBUS                   = CM_SEND_TO_CTBUS,
-        K_CM_RECV_FROM_CTBUS                 = CM_RECV_FROM_CTBUS,
-        K_CM_SETUP_H100                      = CM_SETUP_H100,
-        K_CM_MIXER                           = CM_MIXER,
-        K_CM_CLEAR_MIXER                     = CM_CLEAR_MIXER,
-        K_CM_PLAY_FROM_FILE                  = CM_PLAY_FROM_FILE,
-        K_CM_RECORD_TO_FILE                  = CM_RECORD_TO_FILE,
-        K_CM_PLAY_FROM_STREAM                = CM_PLAY_FROM_STREAM,
-        K_CM_INTERNAL_PLAY                   = CM_INTERNAL_PLAY,
-        K_CM_STOP_PLAY                       = CM_STOP_PLAY,
-        K_CM_STOP_RECORD                     = CM_STOP_RECORD,
-        K_CM_PAUSE_PLAY                      = CM_PAUSE_PLAY,
-        K_CM_PAUSE_RECORD                    = CM_PAUSE_RECORD,
-        K_CM_RESUME_PLAY                     = CM_RESUME_PLAY,
-        K_CM_RESUME_RECORD                   = CM_RESUME_RECORD,
-        K_CM_INCREASE_VOLUME                 = CM_INCREASE_VOLUME,
-        K_CM_DECREASE_VOLUME                 = CM_DECREASE_VOLUME,
-        K_CM_LISTEN                          = CM_LISTEN,
-        K_CM_STOP_LISTEN                     = CM_STOP_LISTEN,
-        K_CM_PREPARE_FOR_LISTEN              = CM_PREPARE_FOR_LISTEN,
-        K_CM_PLAY_SOUND_CARD                 = CM_PLAY_SOUND_CARD,
-        K_CM_STOP_SOUND_CARD                 = CM_STOP_SOUND_CARD,
-        K_CM_MIXER_CTBUS                     = CM_MIXER_CTBUS,
-        K_CM_PLAY_FROM_STREAM_EX             = CM_PLAY_FROM_STREAM_EX,
-        K_CM_INTERNAL_PLAY_EX                = CM_INTERNAL_PLAY_EX,
-        K_CM_ENABLE_PLAYER_AGC               = CM_ENABLE_PLAYER_AGC,
-        K_CM_DISABLE_PLAYER_AGC              = CM_DISABLE_PLAYER_AGC,
-        K_CM_START_STREAM_BUFFER             = CM_START_STREAM_BUFFER,
-        K_CM_ADD_STREAM_BUFFER               = CM_ADD_STREAM_BUFFER,
-        K_CM_STOP_STREAM_BUFFER              = CM_STOP_STREAM_BUFFER,
-        K_CM_SEND_BEEP                       = CM_SEND_BEEP,
-        K_CM_SEND_BEEP_CONF                  = CM_SEND_BEEP_CONF,
-        K_CM_ADD_TO_CONF                     = CM_ADD_TO_CONF,
-        K_CM_REMOVE_FROM_CONF                = CM_REMOVE_FROM_CONF,
-        K_CM_RECORD_TO_FILE_EX               = CM_RECORD_TO_FILE_EX,
-        K_CM_SET_VOLUME                      = CM_SET_VOLUME,
-        K_CM_SET_LINE_CONDITION              = CM_SET_LINE_CONDITION,
-        K_CM_SEND_LINE_CONDITION             = CM_SEND_LINE_CONDITION,
-        K_CM_SET_CALLER_CATEGORY             = CM_SET_CALLER_CATEGORY,
-        K_CM_DIAL_MFC                        = CM_DIAL_MFC,
-#if !K3L_AT_LEAST(2,0,0)
-        K_CM_VOIP_START_DEBUG                = CM_VOIP_START_DEBUG,
-        K_CM_VOIP_STOP_DEBUG                 = CM_VOIP_STOP_DEBUG,
-        K_CM_VOIP_DUMP_STAT                  = CM_VOIP_DUMP_STAT,
-        K_CM_ISDN_DEBUG                      = CM_ISDN_DEBUG,
-        K_CM_PING                            = CM_PING,
-        K_CM_LOG_REQUEST                     = CM_LOG_REQUEST,
-        K_CM_LOG_CREATE_DISPATCHER           = CM_LOG_CREATE_DISPATCHER,
-        K_CM_LOG_DESTROY_DISPATCHER          = CM_LOG_DESTROY_DISPATCHER,
-#endif
-#if K3L_AT_LEAST(1,6,0)
-        K_CM_START_CADENCE                   = CM_START_CADENCE,
-        K_CM_STOP_CADENCE                    = CM_STOP_CADENCE,
-        K_CM_CHECK_NEW_SMS                   = CM_CHECK_NEW_SMS,
-        K_CM_SEND_TO_MODEM                   = CM_SEND_TO_MODEM,
-#endif
-#if K3L_AT_LEAST(2,1,0)
-        K_CM_START_FAX_TX                    = CM_START_FAX_TX,
-        K_CM_STOP_FAX_TX                     = CM_STOP_FAX_TX,
-        K_CM_ADD_FAX_FILE                    = CM_ADD_FAX_FILE,
-        K_CM_ADD_FAX_PAGE_BREAK              = CM_ADD_FAX_PAGE_BREAK,
-        K_CM_START_FAX_RX                    = CM_START_FAX_RX,
-        K_CM_STOP_FAX_RX                     = CM_STOP_FAX_RX,
-        K_CM_SIM_CARD_SELECT                 = CM_SIM_CARD_SELECT,
-#endif
-
-#if K3L_AT_LEAST(2,1,0)
-        K_CM_NOTIFY_WATCHDOG                = CM_NOTIFY_WATCHDOG,
-        K_CM_STOP_WATCHDOG                  = CM_STOP_WATCHDOG,
-        K_CM_WATCHDOG_COUNT                 = CM_WATCHDOG_COUNT,
-        K_CM_START_WATCHDOG                 = CM_START_WATCHDOG,
-#endif
-
-    }
-    kcommand;
-
-    typedef enum
-    {
-        K_EV_CHANNEL_FREE                    = EV_CHANNEL_FREE,
-        K_EV_CONNECT                         = EV_CONNECT,
-        K_EV_DISCONNECT                      = EV_DISCONNECT,
-        K_EV_CALL_SUCCESS                    = EV_CALL_SUCCESS,
-        K_EV_CALL_FAIL                       = EV_CALL_FAIL,
-        K_EV_NO_ANSWER                       = EV_NO_ANSWER,
-        K_EV_BILLING_PULSE                   = EV_BILLING_PULSE,
-        K_EV_SEIZE_SUCCESS                   = EV_SEIZE_SUCCESS,
-        K_EV_SEIZE_FAIL                      = EV_SEIZE_FAIL,
-        K_EV_SEIZURE_START                   = EV_SEIZURE_START,
-        K_EV_CAS_LINE_STT_CHANGED            = EV_CAS_LINE_STT_CHANGED,
-        K_EV_CAS_MFC_RECV                    = EV_CAS_MFC_RECV,
-        K_EV_NEW_CALL                        = EV_NEW_CALL,
-        K_EV_USER_INFORMATION                = EV_USER_INFORMATION,
-        K_EV_DIALED_DIGIT                    = EV_DIALED_DIGIT,
-#if K3L_AT_LEAST(1,6,0)
-        K_EV_SIP_REGISTER_INFO               = EV_SIP_REGISTER_INFO,
-        K_EV_RING_DETECTED                   = EV_RING_DETECTED,
-#endif
-        K_EV_CALL_HOLD_START                 = EV_CALL_HOLD_START,
-        K_EV_CALL_HOLD_STOP                  = EV_CALL_HOLD_STOP,
-#if K3L_AT_LEAST(1,6,0)
-        K_EV_SS_TRANSFER_FAIL                = EV_SS_TRANSFER_FAIL,
-        K_EV_FLASH                           = EV_FLASH,
-#endif
-        K_EV_DTMF_DETECTED                   = EV_DTMF_DETECTED,
-        K_EV_DTMF_SEND_FINISH                = EV_DTMF_SEND_FINISH,
-        K_EV_AUDIO_STATUS                    = EV_AUDIO_STATUS,
-        K_EV_CADENCE_RECOGNIZED              = EV_CADENCE_RECOGNIZED,
-        K_EV_END_OF_STREAM                   = EV_END_OF_STREAM,
-        K_EV_PULSE_DETECTED                  = EV_PULSE_DETECTED,
-        K_EV_POLARITY_REVERSAL               = EV_POLARITY_REVERSAL,
-#if K3L_AT_LEAST(1,6,0)
-        K_EV_ISDN_PROGRESS_INDICATOR         = EV_ISDN_PROGRESS_INDICATOR,
-        K_EV_CALL_ANSWER_INFO                = EV_CALL_ANSWER_INFO,
-        K_EV_COLLECT_CALL                    = EV_COLLECT_CALL,
-        K_EV_SIP_DTMF_DETECTED               = EV_SIP_DTMF_DETECTED,
-        K_EV_RECV_FROM_MODEM                 = EV_RECV_FROM_MODEM,
-        K_EV_NEW_SMS                         = EV_NEW_SMS,
-        K_EV_SMS_INFO                        = EV_SMS_INFO,
-        K_EV_SMS_DATA                        = EV_SMS_DATA,
-        K_EV_SMS_SEND_RESULT                 = EV_SMS_SEND_RESULT,
-#endif
-#if K3L_HAS_MPTY_SUPPORT
-        K_EV_CALL_MPTY_START                 = EV_CALL_MPTY_START,
-        K_EV_CALL_MPTY_STOP                  = EV_CALL_MPTY_STOP,
-        K_EV_GSM_COMMAND_STATUS              = EV_GSM_COMMAND_STATUS,
-#endif
-        K_EV_CHANNEL_FAIL                    = EV_CHANNEL_FAIL,
-        K_EV_REFERENCE_FAIL                  = EV_REFERENCE_FAIL,
-        K_EV_INTERNAL_FAIL                   = EV_INTERNAL_FAIL,
-        K_EV_HARDWARE_FAIL                   = EV_HARDWARE_FAIL,
-        K_EV_LINK_STATUS                     = EV_LINK_STATUS,
-#if K3L_AT_LEAST(1,6,0)
-        K_EV_PHYSICAL_LINK_UP                = EV_PHYSICAL_LINK_UP,
-        K_EV_PHYSICAL_LINK_DOWN              = EV_PHYSICAL_LINK_DOWN,
-#endif
-        K_EV_CLIENT_RECONNECT                = EV_CLIENT_RECONNECT,
-        K_EV_VOIP_SEIZURE                    = EV_VOIP_SEIZURE,
-        K_EV_SEIZURE                         = EV_SEIZURE,
-
-#if K3L_AT_LEAST(2,1,0)
-        K_EV_FAX_CHANNEL_FREE                = EV_FAX_CHANNEL_FREE,
-        K_EV_FAX_FILE_SENT                   = EV_FAX_FILE_SENT,
-        K_EV_FAX_FILE_FAIL                   = EV_FAX_FILE_FAIL,
-        K_EV_FAX_MESSAGE_CONFIRMATION        = EV_FAX_MESSAGE_CONFIRMATION,
-        K_EV_FAX_TX_TIMEOUT                  = EV_FAX_TX_TIMEOUT,
-        K_EV_FAX_PAGE_CONFIRMATION           = EV_FAX_PAGE_CONFIRMATION,
-        K_EV_FAX_REMOTE_INFO                 = EV_FAX_REMOTE_INFO,
-#endif
-
-#if K3L_AT_LEAST(2,1,0)
-        K_EV_WATCHDOG_COUNT                 = EV_WATCHDOG_COUNT,
-#endif
-
-#if !K3L_AT_LEAST(2,0,0)
-        K_EV_PONG                            = EV_PONG,
-#endif
-    }
-    kevent;
-
-    typedef enum
-    {
-        R2_COUNTRY_ARG = 1,
-        R2_COUNTRY_BRA = 2,
-        R2_COUNTRY_CHI = 3,
-        R2_COUNTRY_MEX = 4,
-        R2_COUNTRY_URY = 5,
-        R2_COUNTRY_VEN = 6
-    }
-    R2CountryType;
-
-    typedef enum
-    {
-        HUMAN,
-        EXACT
-    }
-    Presentation;
-
-    /* dynamic (object) stuff */
-
-    Verbose(K3LAPI & api): _api(api) {};
-
-#if K3L_AT_LEAST(2,0,0)
-    std::string event(int32, K3L_EVENT*, R2CountryType r2_country = R2_COUNTRY_BRA,
-        Presentation fmt = HUMAN);
-#else
-    std::string event(int32, K3L_EVENT*, Presentation fmt = HUMAN);
-#endif
-
-    std::string channelStatus(int32, int32, int32, Presentation fmt = HUMAN);
-
-    /* end of dynamic (object) stuff */
-
- protected:
-    K3LAPI & _api;
-
-    /* used internally */
-    struct internal_not_found {};
-
- public:
-
-    /* static (class) stuff */
-
-    static std::string echoLocation(KEchoLocation, Presentation fmt = HUMAN);
-    static std::string echoCancellerConfig(KEchoCancellerConfig, Presentation fmt = HUMAN);
-
-#if K3L_AT_LEAST(2,0,0)
-    static std::string event(KSignaling, int32, K3L_EVENT*, R2CountryType = R2_COUNTRY_BRA,
-        Presentation fmt = HUMAN);
-#else
-    static std::string event(KSignaling, int32, K3L_EVENT*, Presentation fmt = HUMAN);
-#endif
-
-#if K3L_AT_LEAST(2,0,0)
-    static std::string command(int32, K3L_COMMAND*, R2CountryType = R2_COUNTRY_BRA,
-         Presentation fmt = HUMAN);
-    static std::string command(int32, int32, int32, const char *, R2CountryType = R2_COUNTRY_BRA,
-         Presentation fmt = HUMAN);
-#else
-    static std::string command(int32, K3L_COMMAND*, Presentation fmt = HUMAN);
-    static std::string command(int32, int32, int32, const char *, Presentation fmt = HUMAN);
-#endif
-
-
-    static std::string deviceName(KDeviceType, int32, Presentation fmt = HUMAN);
-
-    static std::string deviceType(KDeviceType, Presentation fmt = HUMAN);
-    static std::string deviceModel(KDeviceType, int32, Presentation fmt = HUMAN);
-
-    static std::string channelFeatures(int32, Presentation fmt = HUMAN);
-    static std::string signaling(KSignaling, Presentation fmt = HUMAN);
-    static std::string systemObject(KSystemObject, Presentation fmt = HUMAN);
-    static std::string mixerTone(KMixerTone, Presentation fmt = HUMAN);
-    static std::string mixerSource(KMixerSource, Presentation fmt = HUMAN);
-
-    static std::string seizeFail(KSeizeFail, Presentation fmt = HUMAN);
-
-#if K3L_AT_LEAST(2,0,0)
-    static std::string callFail(KSignaling, R2CountryType, int32, Presentation fmt = HUMAN);
-#else
-    static std::string callFail(KSignaling, int32, Presentation fmt = HUMAN);
-#endif
-
-    static std::string channelFail(KSignaling, int32, Presentation fmt = HUMAN);
-    static std::string internalFail(KInternalFail, Presentation fmt = HUMAN);
-
-    static std::string linkErrorCounter(KLinkErrorCounter, Presentation fmt = HUMAN);
-
-    static std::string linkStatus(KSignaling, int32, Presentation fmt = HUMAN);
-    static std::string channelStatus(KSignaling, int32, Presentation fmt = HUMAN);
-    static std::string callStatus(KCallStatus, Presentation fmt = HUMAN);
-    static std::string status(KLibraryStatus, Presentation fmt = HUMAN);
-
-#if K3L_AT_LEAST(2,0,0)
-    static std::string signGroupB(KSignGroupB, R2CountryType contry = R2_COUNTRY_BRA,
-        Presentation fmt = HUMAN);
-#else
-    static std::string signGroupB(KSignGroupB, Presentation fmt = HUMAN);
-#endif
-
-#if K3L_AT_LEAST(2,0,0)
-    static std::string signGroupII(KSignGroupII, R2CountryType contry = R2_COUNTRY_BRA,
-        Presentation fmt = HUMAN);
-#else
-    static std::string signGroupII(KSignGroupII, Presentation fmt = HUMAN);
-#endif
-
-    static std::string h100configIndex(KH100ConfigIndex, Presentation fmt = HUMAN);
-
-    static std::string eventName(int32);
-    static std::string commandName(int32);
-
-#if K3L_AT_LEAST(1,5,0)
-    static std::string sipFailures(KSIP_Failures, Presentation fmt = HUMAN);
-#endif
-
-#if K3L_AT_LEAST(1,5,1)
-    static std::string isdnCause(KQ931Cause, Presentation fmt = HUMAN);
-#endif
-
-#if K3L_AT_LEAST(1,5,2)
-    static std::string isdnDebug(int32, Presentation fmt = HUMAN);
-#endif
-
-#if K3L_AT_LEAST(1,6,0)
-    static std::string callStartInfo(KCallStartInfo, Presentation fmt = HUMAN);
-
-    static std::string gsmCallCause(KGsmCallCause, Presentation fmt = HUMAN);
-    static std::string gsmMobileCause(KGsmMobileCause, Presentation fmt = HUMAN);
-    static std::string gsmSmsCause(KGsmSmsCause, Presentation fmt = HUMAN);
-
-    static std::string q931ProgressIndication(KQ931ProgressIndication,
-        Presentation fmt = HUMAN);
-#endif
-
-#if K3L_AT_LEAST(2,1,0)
-    static std::string faxResult(KFaxResult code, Presentation fmt = HUMAN);
-    static std::string faxFileErrorCause(KFaxFileErrorCause code, Presentation fmt = HUMAN);
-#endif
-
-    /* end of static (class) stuff */
-
- private:
-    static std::string internal_deviceType(KDeviceType);
-    static std::string internal_deviceModel(KDeviceType, int32);
-
-#if K3L_AT_LEAST(1,5,0)
-    static std::string internal_sipFailures(KSIP_Failures, Presentation fmt = HUMAN);
-#endif
-#if K3L_AT_LEAST(1,5,1)
-    static std::string internal_isdnCause(KQ931Cause, Presentation fmt = HUMAN);
-#endif
-
-#if K3L_AT_LEAST(2,0,0)
-    static std::string internal_signGroupB(KSignGroupB, R2CountryType contry, Presentation fmt = HUMAN);
-    static std::string internal_signGroupII(KSignGroupII, R2CountryType contry, Presentation fmt = HUMAN);
-#else
-    static std::string internal_signGroupB(KSignGroupB, Presentation fmt = HUMAN);
-    static std::string internal_signGroupII(KSignGroupII, Presentation fmt = HUMAN);
-#endif
-
-#if K3L_AT_LEAST(1,6,0)
-    static std::string internal_gsmCallCause(KGsmCallCause, Presentation fmt = HUMAN);
-    static std::string internal_gsmMobileCause(KGsmMobileCause, Presentation fmt = HUMAN);
-    static std::string internal_gsmSmsCause(KGsmSmsCause, Presentation fmt = HUMAN);
-
-    static std::string internal_q931ProgressIndication(KQ931ProgressIndication, Presentation fmt = HUMAN);
-#endif
-
- private:
-    enum Type
-    {
-        DEVICE,
-        CHANNEL,
-        PLAYER,
-        MIXER,
-        LINK,
-        NONE
-    };
-
-    struct Target
-    {
-        Target(Type _type)
-        : type(_type), device(-1), object(-1)
-        {};
-
-        Target(Type _type, int32 _device)
-        : type(_type), device(_device), object(-1)
-        {};
-
-        Target(Type _type, int32 _device, int32 _object)
-        : type(_type), device(_device), object(_object)
-        {};
-
-        Type  type;
-        int32 device;
-        int32 object;
-    };
-
-    static void generate(std::string &, std::string &, Target, std::string &);
-
-    static std::string show(std::string &, std::string, Target, std::string &);
-    static std::string show(std::string &, std::string, Target);
-
-    template < typename ReturnType >
-    static ReturnType presentation(Presentation fmt, ReturnType str_exact, ReturnType str_human)
-    {
-        switch (fmt)
-        {
-            case HUMAN: return str_human;
-            case EXACT: return str_exact;
-        };
-
-        return str_exact;
-    }
-};
-
-#endif /* _VERBOSE_HPP_ */
diff --git a/src/mod/endpoints/mod_khomp/docs/Manual.html b/src/mod/endpoints/mod_khomp/docs/Manual.html
index 863ef76847..c4745700b1 100644
--- a/src/mod/endpoints/mod_khomp/docs/Manual.html
+++ b/src/mod/endpoints/mod_khomp/docs/Manual.html
@@ -37,17 +37,22 @@
 </li><li><b>context-fxs</b>: Contexto de entrada para placas FXS (o padrão é "khomp-DD-CC", onde "DD" será substituído, no momento da ligação, pelo número do dispositivo, "CC" pelo número do canal, e "SSSS" pelo número serial do dispositivo); 
 </li><li><b>context-gsm-call</b> (ou "context-gsm"): Contexto de entrada para ligações GSM (o padrão é "khomp-DD-CC", onde "DD" será substituído no momento da ligação pelo número do dispositivo, "CC" pelo número do canal, e "SSSS" pelo número serial do dispositivo); 
 </li><li><b>context-gsm-sms</b>: Contexto de entrada para SMSs (o padrão é "khomp-sms-DD-CC", onde "DD" será substituído pelo número de dispositivo, "CC" pelo número do canal, e "SSSS" pelo número serial do dispositivo);
-</li><li><b>context-pr</b>: Contexto de entrada para ligações em placas KPR (o padrão é "khomp-DD-CC", onde "DD" será substituído, no momento da ligação, pelo número do dispositivo, "CC" pelo número do canal); 
+</li><li><b>context-pr</b>: Contexto de entrada para ligações em placas KPR (o padrão é "khomp-DD-CC", onde "DD" será substituído, no momento da ligação, pelo número do dispositivo, "CC" pelo número do canal);
+</li><li><b>delay-ringback-co</b>: Define o tempo de <i>delay</i> para ativar a geração de tom de controle de chamada (<i>ringback</i>) pelo Endpoint da Khomp quando há uma indicação de <i>ringback</i>, e não há áudio sendo enviado por quem indicou a situação de controle da chamada;
+</li><li><b>delay-ringback-pbx</b>: Define o tempo de <i>delay</i> para ativar a geração de controle de chamada (<i>ringback</i>) pelo Endpoint da Khomp quando há uma indicação de <i>ringback</i>, e o áudio de controle enviado não possui nenhum tom (ou seja, está em silêncio);
 </li><li><b>disconnect-delay</b>: Define o tempo em milissegundos para realizar o processamento de um evento de desconexão, para ignorar situações onde outros equipamentos realizam o duplo atendimento para derrubar chamadas a cobrar;
+</li><li><b>drop-collect-call</b>: Ativa ("yes") ou desativa ("no") o derrubamento de chamadas à cobrar. Caso ativo, todas as chamadas à cobrar serão derrubadas não importando o que foi ajustado na variável KDropCollectCall (o valor padrão é "no");
 </li><li><b>echo-canceller</b>: Ativa ("yes") ou desativa ("no") o cancelamento de eco automático pelo Endpoint; 
+</li><li><b>flash-to-digits</b>: Define os dígitos para serem enviados quando o FLASH é detectado na FXS;
 </li><li><b>fxo-send-pre-audio</b>: Quando ativada ("yes") libera canal de áudio sainte antes da conexão da chamada em placas KFXO (o valor padrão é "yes");
+</li><li><b>fxs-digit-timeout</b>: Define o <i>timeout</i>, em segundos, entre dígitos na FXS;
 </li><li><b>fxs-global-orig</b>: Número inicial para numeração seqüencial de ramais das placas <b>KFXS</b> que não estiverem listadas na seção <b>&lt;fxs-branches&gt;</b> (a numeração segue ordem crescente por número da placa e número do canal físico) (o padrão é "0"); 
 </li><li><b>fxs-co-dialtone</b>: Seqüências de números, separados por vírgula, que disparam um tom contínuo (de central pública) em ramais FXS (ex: "0,99" faz com que, ao discar "0" ou "99", o usuário receba o tom de linha contínuo) (o padrão é vazio);
 </li><li><b>fxs-bina</b>: Quando ativada ("yes"), ligações para ramais FXS enviarão os dígitos correspondentes ao telefone de origem em sinalização BINA DTMF (o valor padrão é "no");
+</li><li><b>ignore-letter-dtmfs</b>: Define se o canal deve ignorar DTMFs incomuns detectados pela placa (A, B, C e D). Entretanto, se você necessita passar esses dígitos pela placa, você deve ajustar esta opção para "no" (o valor padrão é "yes");
 </li><li><b>input-volume</b>: Define o volume de entrada das ligações, varia de -10 a +10&nbsp;; 
 </li><li><b>kommuter-activation</b>: Define se a ativação de dispositivos kommuter encontrados no sistema será feita de forma automática ("auto"), ou de forma manual ("manual") pelo usuário, através do comando "khomp kommuter on/off"; 
 </li><li><b>kommuter-timeout</b>: Define o <i>timeout</i> (em segundos) com que os kommuters serão inicializados. Se chegarem a este <i>timeout</i> sem receberem notificação do channel, os dispositivos irão comutar para o estado "desligado". O valor mínimo é "0" , onde os links permanecerão sempre comutados no estado "ligado", e o valor máximo é "255"; 
-</li><li><b>language</b>: Define idioma para ligações nas placas Khomp; 
 </li><li><b>log-to-console</b>: Define mensagens de log que devem ser impressas na console; 
 </li><li><b>log-to-disk</b>: Define mensagens de log que devem ser salvar em disco; 
 </li><li><b>out-of-band-dtmfs</b>: Ativa ("yes") ou desativa ("no") a supressão DTMF e o envio destes out-of-band; 
@@ -55,12 +60,9 @@
 </li><li><b>pulse-forwarding</b>: Ativa ("yes") ou desativa ("no") a detecção de pulsos e a conversão dos mesmos em DTMFs; 
 </li><li><b>r2-preconnect-wait</b>: Define o tempo de espera do envio da sinalização de ringback, no protocolo R2/MFC, para iniciar o envio de áudio de silêncio. Apenas utilizado quando "r2-strict-behaviour" estiver ajustado para "no"; 
 </li><li><b>r2-strict-behaviour</b>: Ativa ("yes") ou desativa ("no") o comportamento da sinalização R2/MFC conforme a norma define. O padrão é "no", e pode ser alterado para "yes" caso seja necessário receber/enviar dados precisos da sinalização do protocolo (condição de B, por exemplo); 
-</li><li><b>ringback-delay-co</b>: Define o tempo de <i>delay</i> para ativar a geração de tom de controle de chamada (<i>ringback</i>) pelo Endpoint da Khomp quando há uma indicação de <i>ringback</i>, e não há áudio sendo enviado por quem indicou a situação de controle da chamada;
-</li><li><b>ringback-delay-pbx</b>: Define o tempo de <i>delay</i> para ativar a geração de controle de chamada (<i>ringback</i>) pelo Endpoint da Khomp quando há uma indicação de <i>ringback</i>, e o áudio de controle enviado não possui nenhum tom (ou seja, está em silêncio);
 </li><li><b>suppression-delay</b>: Ativa ("yes") ou desativa ("no") o delay necessário para supressão DTMF. Se desativado ("no"), também desativa supressão de DTMFs; 
 </li><li><b>trace</b>: Define opções de depuração. Não deve ser utilizado em produção a não ser que estritamente necessário;
 </li><li><b>user-transfer-digits</b>: Define uma seqüência de dígitos DTMF para iniciar a transferencia entre o FreeSWITCH&reg; e um outro PABX (utilizando sinalização de usuário, como QSig ou FXO FLASH);
-</li><li><b>flash-to-digits</b>: Define os dígitos para serem enviados quando o FLASH é detectado na FXS;
 </li></ul>
 <p><br />
 </p>
@@ -117,15 +119,13 @@
 <ul><li>context; 
 </li><li>input-volume; 
 </li><li>output-volume; 
-</li><li>accountcode; 
 </li><li>calleridnum; 
 </li><li>calleridname;
-</li><li>mailbox;
 </li><li>flash-to-digits.
 </li></ul>
 <p>Cada opção é separada uma da outra por um pipe "|" ou uma barra "/" e definidas após dois pontos ":", exemplo:
 </p>
-<pre> &lt;param name="200" value="language:en|context:master-branch" /&gt;
+<pre> &lt;param name="200" value="input-volume:1|context:master-branch" /&gt;
 </pre>
 <p>Para maiores informações sobre a sintaxe e exemplos, favor consultar o arquivo de configuração.
 </p><p><br />
diff --git a/src/mod/endpoints/mod_khomp/docs/Manual.pdf b/src/mod/endpoints/mod_khomp/docs/Manual.pdf
index 935b299dbc..260ba542a5 100644
Binary files a/src/mod/endpoints/mod_khomp/docs/Manual.pdf and b/src/mod/endpoints/mod_khomp/docs/Manual.pdf differ
diff --git a/src/mod/endpoints/mod_khomp/docs/README.pdf b/src/mod/endpoints/mod_khomp/docs/README.pdf
index 2b95cfaad4..13a5f5469a 100644
Binary files a/src/mod/endpoints/mod_khomp/docs/README.pdf and b/src/mod/endpoints/mod_khomp/docs/README.pdf differ
diff --git a/src/mod/endpoints/mod_khomp/docs/README_en.pdf b/src/mod/endpoints/mod_khomp/docs/README_en.pdf
index 25be8ab0b2..a88e9403d4 100644
Binary files a/src/mod/endpoints/mod_khomp/docs/README_en.pdf and b/src/mod/endpoints/mod_khomp/docs/README_en.pdf differ
diff --git a/src/mod/endpoints/mod_khomp/docs/User_Guide.html b/src/mod/endpoints/mod_khomp/docs/User_Guide.html
index eb5cfc6c4e..5d0753ae43 100644
--- a/src/mod/endpoints/mod_khomp/docs/User_Guide.html
+++ b/src/mod/endpoints/mod_khomp/docs/User_Guide.html
@@ -18,7 +18,7 @@
 <p>This step is carried out in a semi-automated way using the <b>khompwizard</b> program, a wizard that configures the basic parameters of the system boards. This wizard initializes the configuration files using information from the user when they are needed, initializing the standard settings to default values.
 </p><p>Typically, this program runs automatically after installation of the system. However, you may need to run it manually if an update is being performed, or if new cards were added to the system after installing new drivers.
 </p><p><br />
-If you need to set advanced parameters of the board and/or signaling, the program <b>k3lconfig</b> allows you to access all the available settings for each installed card. For more information about this program, check the <b><a href="http://169.254.1.3/kdevwiki/wikidocs/index.php?title=K3lconfig_-_User%27s_Guide&amp;action=edit&amp;redlink=1" class="new" title="K3lconfig - User&#39;s Guide (página não existe)">k3lconfig User's Guide</a></b>. For solving synchronization issues, check the <a href="#_Troubleshooting" title="">Troubleshooting</a> section for manual configuration of the boards.
+If you need to set advanced parameters of the board and/or signaling, the program <b>k3lconfig</b> allows you to access all the available settings for each installed card. For more information about this program, check the <b><a href="http://169.254.1.3/kdevwiki/wikidocs/index.php?title=K3lconfig_-_User%27s_Guide&amp;action=edit&amp;redlink=1" class="new" title="K3lconfig - User&#39;s Guide (página não existe)">k3lconfig User's Guide</a></b>. For solving synchronization issues, check the <a href="#Troubleshooting" title="">Troubleshooting</a> section for manual configuration of the boards.
 <br />
 </p>
 <a name="Endpoint_Configuration" id="Endpoint_Configuration"></a><h2> <span class="mw-headline"> Endpoint Configuration </span></h2>
@@ -39,16 +39,21 @@ If you need to set advanced parameters of the board and/or signaling, the progra
 </li><li><b>context-gsm-call</b> (or <b>context-gsm</b>): Context of entry for GSM boards (the default is "khomp-CC-DD", where "DD" will be replaced at the time of connection by the device number, "CC" by channel number, and "SSSS" by the device serial number);
 </li><li><b>context-gsm-sms</b>: Context for incoming SMSs (the default is "khomp-sms-CC-DD", where "DD" will be replaced by the number of device, "CC" by channel number and "SSSS" by the device's serial number);
 </li><li><b>context-pr</b>: Context for incoming connections on boards KPR (default is "khomp-CC-DD", where "DD" will be replaced at the time of connection by the device number, "CC "by channel number);
+</li><li><b>delay-ringback-co</b>: Sets the delay to enable the generation of call control tone (ringback) by the Endpoint Khomp when there is an ringback indication from signaling and there is no audio being sent by the channel which indicated the situation (local option);
+</li><li><b>delay-ringback-pbx</b>: Sets the delay to enable the generation of call control tone (ringback) by the Endpoint Khomp when there is an ringback indication, and the audio has no tone (silence) (local option);
 </li><li><b>disconnect-delay</b>: Sets the time in milliseconds to perform processing a disconnect event, to ignore situations where other equipment performing the double service to overthrow collect calls (local option);
+</li><li><b>drop-collect-call</b>: Enables/Disables the action of dropping collect calls. If enabled, all collect calls will be dropped no matter what KDropCollectCall is set to (the default value is "no");
 </li><li><b>echo-canceller</b> (former 'echocanceller): Active ("yes") or disables ("no") echo cancellation automatic Endpoint (local option);
+</li><li><b>flash-to-digits</b>: Defines the digits to be sent when the FLASH is detected on FXS channels;
 </li><li><b>fxo-send-pre-audio</b>: When enabled ("yes") releases audio channel before the outgoing call connection boards KFXO (the default value is "yes");
+</li><li><b>fxs-digit-timeout</b>: Defines the timeout, in seconds, between digits of a FXS board's extension;
 </li><li><b>fxs-global-orig</b>: Start number for sequencial branch numbering in FXS cards that are not listed in the <b>[fxs-branches]</b> section (the numbering follows ascending order from board number and physical channel number) (default is "0");
 </li><li><b>fxs-co-dialtone</b>: Sequences of numbers, separated by commas, which fires a continuous tone (of central office) in FXS branches (eg: "0,99" means that, when you dial "0" or "99", the user will hear a continuous dial tone) (default is empty);
 </li><li><b>fxs-bina</b>: When enabled ("yes"), calls to FXS lines will send digits corresponding to the source phone identification using BINA DTMF signaling (the default value is "no") (local option);
+</li><li><b>ignore-letter-dtmfs</b>: Defines if the channel should ignore some uncommon DTMF digits detected by the board (A, B, C and D). However, if you need to pass those digits througth the board, you may need to set this option to 'no' (the default value is "yes");
 </li><li><b>input-volume</b>: Sets the volume gain for incoming audio (entering the board), from -10 to +10 (local option);
 </li><li><b>kommuter-activation</b>: Sets whether to activate devices kommuter found in the system will be done automatically ("auto") by the channel, or manually ("manual") by the user through the command "khomp kommuter on/off" 
 </li><li><b>kommuter-timeout</b>: Sets the timeout (in seconds) for initializing the kommuter devices. If this timeout is reached without receiving notification of the channel, the devices will switch back to "off" condition. The minimum value is "0", where the links will always remain switched "on", and the maximum is "255";
-</li><li><b>language</b>: Set language to Khomp channel calls (local option);
 </li><li><b>log-to-console</b>: Set log messages to be printed on the console;
 </li><li><b>log-to-disk</b> (old "log"): Set log messages to be saved to disk;
 </li><li><b>out-of-band-DTMF</b> (former <b>dtmfsuppression</b>): Activate ("yes") or disables ("no") the removal and DTMF sending these out-of-band (local option);
@@ -56,12 +61,9 @@ If you need to set advanced parameters of the board and/or signaling, the progra
 </li><li><b>pulse-forwarding</b> (former 'pulsedetection): Active ("yes") or disables ("no") for the detection of pulses and converting them into DTMF (local option);
 </li><li><b>r2-preconnect-wait</b> (former 'r2preconnectwait): Sets the timeout sending the ringback signaling, protocol R2/MFC to start sending audio silence. Only used when "r2-strict-Behavior" is set to "no" (local option);
 </li><li><b>r2-strict-Behaviour</b>: Enable ("yes") or disables ("no") the behavior of signaling R2/MFC as the standard sets. The default is "no", and can be changed to "yes" if needed to receive / send data precise signaling protocol (condition B, for example) (local option);
-</li><li><b>ringback-delay-co</b>: Sets the delay to enable the generation of call control tone (ringback) by the Endpoint Khomp when there is an ringback indication from signaling and there is no audio being sent by the channel which indicated the situation (local option);
-</li><li><b>ringback-delay-pbx</b>: Sets the delay to enable the generation of call control tone (ringback) by the Endpoint Khomp when there is an ringback indication, and the audio has no tone (silence) (local option);
 </li><li><b>suppression-delay</b> (former <b>suppressiondelay</b>): Activate ("yes") or disables ("no") the delay necessary to suppress DTMF. If disabled ("no"), also disables suppression of DTMF (local option);
 </li><li><b>trace</b>: Set debugging options. Should not be used in production unless absolutely necessary;
-</li><li><b>user-transfer-digits</b>: Defines a sequence of DTMF digits to initiate the transfer between FreeSWITCH&reg; and another PBX (using user signaling, like QSig or FXO FLASH).
-</li><li><b>flash-to-digits</b>: Defines the digits to be sent when the FLASH is detected on FXS channels..
+</li><li><b>user-transfer-digits</b>: Defines a sequence of DTMF digits to initiate the transfer between FreeSWITCH&reg; and another PBX (using user signaling, like QSig or FXO FLASH);
 </li></ul>
 <p><br />
 </p>
@@ -121,15 +123,13 @@ For details, please refer to the configuration file for examples.
 <ul><li>context; 
 </li><li>input-volume; 
 </li><li>output-volume; 
-</li><li>accountcode; 
 </li><li>calleridnum; 
 </li><li>calleridname;
-</li><li>mailbox;
 </li><li>flash-to-digits.
 </li></ul>
 <p>Each option is separated from each other by a pipe "|" or a slash "/" and defined after the colon ":". Example:
 </p>
-<pre>&lt;param name="200" value="language:en|context:master-branch" /&gt;
+<pre>&lt;param name="200" value="input-volume:1|context:master-branch" /&gt;
 </pre>
 <p>For more information on the syntax and examples, please refer to the configuration file.
 </p><p>For more information visit the configuration file '<b>khomp.conf.xml'</b>.
diff --git a/src/mod/endpoints/mod_khomp/docs/User_Guide.pdf b/src/mod/endpoints/mod_khomp/docs/User_Guide.pdf
index 832596bdb2..e0c33e1c74 100644
Binary files a/src/mod/endpoints/mod_khomp/docs/User_Guide.pdf and b/src/mod/endpoints/mod_khomp/docs/User_Guide.pdf differ
diff --git a/src/mod/endpoints/mod_khomp/examples/intercept.xml b/src/mod/endpoints/mod_khomp/examples/intercept.xml
new file mode 100644
index 0000000000..5c91d7c79e
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/examples/intercept.xml
@@ -0,0 +1,26 @@
+<include>
+
+<!-- ########################### FXS Context ############################### -->
+<context name="khomp-fxs-00">
+
+  <extension name="main">
+    <condition field="destination_number" expression="^(\d{4})$">
+    <action application="set"    data="called_party_callgroup=1"/>
+    <action application="db"     data="insert/last_dial/${called_party_callgroup}/${uuid}"/>
+    <action application="bridge" data="khomp/r$1"/>
+    </condition>
+  </extension>
+
+  <extension name="intercept">
+    <condition field="destination_number" expression="^55$">
+      <action application="answer"/>
+      <action application="set"       data="intercept_unbridged_only=true"/>
+      <action application="intercept" data="${db(select/last_dial/1)}"/>
+    </condition>
+  </extension>
+
+</context>
+<!-- ####################################################################### -->
+
+</include>
+
diff --git a/src/mod/endpoints/mod_khomp/examples/transfer.xml b/src/mod/endpoints/mod_khomp/examples/transfer.xml
new file mode 100644
index 0000000000..5c66633574
--- /dev/null
+++ b/src/mod/endpoints/mod_khomp/examples/transfer.xml
@@ -0,0 +1,43 @@
+<include>
+
+<!-- ########################### FXS Context ############################### -->
+<context name="khomp-fxs-00">
+
+  <extension name="main">
+    <condition field="destination_number" expression="^(\d{4})$">
+    <action application="set"    data="continue_on_fail=true"/>
+    <action application="set"    data="dialed_extension=$1"/>
+    <action application="export" data="dialed_extension=$1"/>
+    <action application="bind_meta_app" data="1 b s execute_extension::attented_xfer XML khomp-features"/>
+    <action application="set"    data="transfer_ringback=$${hold_music}"/>
+    <action application="set"    data="call_timeout=10"/>
+    <action application="set"    data="hangup_after_bridge=true"/>
+    <action application="bridge" data="khomp/r$1"/>
+    <action application="bridge" data="sofia/external/$1@169.1.1.1"/>
+    <action application="hangup"/>
+    </condition>
+  </extension>
+
+</context>
+<!-- ####################################################################### -->
+<!-- ########################## Features ################################### -->
+<context name="khomp-features">
+
+  <extension name="attented_xfer">
+    <condition field="destination_number" expression="^attented_xfer$">
+      <action application="set"      data="continue_on_fail=true"/>
+      <action application="set"      data="ringback=${us-ring}"/>
+
+      <action application="read"     data="3 4 misc/8000/transfer1.wav attxfer_callthis 30000 #"/>
+      <action application="set"      data="origination_cancel_key=#" />
+
+      <action application="att_xfer" data="khomp/r${attxfer_callthis}"/>
+      <action application="att_xfer" data="sofia/external/${attxfer_callthis}@169.1.1.1" />
+    </condition>
+  </extension>
+
+</context>
+<!-- ####################################################################### -->
+
+</include>
+
diff --git a/src/mod/endpoints/mod_khomp/include/applications.h b/src/mod/endpoints/mod_khomp/include/applications.h
index 75f55ec5ca..21b66b2b0a 100644
--- a/src/mod/endpoints/mod_khomp/include/applications.h
+++ b/src/mod/endpoints/mod_khomp/include/applications.h
@@ -268,7 +268,7 @@ struct Transfer
             if (!(_call->_flags.check(Kflags::XFER_DIALING)))
             {
                 _call->_flags.set(Kflags::XFER_DIALING);
-                _idx_xfer_dial = Board::board(_pvt->target().device)->_timers.add(Opt::_transferdigittimeout, &userXferTimer, _pvt, TM_VAL_CALL);
+                _idx_xfer_dial = Board::board(_pvt->target().device)->_timers.add(Opt::_options._transferdigittimeout(), &userXferTimer, _pvt, TM_VAL_CALL);
             }
             else
             {
@@ -280,7 +280,7 @@ struct Transfer
         }
 
         }
-        catch (K3LAPI::invalid_device & err)
+        catch (K3LAPITraits::invalid_device & err)
         {
             LOG(ERROR, PVT_FMT(_pvt->target(), "Unable to get device: %d!") % err.device);
         }
@@ -506,7 +506,7 @@ struct Transfer<T, false>
             if (!(_call->_flags.check(Kflags::XFER_DIALING) || _call->_flags.check(Kflags::XFER_QSIG_DIALING)))
             {
                 _call->_flags.set(Kflags::XFER_DIALING);
-                _idx_xfer_dial = Board::board(_pvt->target().device)->_timers.add(Opt::_transferdigittimeout, &userXferTimer, _pvt, TM_VAL_CALL);
+                _idx_xfer_dial = Board::board(_pvt->target().device)->_timers.add(Opt::_options._transferdigittimeout(), &userXferTimer, _pvt, TM_VAL_CALL);
             }
             else
             {
@@ -530,7 +530,7 @@ struct Transfer<T, false>
         }
         
         }
-        catch (K3LAPI::invalid_device & err)
+        catch (K3LAPITraits::invalid_device & err)
         {
             LOG(ERROR, PVT_FMT(_pvt->target(), "Unable to get device: %d!") % err.device);
         }
@@ -735,6 +735,9 @@ struct Transfer<T, false>
 };
 
 /*************************** SMS **********************************************/
+#define ESL_SMS_RECEIVED "khomp::sms_received"
+#define ESL_SMS_SENT     "khomp::sms_sent"
+
 struct SMS : public Application
 {
     typedef std::list< switch_core_session_t *> OwnersList;
@@ -889,6 +892,78 @@ struct SMS : public Application
         bool        _conf;
     };
 
+    static struct _SMSEvent : public ESL
+    {
+
+        _SMSEvent() : ESL("khomp::sms") 
+        {
+            if(_events)
+            {
+                _events->push_back(ESL_SMS_RECEIVED);
+                _events->push_back(ESL_SMS_SENT);
+            }
+        }
+
+        ~_SMSEvent()
+        {
+            if(_events)
+            {
+                //Remove two from vector
+                _events->pop_back();
+                _events->pop_back();
+            }
+        }
+        
+        bool operator()(Board::KhompPvt * pvt, ReceiveData & data)
+        {
+            switch_event_t *event = create(ESL_SMS_RECEIVED);
+
+            if(!event)
+            {
+                LOG(ERROR, "Cannot create SMS ESL");
+                return false;
+            }
+
+            add(event, pvt->target());
+            add(event, "Type", data._type);
+            add(event, "From", data._from);
+            add(event, "Date", data._date);
+            add(event, "Size", data._size);
+            add(event, "Coding", data._coding);
+            add(event, "Serial", data._serial);
+            add(event, "Id", data._id);
+            add(event, "Page", data._page);
+            add(event, "Pages", data._pages);
+            add(event, "Sc_date", data._sc_date);
+            add(event, "Status", data._status);
+            add(event, "Body", data._body);
+
+            return fire(&event);
+        }
+        
+        bool operator()(Board::KhompPvt * pvt, SendData & data)
+        {
+            switch_event_t *event = create(ESL_SMS_SENT);
+
+            if(!event)
+            {
+                LOG(ERROR, "Cannot create SMS ESL");
+                return false;
+            }
+
+            add(event, pvt->target());
+            add(event, "Dest", data._dest);
+            add(event, "Body", data._body);
+            add(event, "Confirmation?", (data._conf ? "Yes" : "No"));
+
+
+            return fire(&event);
+        }
+
+
+
+    } SMSEvent;
+
     struct Request
     {
         /* "empty" constructor */
diff --git a/src/mod/endpoints/mod_khomp/include/cli.h b/src/mod/endpoints/mod_khomp/include/cli.h
index 214e2aa2d5..bb251bb16b 100644
--- a/src/mod/endpoints/mod_khomp/include/cli.h
+++ b/src/mod/endpoints/mod_khomp/include/cli.h
@@ -99,12 +99,52 @@ struct Command
     std::string usage;                 /* usage of the command, a help */
 };
 
+struct CommandXMLOutput : public Command
+{
+    void createRoot(const char *name)
+    {
+        root = switch_xml_new(name);
+    }
+
+    void insertXML(switch_xml_t xml)
+    {
+        switch_xml_insert(xml,root,0);
+    }
+
+    void clearRoot()
+    {
+        if(root) 
+        {
+            switch_xml_free(root);
+            root = NULL;
+        }
+    }
+
+    void printXMLOutput(switch_stream_handle_t *stream)
+    {
+        K::Logger::Logg2(C_CLI,stream,switch_xml_toxml(root,SWITCH_FALSE)); 
+    }
+
+    CommandXMLOutput() : root(NULL) {};
+
+    switch_xml_t root;                 /* for commands that ouput as xml */
+};
+
 struct Cli 
 {
     /* Useful definitions --------------------------------------------------- */
     typedef switch_status_t (APIFunc)(const char*, switch_core_session_t*, switch_stream_handle_t*);
     typedef std::vector<Command*> Commands;
 
+    /* Define the output types form commands */
+    typedef enum 
+    {
+        VERBOSE = 1,
+        CONCISE,
+        DETAILED,
+        XML
+    } OutputType;
+
     /* register our commands, but you must create the command function */
     static void registerCommands(APIFunc func,switch_loadable_module_interface_t **mod_int);
     
@@ -145,27 +185,31 @@ struct Cli
     /* The Commands --------------------------------------------------------- */
 
     /* khomp summary */
-    static struct _KhompSummary : public Command
+    static struct _KhompSummary : public CommandXMLOutput
     {
         _KhompSummary(bool on_cli_term = true):
-        _on_cli_term(on_cli_term)
+        CommandXMLOutput(),
+        _on_cli_term(on_cli_term),
+        xdevs(NULL)
         {
             complete_name = "summary";
 
             options.push_back("verbose");
             options.push_back("concise");
+            options.push_back("xml");
 
             brief = "Print system info.";                                            
             usage =                                                            \
 "Prints detailed info about the system like API version and \n"                \
 "boards characteristics like DSPs version.\n\n"                                \
-"Usage: khomp summary [concise]";
+"Usage: khomp summary [concise|verbose|xml]";
 
             _commands.push_back(this);
         };
 
         bool execute(int argc, char *argv[]);
-        bool _on_cli_term; /* indicates if message is sent to fs_cli */
+        bool _on_cli_term;     /* indicates if message is sent to fs_cli */
+        switch_xml_t xdevs;  /* support xml needed to help the interation */
     } KhompSummary;
 
     /* khomp show calls */
@@ -239,21 +283,22 @@ struct Cli
     } KhompChannelsUnblock;
 
     /* khomp show statistics */
-    static struct _KhompShowStatistics : public Command 
+    static struct _KhompShowStatistics : public CommandXMLOutput
     {
-        _KhompShowStatistics()
+        _KhompShowStatistics() : CommandXMLOutput(), xdevs(NULL)
         {
             complete_name = "show statistics";
 
             options.push_back("verbose");
             options.push_back("detailed");
+            options.push_back("xml");
 
             brief = "Shows statistics of the channels.";
 
             usage =                                                            \
 "Shows statistics of the channels, like number of calls incoming \n"           \
 "and outgoing, status, status time.\n\n"                                       \
-"Usage: khomp show statistics [{verbose [<board> [<channel>]]} | \n"           \
+"Usage: khomp show statistics [{{verbose|xml} [<board> [<channel>]]} | \n"     \
 "                              {detailed <board> <channel>}]\n"                \
 "\tboard   -- Number of the board (start from 0).\n"                           \
 "\tchannel -- Number of the channel (start from 0).\n"                         \
@@ -274,20 +319,22 @@ struct Cli
         bool execute(int argc, char *argv[]);
 
         /* support functions */
-        void cliStatistics(unsigned int device);
-        void cliDetailedStatistics(unsigned int device, unsigned int channel);
+        void cliStatistics(unsigned int device, OutputType output_type);
+        void cliDetailedStatistics(unsigned int device, unsigned int channel, OutputType output_type);
+        switch_xml_t xdevs;  /* support xml needed to help the interation */
 
     } KhompShowStatistics;
 
     /* khomp show channels */
-    static struct _KhompShowChannels: public Command
+    static struct _KhompShowChannels: public CommandXMLOutput
     {
-        _KhompShowChannels()
+        _KhompShowChannels() : CommandXMLOutput(), xdev(NULL)
         {
             complete_name = "show channels";
 
             options.push_back("verbose");
             options.push_back("concise");
+            options.push_back("xml");
 
             brief = "Show all channels status.";                                                                               
             usage =                                                            \
@@ -295,34 +342,40 @@ struct Cli
 "khomp API point of view.\n\n"                                                 \
 "Usage: \n"                                                                    \
 "khomp show channels [{<board> [<channel>]} | \n"                              \
-                              "{{concise|verbose} [<board> [<channel>]]}]\n"   \
+                          "{{concise|verbose|xml} [<board> [<channel>]]}]\n"   \
 "\tboard -- Number of the board (start from 0).\n"                             \
 "e.g. khomp show channels - List status of all channels of all boards.\n"      \
 "e.g. khomp show channels concise 0 - List status of all channels of \n"       \
-"                                     board 0 in a concise way.";
+"                                     board 0 in a concise way.\n"             \
+"e.g. khomp show channels xml 0     - List status of all channels of \n"       \
+"                                     board 0 in a xml structure.";
 
             _commands.push_back(this);
         };
 
         /* support function for _KhompShowChannels */
-        void showChannel(unsigned int device, bool concise, unsigned int channel);
-        void showChannels(unsigned int device, bool concise);
+        void showChannel(unsigned int device, unsigned int channel, OutputType output_type = Cli::VERBOSE);
+        void showChannels(unsigned int device, OutputType output_type = Cli::VERBOSE);
 
         bool execute(int argc, char *argv[]);
+        switch_xml_t xdev; /* support xml needed to help the interation */
+
     } KhompShowChannels;
     
     /* khomp show links */
-    static struct _KhompShowLinks: public Command
+    static struct _KhompShowLinks: public CommandXMLOutput
     {
-        _KhompShowLinks()
+        _KhompShowLinks() : CommandXMLOutput(), xdev(NULL)
         {
             complete_name = "show links";
 
             options.push_back("verbose");
             options.push_back("concise");
+            options.push_back("xml");
             options.push_back("errors");
             options.push_back("errors verbose");
             options.push_back("errors concise");
+            options.push_back("errors xml");
 
             brief = "Show E1 link(s) status/errors counters in a concise \n"   \
             "way or not.";
@@ -332,8 +385,9 @@ struct Cli
 "status/the error counters of each link on the board. It prints in \n"         \
 "a concise way for parsing facilities.\n\n"                                    \
 "Usage: \n"                                                                    \
-"khomp show links [[errors] [{<board>} | {{concise|verbose} [<board>]}]]\n"    \
+"khomp show links [[errors] [{<board>} | {{concise|verbose|xml} [<board>]}]]\n"\
 "e.g. khomp show links          - Show all links of all boards.\n"             \
+"e.g. khomp show links xml      - Show all links of all boards in xml.\n"      \
 "e.g. khomp show links errors   - Show error counters of all links of \n"      \
 "                                 all boards.\n"                               \
 "e.g. khomp show links errors 0 - Show error counters of all links of \n"      \
@@ -343,10 +397,12 @@ struct Cli
         };
 
         /* support function for _KhompShowLinks */
-        void showLinks(unsigned int device, bool concise);
-        void showErrors(unsigned int device, bool concise);
+        void showLinks(unsigned int device, OutputType output_type = Cli::VERBOSE);
+        void showErrors(unsigned int device, OutputType output_type = Cli::VERBOSE);
+        std::string getLinkStatus(int dev, int obj, Verbose::Presentation fmt);
 
         bool execute(int argc, char *argv[]);
+        switch_xml_t xdev; /* support xml needed to help the interation */
     } KhompShowLinks;
 
     /* khomp clear links */
@@ -653,24 +709,41 @@ struct Cli
         {
             complete_name = "get";
 
+            options.push_back("dialplan");
             options.push_back("echo-canceller");
+            options.push_back("auto-gain-control");
             options.push_back("out-of-band-dtmfs");
+            options.push_back("suppression-delay");
             options.push_back("auto-fax-adjustment");
+            options.push_back("fax-adjustment-timeout");
             options.push_back("pulse-forwarding");
             options.push_back("r2-strict-behaviour");
             options.push_back("r2-preconnect-wait");
-            options.push_back("native-bridge");
-            options.push_back("suppression-delay");
-            options.push_back("context-fxo");
-            options.push_back("context-fxo-alt");
-            options.push_back("context-fxs");
-            options.push_back("context-fxs-alt");
-            options.push_back("context-gsm-call");
-            options.push_back("context-gsm-call-alt");
-            options.push_back("context-gsm-sms");
             options.push_back("context-digital");
+            options.push_back("context-fxs");
+            options.push_back("context-fxo");
+            options.push_back("context-gsm-call");
+            options.push_back("context-gsm-sms");
+            options.push_back("context-pr");
+            options.push_back("log-to-console");
+            options.push_back("log-to-disk");
+            options.push_back("trace");
             options.push_back("output-volume");
             options.push_back("input-volume");
+            options.push_back("fxs-global-orig");
+            options.push_back("fxs-co-dialtone");
+            options.push_back("fxs-bina");
+            options.push_back("disconnect-delay");
+            options.push_back("delay-ringback-co");
+            options.push_back("delay-ringback-pbx");
+            options.push_back("ignore-letter-dtmfs");
+            options.push_back("fxo-send-pre-audio");
+            options.push_back("fxs-digit-timeout");
+            options.push_back("drop-collect-call");
+            options.push_back("kommuter-activation");
+            options.push_back("kommuter-timeout");
+            options.push_back("user-transfer-digits");
+            options.push_back("flash-to-digits");
 
             brief = "Get configuration options in the Khomp channel.";
 
@@ -678,36 +751,37 @@ struct Cli
 "Usage: khomp get <option>\n"                                                  \
 "<option>  -- Shown below, with a short description each.\n\n"                 \
 "Option               Description\n"                                           \
+"dialplan             Gets the Name of the dialplan module in use.\n"          \
 "echo-canceller       Gets the echo cancellation procedures if they are \n"    \
-"                     avaliable.\n"                                            \
+"                      avaliable.\n"                                           \
+"auto-gain-control    Gets the AGC procedures if they are avaliable.\n"        \
 "out-of-band-dtmfs    Gets DTMFs to be sent out-of-band (using ast_frames) \n" \
-"                     instead of in-band (audio).\n"                           \
+"                      instead of in-band (audio).\n"                          \
+"suppression-delay    Enable/disable the internal buffer for DTMF \n"          \
+"                      suppression.\n"                                         \
 "auto-fax-adjustment  Gets the automatic adjustment for FAX (mainly, \n"       \
-"                     disables the echo canceller).\n"                         \
+"                      disables the echo canceller).\n"                        \
+//"fax-adjustment-timeout"
 "pulse-forwarding     Gets the forwarding of detected pulses as DTMF tones.\n" \
 "r2-strict-behaviour  Gets the R2 protocol behavior while answering lines.\n"  \
-"r2-preconnect-wait   Sets the R2 protocol delay to pre-connect after \n"      \
-"                     sending ringback signal.\n"                              \
-"native-bridge        Enable/disable the native bridge mode for the channel.\n"\
-"suppression-delay    Enable/disable the internal buffer for DTMF \n"          \
-"                     suppression.\n"                                          \
-"context-fxo          Context (may be a template) for receiving FXO calls.\n"  \
-"context-fxo-alt      Alternative context (may be a template) for \n"          \
-"                     receiving FXO calls.\n"                                  \
-"context-fxs          Context (may be a template) for receiving FXS calls.\n"  \
-"context-fxs-alt      Alternative context (may be a template) for \n"          \
-"                     receiving FXS calls.\n"                                  \
-"context-gsm-call     Context (may be a template) for receiving GSM calls.\n"  \
-"context-gsm-call-alt Alternative context (may be a template) for \n"          \
-"                     receiving GSM calls.\n"                                  \
-"context-gsm-sms      Context (may be a template) for receiving GSM \n"        \
-"                     messages.\n"                                             \
+"r2-preconnect-wait   Gets the R2 protocol delay to pre-connect after \n"      \
+"                      sending ringback signal.\n"                             \
 "context-digital      Context (may be a template) for receiving digital \n"    \
-"                     (E1) calls.\n"                                           \
+"                      (E1) calls.\n"                                          \
+"context-fxs          Context (may be a template) for receiving FXS calls.\n"  \
+"context-fxo          Context (may be a template) for receiving FXO calls.\n"  \
+"context-gsm-call     Context (may be a template) for receiving GSM calls.\n"  \
+"context-gsm-sms      Context (may be a template) for receiving GSM \n"        \
+"                      messages.\n"                                            \
+"context-pr           Context (may be a template) for receiving calls on \n"   \
+"                      Passive Record boards.\n"                               \
+"log-to-console       Gets the logging of messages to console.\n"              \
+"log-to-disk          Gets the logging of messages to disk.\n"                 \
+"trace                Gets the low level tracing.\n"                           \
 "output-volume        Gets the volume multiplier to be applied by the \n"      \
-"                     board over the output audio.\n"                          \
+"                      board over the output audio.\n"                         \
 "input-volume         Gets the volume multiplier to be applied by the \n"      \
-"                     board over the input audio.\n\n"                         \
+"                      board over the input audio.\n\n"                        \
 "FOR ALL COMMANDS, CHECK THE DOCUMENTATION.";
 
             _commands.push_back(this);
@@ -723,24 +797,42 @@ struct Cli
         {
             complete_name = "set";
 
+            options.push_back("dialplan");
             options.push_back("echo-canceller");
+            options.push_back("auto-gain-control");
             options.push_back("out-of-band-dtmfs");
+            options.push_back("suppression-delay");
             options.push_back("auto-fax-adjustment");
+            options.push_back("fax-adjustment-timeout");
             options.push_back("pulse-forwarding");
             options.push_back("r2-strict-behaviour");
             options.push_back("r2-preconnect-wait");
-            options.push_back("native-bridge");
-            options.push_back("suppression-delay");
-            options.push_back("context-fxo");
-            options.push_back("context-fxo-alt");
-            options.push_back("context-fxs");
-            options.push_back("context-fxs-alt");
-            options.push_back("context-gsm-call");
-            options.push_back("context-gsm-call-alt");
-            options.push_back("context-gsm-sms");
             options.push_back("context-digital");
+            options.push_back("context-fxs");
+            options.push_back("context-fxo");
+            options.push_back("context-gsm-call");
+            options.push_back("context-gsm-sms");
+            options.push_back("context-pr");
+            options.push_back("log-to-console");
+            options.push_back("log-to-disk");
+            options.push_back("trace");
             options.push_back("output-volume");
             options.push_back("input-volume");
+            options.push_back("fxs-global-orig");
+            options.push_back("fxs-co-dialtone");
+            options.push_back("fxs-bina");
+            options.push_back("disconnect-delay");
+            options.push_back("delay-ringback-co");
+            options.push_back("delay-ringback-pbx");
+            options.push_back("ignore-letter-dtmfs");
+            options.push_back("fxo-send-pre-audio");
+            options.push_back("fxs-digit-timeout");
+            options.push_back("drop-collect-call");
+            options.push_back("kommuter-activation");
+            options.push_back("kommuter-timeout");
+            options.push_back("user-transfer-digits");
+            options.push_back("flash-to-digits");
+
             brief = "Ajust configuration options in the Khomp channel.";
 
             usage =                                                            \
@@ -749,36 +841,36 @@ struct Cli
 "\t<value>   -- Depends on the option. Check the documentation for \n"         \
 "\t             more info.\n\n"                                                \
 "Option               Description\n"                                           \
+"dialplan             Sets the Name of the dialplan module in use.\n"          \
 "echo-canceller       Sets the echo cancellation procedures if they are \n"    \
-"                     avaliable.\n"                                            \
+"                      avaliable.\n"                                           \
+"auto-gain-control    Sets the AGC procedures if they are avaliable.\n"        \
 "out-of-band-dtmfs    Sets DTMFs to be sent out-of-band (using ast_frames) \n" \
-"                     instead of in-band (audio).\n"                           \
+"                      instead of in-band (audio).\n"                          \
+"suppression-delay    Enable/disable the internal buffer for DTMF \n"          \
+"                      suppression.\n"                                         \
 "auto-fax-adjustment  Sets the automatic adjustment for FAX (mainly, \n"       \
-"                     disables the echo canceller).\n"                         \
+"                      disables the echo canceller).\n"                        \
 "pulse-forwarding     Sets the forwarding of detected pulses as DTMF tones.\n" \
 "r2-strict-behaviour  Sets the R2 protocol behavior while answering lines.\n"  \
 "r2-preconnect-wait   Sets the R2 protocol delay to pre-connect after \n"      \
-"                     sending ringback signal.\n"                              \
-"native-bridge        Enable/disable the native bridge mode for the channel.\n"\
-"suppression-delay    Enable/disable the internal buffer for DTMF \n"          \
-"                     suppression.\n"                                          \
-"context-fxo          Context (may be a template) for receiving FXO calls.\n"  \
-"context-fxo-alt      Alternative context (may be a template) for \n"          \
-"                     receiving FXO calls.\n"                                  \
-"context-fxs          Context (may be a template) for receiving FXS calls.\n"  \
-"context-fxs-alt      Alternative context (may be a template) for \n"          \
-"                     receiving FXS calls.\n"                                  \
-"context-gsm-call     Context (may be a template) for receiving GSM calls.\n"  \
-"context-gsm-call-alt Alternative context (may be a template) for \n"          \
-"                     receiving GSM calls.\n"                                  \
-"context-gsm-sms      Context (may be a template) for receiving GSM \n"        \
-"                     messages.\n"                                             \
+"                      sending ringback signal.\n"                             \
 "context-digital      Context (may be a template) for receiving digital \n"    \
-"                     (E1) calls.\n"                                           \
+"                      (E1) calls.\n"                                          \
+"context-fxs          Context (may be a template) for receiving FXS calls.\n"  \
+"context-fxo          Context (may be a template) for receiving FXO calls.\n"  \
+"context-gsm-call     Context (may be a template) for receiving GSM calls.\n"  \
+"context-gsm-sms      Context (may be a template) for receiving GSM \n"        \
+"                      messages.\n"                                            \
+"context-pr           Context (may be a template) for receiving calls on \n"   \
+"                      Passive Record boards.\n"                               \
+"log-to-console       Sets the logging of messages to console.\n"              \
+"log-to-disk          Sets the logging of messages to disk.\n"                 \
+"trace                Sets the low level tracing.\n"                           \
 "output-volume        Sets the volume multiplier to be applied by the \n"      \
-"                     board over the output audio.\n"                          \
+"                      board over the output audio.\n"                         \
 "input-volume         Sets the volume multiplier to be applied by the \n"      \
-"                     board over the input audio.\n\n"                         \
+"                      board over the input audio.\n\n"                        \
 "FOR ALL COMMANDS, CHECK THE DOCUMENTATION.";
 
             _commands.push_back(this);
diff --git a/src/mod/endpoints/mod_khomp/include/defs.h b/src/mod/endpoints/mod_khomp/include/defs.h
index f296882572..bcd5c3ce7b 100644
--- a/src/mod/endpoints/mod_khomp/include/defs.h
+++ b/src/mod/endpoints/mod_khomp/include/defs.h
@@ -58,10 +58,10 @@
     "%s (d=%02d,c=%03d) " msg, __SWITCH_FUNC__, dev, obj
 
 #define PVT_FMT(tgt,msg) \
-    FMT("%s (d=%02hu,c=%03hu) " msg) % __SWITCH_FUNC__ % tgt.device % tgt.object
+    FMT("%s (d=%02d,c=%03d) " msg) % __SWITCH_FUNC__ % tgt.device % tgt.object
 
 #define PVT_MSG(tgt,msg) \
-    "%s (d=%02hu,c=%03hu) " msg, __SWITCH_FUNC__, tgt.device, tgt.object
+    "%s (d=%02d,c=%03d) " msg, __SWITCH_FUNC__, tgt.device, tgt.object
 
 #define D(x) ( FMT( "%s: " x ) % __func__ )
 
diff --git a/src/mod/endpoints/mod_khomp/include/frame.h b/src/mod/endpoints/mod_khomp/include/frame.h
index 87b968bcba..8337f37b3e 100644
--- a/src/mod/endpoints/mod_khomp/include/frame.h
+++ b/src/mod/endpoints/mod_khomp/include/frame.h
@@ -97,7 +97,7 @@ struct FrameStorage
 template < int S >
 struct FrameManager: protected FrameStorage
 {
-    typedef char Packet[ S ];
+    typedef const char Packet[ S ];
 
     typedef Ringbuffer < Packet >  AudioBuffer;
 
diff --git a/src/mod/endpoints/mod_khomp/include/globals.h b/src/mod/endpoints/mod_khomp/include/globals.h
index f212d63742..a807273027 100644
--- a/src/mod/endpoints/mod_khomp/include/globals.h
+++ b/src/mod/endpoints/mod_khomp/include/globals.h
@@ -98,7 +98,9 @@ struct Globals
     static Mutex                             khomp_alloc_mutex;
 
     /* Config options class */
-    static ConfigOptions                     options;
+    static Config::Options                   options;
+
+    static const Regex::Expression           regex_allocation;
 
     /* FreeSWITCH Articular Ligaments */ 
     static switch_endpoint_interface_t     * khomp_endpoint_interface;
diff --git a/src/mod/endpoints/mod_khomp/include/khomp_pvt.h b/src/mod/endpoints/mod_khomp/include/khomp_pvt.h
index bed6e1e08e..d09be88567 100644
--- a/src/mod/endpoints/mod_khomp/include/khomp_pvt.h
+++ b/src/mod/endpoints/mod_khomp/include/khomp_pvt.h
@@ -221,6 +221,37 @@ struct KhompPvt
                 return strBuffer;
             }
 
+            switch_xml_t getDetailedXML()
+            {
+                /* very very important yet! */
+                idle();
+
+                std::string str_incoming_time = timeToString(_total_time_incoming);
+                std::string str_outgoing_time = timeToString(_total_time_outgoing);
+                std::string str_idle_time     = timeToString(_total_idle_time);
+
+                /* total */
+                switch_xml_t xtotal = switch_xml_new("total");
+
+                /* total/incoming_time */
+                switch_xml_t xin_time = switch_xml_add_child_d(xtotal,"incoming_time",0);
+                switch_xml_set_txt_d(xin_time, str_incoming_time.c_str());
+
+                /* total/outgoing_time */
+                switch_xml_t xout_time = switch_xml_add_child_d(xtotal,"outgoing_time",0);
+                switch_xml_set_txt_d(xout_time, str_outgoing_time.c_str());
+
+                /* total/idle_time */
+                switch_xml_t xidle_time = switch_xml_add_child_d(xtotal,"idle_time",0);
+                switch_xml_set_txt_d(xidle_time, str_idle_time.c_str());
+
+                /* total/channel_fails */
+                switch_xml_t xchannel_fails = switch_xml_add_child_d(xtotal,"channel_fails",0);
+                switch_xml_set_txt_d(xchannel_fails, STR(FMT("%d") % _channel_fails));
+
+                return xtotal;
+            }
+
             void clear()
             {   
                 time(&_base_time);
@@ -373,7 +404,7 @@ struct KhompPvt
 public:
 
     /* KhompPvt constructor */
-    KhompPvt(K3LAPI::target & target);
+    KhompPvt(K3LAPIBase::GenericTarget & target);
 
     /* KhompPvt destructor */
     virtual ~KhompPvt()
@@ -388,8 +419,14 @@ public:
             _pvt(pvt) {}
 
         std::string getDetailedRates();
+        switch_xml_t getDetailedRatesXML();
+
         std::string getDetailed();
+        switch_xml_t getDetailedXML();
+
         std::string getRow();
+        switch_xml_t getNode();
+
 
         void clear()
         {
@@ -569,6 +606,7 @@ public:
 
     /* statistics functions */
     virtual std::string getStatistics(Statistics::Type type);
+    virtual switch_xml_t getStatisticsXML(Statistics::Type type);
     virtual void clearStatistics()
     {
         _pvt_statistics->clear();   
@@ -649,7 +687,7 @@ public:
         return pvt_locked;
     }
 
-    K3LAPI::target & target()
+    K3LAPIBase::GenericTarget & target()
     {
         return _target;
     }
@@ -996,18 +1034,20 @@ public:
     {
         DBG(FUNC,PVT_FMT(_target,"c"));
 
+        /*
         if(!_group_context.empty())
         {
             contexts.insert(contexts.begin(), _group_context);
             //contexts.push_back(_group_context);
         }
+        */
     
         for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++) 
             replaceTemplate((*i),  "DD", _target.device);
 
         BEGIN_CONTEXT  
         {    
-            K3L_DEVICE_CONFIG & dev_cfg = Globals::k3lapi.device_config(_target.device);
+            const K3L_DEVICE_CONFIG & dev_cfg = Globals::k3lapi.device_config(_target);
 
             for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++) 
                 replaceTemplate((*i), "SSSS", atoi(dev_cfg.SerialNumber));
@@ -1048,7 +1088,7 @@ public:
 
     Call * call() { return _call; }
 
-    K3LAPI::target           _target;    /*!< The device/channel pair to bind this pvt to */
+    K3LAPIBase::GenericTarget           _target;    /*!< The device/channel pair to bind this pvt to */
     ChanLockType             _mutex;     /*!< Used for *our* internal locking */
     Call                    *_call;
     switch_core_session_t   *_session;   /*!< The session to which this pvt is associated with */
@@ -1066,6 +1106,10 @@ public:
     std::string              _group_context;
 
     PvtStatistics           *_pvt_statistics;
+
+    std::string              _mohclass;
+    std::string              _language;
+    std::string              _accountcode;
 };
 
 /******************************************************************************/
@@ -1115,7 +1159,7 @@ public:
         }
         catch (...)
         {
-            throw K3LAPI::invalid_channel(_device_id, obj);
+            throw K3LAPITraits::invalid_channel(_device_id, obj);
         }
     }
 
@@ -1141,7 +1185,7 @@ public:
             {
                 ret = channel(obj)->eventHandler(e);
             }
-            catch (K3LAPI::invalid_channel & invalid)
+            catch (K3LAPITraits::invalid_channel & invalid)
             {
                 LOG(ERROR, OBJ_FMT(_device_id,obj,"(Generic Board) r (invalid channel on event '%s')") 
                 % Verbose::eventName(e->Code).c_str());
@@ -1191,7 +1235,7 @@ public:
       \return KhompPvt to be used on the call.
       */
     static KhompPvt * find_channel(char* allocation_string, switch_core_session_t * new_session, switch_call_cause_t * cause);
-    static void khomp_add_event_board_data(const K3LAPI::target target, switch_event_t *event);
+    static void khomp_add_event_board_data(const K3LAPIBase::GenericTarget target, switch_event_t *event);
 
     static Board * board(int dev)
     {
@@ -1208,7 +1252,7 @@ public:
         }
         catch(...)
         {
-            throw K3LAPI::invalid_device(dev);
+            throw K3LAPITraits::invalid_device(dev);
         }
     }
 
@@ -1223,11 +1267,11 @@ public:
         }
         catch(...)
         {
-            throw K3LAPI::invalid_channel(device, object);
+            throw K3LAPITraits::invalid_channel(device, object);
         }
     }
 
-    static KhompPvt * get(K3LAPI::target & target)
+    static KhompPvt * get(K3LAPIBase::GenericTarget & target)
     {
         //if (!Globals::k3lapi.valid_channel(target.device, target.object))
         //    throw K3LAPI::invalid_channel(target.device, target.object);
@@ -1252,7 +1296,7 @@ public:
         {
             stats = Globals::k3lapi.channel_stats(device, object, index);
         }
-        catch(K3LAPI::invalid_channel & err)
+        catch(K3LAPITraits::invalid_channel & err)
         {
         //K::logger::logg(C_WARNING, B(dev,channel, "Command get_stats has failed with error '%s'.") %
         //                          Verbose::status((KLibraryStatus) stt_res));
diff --git a/src/mod/endpoints/mod_khomp/include/khomp_pvt_fxo.h b/src/mod/endpoints/mod_khomp/include/khomp_pvt_fxo.h
index 130c3b311e..d91705b626 100644
--- a/src/mod/endpoints/mod_khomp/include/khomp_pvt_fxo.h
+++ b/src/mod/endpoints/mod_khomp/include/khomp_pvt_fxo.h
@@ -114,7 +114,7 @@ struct KhompPvtFXO: public KhompPvt
             _call_info_report = false;
             _call_info_drop = 0;
 
-            _user_xfer_digits = Opt::_user_xfer;
+            _user_xfer_digits = Opt::_options._user_xfer_digits();
             _user_xfer_buffer.clear();
             _digits_buffer.clear();
 
@@ -141,7 +141,7 @@ struct KhompPvtFXO: public KhompPvt
         //ChanTimer::Index _idx_disconnect;        
     };
 /******************************************************************************/
-    KhompPvtFXO(K3LAPI::target & target) : KhompPvt(target) 
+    KhompPvtFXO(K3LAPIBase::GenericTarget & target) : KhompPvt(target) 
     {
         _fax = new Fax(this);
         _transfer = new Transfer<CallFXO>(this);
@@ -323,7 +323,7 @@ struct KhompPvtFXO: public KhompPvt
 
         for (unsigned obj = 0; obj < Globals::k3lapi.channel_count(_device_id); obj++)
         {
-            K3LAPI::target tgt(Globals::k3lapi, K3LAPI::target::CHANNEL, _device_id, obj);
+            K3LAPIBase::GenericTarget tgt(Globals::k3lapi, K3LAPIBase::GenericTarget::CHANNEL, _device_id, obj);
             KhompPvt * pvt;
 
             switch(Globals::k3lapi.channel_config(_device_id, obj).Signaling)
diff --git a/src/mod/endpoints/mod_khomp/include/khomp_pvt_gsm.h b/src/mod/endpoints/mod_khomp/include/khomp_pvt_gsm.h
index d31dba51cc..7467a5ed9a 100644
--- a/src/mod/endpoints/mod_khomp/include/khomp_pvt_gsm.h
+++ b/src/mod/endpoints/mod_khomp/include/khomp_pvt_gsm.h
@@ -115,7 +115,7 @@ struct KhompPvtGSM: public KhompPvt
     };
 
 /******************************************************************************/
-    KhompPvtGSM(K3LAPI::target & target) : KhompPvt(target) 
+    KhompPvtGSM(K3LAPIBase::GenericTarget & target) : KhompPvt(target) 
     {
         _sms = new SMS(this);
         command(KHOMP_LOG, CM_ENABLE_CALL_ANSWER_INFO);
@@ -278,7 +278,7 @@ struct KhompPvtGSM: public KhompPvt
 
         for (unsigned obj = 0; obj < Globals::k3lapi.channel_count(_device_id); obj++)
         {
-            K3LAPI::target tgt(Globals::k3lapi, K3LAPI::target::CHANNEL, _device_id, obj);
+            K3LAPIBase::GenericTarget tgt(Globals::k3lapi, K3LAPIBase::GenericTarget::CHANNEL, _device_id, obj);
             KhompPvt * pvt;
 
             switch(Globals::k3lapi.channel_config(_device_id, obj).Signaling)
diff --git a/src/mod/endpoints/mod_khomp/include/khomp_pvt_kxe1.h b/src/mod/endpoints/mod_khomp/include/khomp_pvt_kxe1.h
index 722bd80737..0267f33f24 100644
--- a/src/mod/endpoints/mod_khomp/include/khomp_pvt_kxe1.h
+++ b/src/mod/endpoints/mod_khomp/include/khomp_pvt_kxe1.h
@@ -122,7 +122,7 @@ struct KhompPvtE1: public KhompPvt
     
     };
 /******************************************************************************/
-    KhompPvtE1(K3LAPI::target & target) : KhompPvt(target)
+    KhompPvtE1(K3LAPIBase::GenericTarget & target) : KhompPvt(target)
     {
         _fax = new Fax(this);
         command(KHOMP_LOG,CM_ENABLE_CALL_ANSWER_INFO); 
@@ -219,7 +219,7 @@ struct KhompPvtE1: public KhompPvt
         {
             Board::board(_target.device)->_timers.del(callE1()->_idx_disconnect);
         }
-        catch (K3LAPI::invalid_device & err)
+        catch (K3LAPITraits::invalid_device & err)
         {
             LOG(ERROR, PVT_FMT(target(), "Unable to get device: %d!") % err.device);
         }
@@ -310,7 +310,7 @@ struct KhompPvtISDN: public KhompPvtE1
             _uui_information.clear();
             _isdn_cause = -1;
 
-            _user_xfer_digits = Opt::_user_xfer;
+            _user_xfer_digits = Opt::_options._user_xfer_digits();
             _user_xfer_buffer.clear();
             _digits_buffer.clear();
             _qsig_number.clear();
@@ -332,7 +332,7 @@ struct KhompPvtISDN: public KhompPvtE1
 
     };
 /******************************************************************************/
-    KhompPvtISDN(K3LAPI::target & target) : KhompPvtE1(target) 
+    KhompPvtISDN(K3LAPIBase::GenericTarget & target) : KhompPvtE1(target) 
     {
         _transfer = new Transfer<CallISDN, false>(this);
     }
@@ -496,7 +496,7 @@ struct KhompPvtR2: public KhompPvtE1
         std::string _incoming_exten;
     };
 /******************************************************************************/
-    KhompPvtR2(K3LAPI::target & target) : KhompPvtE1(target) 
+    KhompPvtR2(K3LAPIBase::GenericTarget & target) : KhompPvtE1(target) 
     {
         K3L_E1600A_FW_CONFIG dspAcfg;
 
@@ -672,7 +672,7 @@ struct KhompPvtFlash: public KhompPvtR2
         
         bool clear()
         {
-            _user_xfer_digits = Opt::_user_xfer;
+            _user_xfer_digits = Opt::_options._user_xfer_digits();
             _user_xfer_buffer.clear();
             _digits_buffer.clear();
 
@@ -686,7 +686,7 @@ struct KhompPvtFlash: public KhompPvtR2
 
     };
 /******************************************************************************/
-    KhompPvtFlash(K3LAPI::target & target) : KhompPvtR2(target) 
+    KhompPvtFlash(K3LAPIBase::GenericTarget & target) : KhompPvtR2(target) 
     {
         _transfer = new Transfer<CallFlash>(this);
     }
@@ -796,7 +796,7 @@ struct KhompPvtFXS: public KhompPvt
             }
             else if (name == "ring_cadence")
             {
-                Opt::CadencesMapType::iterator i = Opt::_cadences.find(value);
+                CadencesMapType::iterator i = Opt::_cadences.find(value);
 
                 if (i != Opt::_cadences.end())
                 {
@@ -858,11 +858,11 @@ struct KhompPvtFXS: public KhompPvt
 
     };
 /******************************************************************************/
-    KhompPvtFXS(K3LAPI::target & target) : KhompPvt(target)
+    KhompPvtFXS(K3LAPIBase::GenericTarget & target) : KhompPvt(target)
     {
        //command(KHOMP_LOG,CM_ENABLE_CALL_ANSWER_INFO);
        /* sequence numbers on FXS */
-       static Opt::OrigToNseqMapType fxs_nseq = generateNseqMap();
+       static OrigToNseqMapType fxs_nseq = generateNseqMap();
 
        load(fxs_nseq);
     }
@@ -926,7 +926,7 @@ struct KhompPvtFXS: public KhompPvt
     }
 
     bool setupConnection();
-    void load(Opt::OrigToNseqMapType & fxs_nseq);
+    void load(OrigToNseqMapType & fxs_nseq);
     void loadOptions();
     bool parseBranchOptions(std::string options_str);
     bool alloc();
@@ -991,13 +991,10 @@ struct KhompPvtFXS: public KhompPvt
     std::string _context;
     int         _input_volume;
     int         _output_volume;
-    std::string _mohclass;
-    std::string _language;
-    std::string _accountcode;
     std::string _mailbox;
     std::string _flash;
 
-    static Opt::OrigToNseqMapType generateNseqMap();
+    static OrigToNseqMapType generateNseqMap();
     static void dialTimer(KhompPvt * pvt);
     static void transferTimer(KhompPvt * pvt);
 
@@ -1044,7 +1041,7 @@ struct KhompPvtFXS: public KhompPvt
 
         for (unsigned obj = 0; obj < Globals::k3lapi.channel_count(_device_id); obj++)
         {
-            K3LAPI::target tgt(Globals::k3lapi, K3LAPI::target::CHANNEL, _device_id, obj);
+            K3LAPIBase::GenericTarget tgt(Globals::k3lapi, K3LAPIBase::GenericTarget::CHANNEL, _device_id, obj);
             KhompPvt * pvt;
 
             switch(Globals::k3lapi.channel_config(_device_id, obj).Signaling)
diff --git a/src/mod/endpoints/mod_khomp/include/khomp_pvt_passive.h b/src/mod/endpoints/mod_khomp/include/khomp_pvt_passive.h
index a0a6df0aaf..1fa23cd3ec 100644
--- a/src/mod/endpoints/mod_khomp/include/khomp_pvt_passive.h
+++ b/src/mod/endpoints/mod_khomp/include/khomp_pvt_passive.h
@@ -81,7 +81,7 @@ struct KhompPvtPassive: public KhompPvt
     };
 */
 /******************************************************************************/
-    KhompPvtPassive(K3LAPI::target & target) : KhompPvt(target) 
+    KhompPvtPassive(K3LAPIBase::GenericTarget & target) : KhompPvt(target) 
     {
     }
 
@@ -150,7 +150,7 @@ struct KhompPvtPassive: public KhompPvt
 /********************************** HI Channel ********************************/
 struct KhompPvtHI: public KhompPvtPassive
 {
-    KhompPvtHI(K3LAPI::target & target) : KhompPvtPassive(target) 
+    KhompPvtHI(K3LAPIBase::GenericTarget & target) : KhompPvtPassive(target) 
     {
     }
 
@@ -189,7 +189,7 @@ struct KhompPvtHI: public KhompPvtPassive
 /********************************* KPR Channel ********************************/
 struct KhompPvtKPR: public KhompPvtPassive
 {
-    KhompPvtKPR(K3LAPI::target & target) : KhompPvtPassive(target) 
+    KhompPvtKPR(K3LAPIBase::GenericTarget & target) : KhompPvtPassive(target) 
     {
     }
 
@@ -243,7 +243,7 @@ struct KhompPvtKPR: public KhompPvtPassive
 
         for (unsigned obj = 0; obj < Globals::k3lapi.channel_count(_device_id); obj++)
         {
-            K3LAPI::target tgt(Globals::k3lapi, K3LAPI::target::CHANNEL, _device_id, obj);
+            K3LAPIBase::GenericTarget tgt(Globals::k3lapi, K3LAPIBase::GenericTarget::CHANNEL, _device_id, obj);
             KhompPvt * pvt;
 
             switch(Globals::k3lapi.channel_config(_device_id, obj).Signaling)
diff --git a/src/mod/endpoints/mod_khomp/include/opt.h b/src/mod/endpoints/mod_khomp/include/opt.h
index 3458f9e9de..270adc7068 100644
--- a/src/mod/endpoints/mod_khomp/include/opt.h
+++ b/src/mod/endpoints/mod_khomp/include/opt.h
@@ -47,9 +47,32 @@
 #include <string>
 #include <map>
 #include <vector>
+
+#include <config_options.hpp>
+
 #include "switch.h"
 #include "utils.h"
 
+typedef std::map    < std::string, std::string >       OrigToDestMapType;
+typedef std::pair   < std::string, std::string >      OrigToDestPairType;
+typedef std::vector < std::string >                       DestVectorType;
+
+typedef std::map    < unsigned int, std::string >     BoardToOrigMapType;
+typedef std::pair   < unsigned int, std::string >    BoardToOrigPairType;
+
+typedef std::map    < std::string, unsigned int >      OrigToNseqMapType;
+typedef std::pair   < std::string, unsigned int >     OrigToNseqPairType;
+
+typedef std::pair   < unsigned int,unsigned int >           ObjectIdType;
+typedef std::pair   < std::string, ObjectIdType > BranchToObjectPairType;
+typedef std::map    < std::string, ObjectIdType >  BranchToObjectMapType;
+
+typedef std::map    < std::string, std::string >      BranchToOptMapType;
+typedef std::pair   < std::string, std::string >     BranchToOptPairType;
+
+typedef std::map    < std::string, std::string >      GroupToDestMapType;
+typedef std::pair   < std::string, std::string >     GroupToDestPairType;
+
 struct CadenceType
 {
     CadenceType(void)
@@ -67,182 +90,171 @@ struct CadenceType
     unsigned int ring_ext_s;
 };
 
-struct CSpan {
-    std::string _dialplan;
-    std::string _context;
-    std::string _dialstring;
+typedef std::pair < std::string, CadenceType > CadencesPairType;
+typedef std::map  < std::string, CadenceType >  CadencesMapType;
+
+struct Options
+{
+    Config::Value< bool >        _debug;
+    Config::Value< std::string > _dialplan;
+    Config::Value< std::string > _context;
+    
+    Config::Value< bool > _echo_canceller;
+    Config::Value< bool > _auto_gain_control;
+    Config::Value< bool > _out_of_band_dtmfs;
+    Config::Value< bool > _suppression_delay;
+    Config::Value< bool > _pulse_forwarding;
+    Config::Value< bool > _native_bridge;
+    Config::Value< bool > _recording;
+    Config::Value< bool > _has_ctbus;
+    Config::Value< bool > _fxs_bina;
+    Config::Value< bool > _fxo_send_pre_audio;
+    Config::Value< bool > _drop_collect_call;
+    Config::Value< bool > _ignore_letter_dtmfs;
+    Config::Value< bool > _optimize_audio_path;
+
+    Config::Value< bool         > _auto_fax_adjustment;
+    Config::Value< unsigned int > _fax_adjustment_timeout;
+
+    Config::Value< bool         > _r2_strict_behaviour;
+    Config::Value< unsigned int > _r2_preconnect_wait;
+
+    Config::Value< unsigned int > _fxs_digit_timeout;
+    Config::Value< unsigned int > _transferdigittimeout;
+
+    Config::Value< std::string > _flash;
+    Config::Value< std::string > _blindxfer;
+    Config::Value< std::string > _atxfer;
+
+    Config::Value< unsigned int > _ringback_co_delay;
+    Config::Value< unsigned int > _ringback_pbx_delay;
+
+    Config::Value< unsigned int > _disconnect_delay;
+
+    Config::Value< int > _input_volume;
+    Config::Value< int > _output_volume;
+
+    struct CentralOfficeDialtone : public Config::FunctionValue
+    {   
+        void operator ()(const Config::StringType &); 
+        const DestVectorType & operator()(void) const { return _value; };
+        void clear(void)
+        {   
+            _value.clear();
+        }   
+
+    protected:
+        DestVectorType _value;
+    } _fxs_co_dialtone;
+
+    struct LogDiskOption : public Config::FunctionValue
+    {
+        void operator ()(const Config::StringType &);
+    } _log_disk_option;
+
+    /*
+    struct CallGroupOption: public Config::FunctionValue
+    {   
+        void operator ()(const Config::StringType &); 
+        const std::string operator()(void) const { return _groups; };
+    protected:
+        std::string _groups;
+    } _callgroup;
+
+    struct PickupGroupOption: public Config::FunctionValue
+    { 
+        void operator ()(const Config::StringType &); 
+        const std::string operator()(void) const { return _groups; };
+    protected:
+        std::string _groups;
+    } _pickupgroup; // or intercept 
+    */
+
+    struct LogConsoleOption : public Config::FunctionValue
+    {
+        void operator ()(const Config::StringType &);
+    } _log_console_option;
+
+    struct LogTraceOption : public Config::FunctionValue
+    {
+        void operator ()(const Config::StringType &);
+    } _log_trace_option;
+
+    struct RecordPrefixOption: public Config::FunctionValue
+    {   
+        void operator ()(const Config::StringType &); 
+        const std::string & operator()(void) const { return _value; };
+
+    protected:
+        std::string _value;
+    } _record_prefix;
+
+    Config::Value< std::string > _user_xfer_digits;
+    Config::Value< std::string > _fxs_global_orig_base;
+
+    Config::Value< std::string > _global_mohclass;
+    Config::Value< std::string > _global_language;
+
+    Config::Value< std::string > _context_gsm_call;
+    Config::Value< std::string > _context2_gsm_call;
+    Config::Value< std::string > _context_gsm_sms;
+    Config::Value< std::string > _context_fxo;
+    Config::Value< std::string > _context2_fxo;
+    Config::Value< std::string > _context_fxs;
+    Config::Value< std::string > _context2_fxs;
+    Config::Value< std::string > _context_digital;
+    Config::Value< std::string > _context_pr;
+
+    Config::Value< std::string > _callgroup;
+    Config::Value< std::string > _pickupgroup; /* or intercept */
+    Config::Value< std::string > _accountcode;
+    
+    Config::Value< unsigned int > _kommuter_timeout;
+    Config::Value< std::string  > _kommuter_activation;
+
+    Config::Value< unsigned int > _audio_packet_size;
 };
 
 struct Opt
 {
-    typedef std::pair   < std::string, CadenceType >  CadencesPairType;
-    typedef std::map    < std::string, CadenceType >  CadencesMapType;
+    /* here we load [cadences] */
+    static CadencesMapType        _cadences;
 
-    typedef std::map    < std::string, std::string >  OrigToDestMapType;
-    typedef std::pair   < std::string, std::string >  OrigToDestPairType;
-    typedef std::vector < std::string >               DestVectorType;
+    /* here we load [groups] */
+    static GroupToDestMapType     _groups;
 
-    typedef std::map    < unsigned int, std::string > BoardToOrigMapType;
-    typedef std::pair   < unsigned int, std::string > BoardToOrigPairType;
+    /* here we load [fxs-hotlines] */
+    static OrigToDestMapType      _fxs_hotline;
 
-    typedef std::map    < std::string, unsigned int > OrigToNseqMapType;
-    typedef std::pair   < std::string, unsigned int > OrigToNseqPairType;
+    /* here we load [fxs-branches] */
+    static BoardToOrigMapType     _fxs_orig_base;
 
-    typedef std::pair   < unsigned int,unsigned int > ObjectIdType;
-    typedef std::pair   < std::string, ObjectIdType > BranchToObjectPairType;
-    typedef std::map    < std::string, ObjectIdType > BranchToObjectMapType;
+    /* here we load [fxs-options] */
+    static BranchToOptMapType     _branch_options;
 
-    typedef std::map    < std::string, std::string >  BranchToOptMapType;
-    typedef std::pair   < std::string, std::string >  BranchToOptPairType;
-    
-    typedef std::map    < std::string, std::string >  GroupToDestMapType;
-    typedef std::pair   < std::string, std::string >  GroupToDestPairType;
+    /* here we load ... hannnn */
+    static BranchToObjectMapType  _fxs_branch_map;
 
-    typedef std::pair   < std::string, CSpan >        SpanPairType;
-
-    typedef enum
-    {
-            GFLAG_MY_CODEC_PREFS = (1 << 0)
-    }
-    GFLAGS;
+    static Options _options;
 
+    /* Member functions */
     static void initialize(void);
     static void obtain(void);
     static void commit(void);
-    static void printConfiguration(switch_stream_handle_t*);
 
-protected:
+    //TODO: reload options at reloadxml ?
+    static void reload(void); 
 
+    protected:
     static void loadConfiguration(const char *, const char **, bool show_errors = true);
     static void cleanConfiguration(void);
-    
+
     static switch_xml_t processSimpleXML(switch_xml_t &xml, const std::string& child_name);
     static void processGroupXML(switch_xml_t &xml);
     static void processCadenceXML(switch_xml_t &xml);
     static void processFXSBranchesXML(switch_xml_t &xml);
     static void processFXSHotlines(switch_xml_t &xml);
     static void processFXSOptions(switch_xml_t &xml);
-
-public:
-    static bool                            _debug;
-    static std::string                     _dialplan;
-    static std::string                     _context;
-    static std::map < std::string, CSpan > _spans;
-	static GroupToDestMapType              _groups;
-	static CadencesMapType                 _cadences;
-    
-    static bool  _echo_canceller;
-    static bool  _auto_gain_control;
-    static bool  _out_of_band_dtmfs;
-    static bool  _suppression_delay;
-    static bool  _pulse_forwarding;
-    static bool  _native_bridge;
-    static bool  _recording;
-    static bool  _has_ctbus;
-    static bool  _fxs_bina;
-    static bool  _fxo_send_pre_audio;
-    static bool  _drop_collect_call;
-    static bool  _ignore_letter_dtmfs;
-    static bool  _optimize_audio_path;
-
-    static bool         _auto_fax_adjustment;
-    static unsigned int _fax_adjustment_timeout;
-
-    static bool         _r2_strict_behaviour;
-    static unsigned int _r2_preconnect_wait;
-
-    static unsigned int _fxs_digit_timeout;
-
-    static unsigned int _transferdigittimeout;
-
-    static std::string _flash;
-    static std::string _blindxfer;
-    static std::string _atxfer;
-
-    static unsigned int _ringback_co_delay;
-    static unsigned int _ringback_pbx_delay;
-
-    static unsigned int _disconnect_delay;
-
-    static int _input_volume;
-    static int _output_volume;
-
-    static DestVectorType    _fxs_co_dialtone;
-    static OrigToDestMapType _fxs_hotline;
-    static std::string       _fxs_global_orig_base;
-
-    static BoardToOrigMapType    _fxs_orig_base;
-    static BranchToObjectMapType _fxs_branch_map;
-    static BranchToOptMapType    _branch_options;
-
-    static std::string _global_mohclass;
-    static std::string _global_language;
-
-    static std::string _record_prefix;
-
-    static std::string  _context_gsm_call;
-    static std::string  _context2_gsm_call;
-    static std::string  _context_gsm_sms;
-    static std::string  _context_fxo;
-    static std::string  _context2_fxo;
-    static std::string  _context_fxs;
-    static std::string  _context2_fxs;
-    static std::string  _context_digital;
-    static std::string  _context_pr;
-    static std::string  _user_xfer;
-
-    static int                _amaflags;
-    static std::string _callgroup;
-    static std::string _pickupgroup; /* or intercept */
-
-    static std::string _accountcode;
-    
-    static unsigned int _kommuter_timeout;
-    static std::string  _kommuter_activation;
-
-    static unsigned int _audio_packet_size;
-
-protected:
-
-    struct ProcessFXSCODialtone
-    {
-        void operator()(std::string options);
-    };
-
-    struct ProcessRecordPrefix
-    {
-        void operator()(std::string path);
-    };
-
-    struct ProcessAMAFlags
-    {
-        void operator()(std::string options);
-    };
-
-    struct ProcessCallGroup
-    {
-        void operator()(std::string options);
-    };
-
-    struct ProcessPickupGroup
-    {
-        void operator()(std::string options);
-    };
-
-    struct ProcessLogOptions
-    {
-        ProcessLogOptions(output_type output): _output(output) {}; 
-
-        void operator()(std::string options); 
-
-        protected:
-            output_type _output;
-    };
-
-    struct ProcessTraceOptions
-    {
-        void operator()(std::string options);
-    };
 };
 
 
diff --git a/src/mod/endpoints/mod_khomp/include/revision.h b/src/mod/endpoints/mod_khomp/include/revision.h
index fe9ef9eb47..b0ace1ad42 100644
--- a/src/mod/endpoints/mod_khomp/include/revision.h
+++ b/src/mod/endpoints/mod_khomp/include/revision.h
@@ -1 +1 @@
-#define MOD_KHOMP_VERSION "1.0 - (rev: 5841)"
+#define MOD_KHOMP_VERSION "1.0 - (rev: 5891)"
diff --git a/src/mod/endpoints/mod_khomp/include/spec.h b/src/mod/endpoints/mod_khomp/include/spec.h
index 119607b02f..cf788f646f 100644
--- a/src/mod/endpoints/mod_khomp/include/spec.h
+++ b/src/mod/endpoints/mod_khomp/include/spec.h
@@ -63,15 +63,8 @@ typedef enum
 SpecFlagType;
 
 typedef unsigned int SpecFlagsType;
-
-
 typedef Function::Function3 < bool, unsigned int, unsigned int, SpecFlagsType & > SpecFunType;
 
-
-//SpecRetType processSpecAtom(std::string &, SpecFlagsType &, SpecFunType &);
-//SpecRetType processSpecAtoms(std::string &, SpecFlagsType &, SpecFunType &);
-//bool processCallChannelString(std::string &, Board::KhompPvt *&, int *, bool need_free = true);
-
 /* Request a Board::KhompPvt based on dialplan string.
 
 -- Format of dialplan string. --
diff --git a/src/mod/endpoints/mod_khomp/include/utils.h b/src/mod/endpoints/mod_khomp/include/utils.h
index 0c71a74188..0c59241168 100644
--- a/src/mod/endpoints/mod_khomp/include/utils.h
+++ b/src/mod/endpoints/mod_khomp/include/utils.h
@@ -687,7 +687,97 @@ struct Statistics
     virtual std::string getDetailed() { return ""; }
     virtual void clear() {}
 };
+/******************************************************************************/
+/****************************** ESL - Events **********************************/
+    
+struct ESL 
+{
+
+    typedef std::vector <std::string> VectorEvents;
+    
+    ESL(std::string type);
+
+    ~ESL();
+    
+    switch_event_t * create(const std::string type)
+    {
+        switch_event_t *event;
+
+        if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, type.c_str()) != SWITCH_STATUS_SUCCESS)
+        {
+            return NULL;
+        }
+
+        return event;
+    }
+    
+    switch_event_t * create()
+    {
+        return create(_type);
+    }
+
+    bool add(switch_event_t *event, const std::string key, 
+                                    const std::string value) const
+    {
+        if(!event) return false;
+
+        switch_status_t res = switch_event_add_header_string(event, 
+                SWITCH_STACK_BOTTOM,
+                key.c_str(), 
+                value.c_str());
+
+        return (res == SWITCH_STATUS_SUCCESS ? true : false);
+    }
+
+    bool add(switch_event_t *event, K3LAPIBase::GenericTarget & target)
+    {
+        bool ok = add(event, "Device", STR(FMT("%d") % target.device));
+
+        if(!ok)
+            return ok;
+
+        std::string type;
+
+        switch(target.type)
+        {
+            case K3LAPIBase::GenericTarget::CHANNEL:
+                type = "Channel";
+                break;
+            case K3LAPIBase::GenericTarget::MIXER:
+                type = "Mixer";
+                break;
+            case K3LAPIBase::GenericTarget::LINK:
+                type = "Link";
+                break;
+            default:
+                type = "Other";
+                break;
+        }        
+
+        return add(event, type, STR(FMT("%d") % target.object));
+    }
+
+    bool fire(switch_event_t **event) const
+    {
+        if(!event || !*event) return false;
+
+        switch_status_t res = switch_event_fire(event);
+
+        *event = NULL;
+
+        return (res == SWITCH_STATUS_SUCCESS ? true : false);
+    }
+
+    static bool registerEvents();
+
+    static bool unregisterEvents();
+
+protected:
+    const std::string _type;
+    static VectorEvents * _events;
+};
 
 /******************************************************************************/
 /******************************************************************************/
+
 #endif  /* _UTILS_H_ */
diff --git a/src/mod/endpoints/mod_khomp/mod_khomp.cpp b/src/mod/endpoints/mod_khomp/mod_khomp.cpp
index d09a8a3f68..5e7375b0e9 100644
--- a/src/mod/endpoints/mod_khomp/mod_khomp.cpp
+++ b/src/mod/endpoints/mod_khomp/mod_khomp.cpp
@@ -269,22 +269,22 @@ switch_status_t khompExecute(switch_core_session_t *session)
 
 switch_status_t khompHangup(switch_core_session_t *session)
 {
-    DBG(FUNC, D("c"));
-
     Board::KhompPvt *tech_pvt = NULL;
 
     if(!session)
     {
-        LOG(ERROR, D("r (Session is NULL)"));
-        return SWITCH_STATUS_SUCCESS;
+        LOG(ERROR, D("cr (Session is NULL)"));
+        return SWITCH_STATUS_FALSE;
     }
     
     tech_pvt = static_cast<Board::KhompPvt*>(switch_core_session_get_private(session));
     if(!tech_pvt)
     {
-        DBG(FUNC, D("r (pvt is NULL)"));
+        LOG(ERROR, D("cr (pvt is NULL)"));
         return SWITCH_STATUS_FALSE;
     }
+    
+    DBG(FUNC, PVT_FMT(tech_pvt->target(), "c"));
 
     try
     {       
@@ -312,13 +312,13 @@ switch_status_t khompHangup(switch_core_session_t *session)
         LOG(ERROR, PVT_FMT(tech_pvt->target(), "r (unable to lock: %s!)") %  err._msg.c_str());
         return SWITCH_STATUS_FALSE;
     }
-    catch (K3LAPI::invalid_device & err)
+    catch (K3LAPITraits::invalid_device & err)
     {
         LOG(ERROR, PVT_FMT(tech_pvt->target(), "r (unable to get device: %d!)") % err.device);
         return SWITCH_STATUS_FALSE;
     }
 
-    DBG(FUNC, D("r"))
+    DBG(FUNC, PVT_FMT(tech_pvt->target(), "r"))
 
     return SWITCH_STATUS_SUCCESS;
 }
@@ -331,12 +331,10 @@ switch_status_t khompPRHangup(switch_core_session_t *session)
 
 switch_status_t khompDestroy(switch_core_session_t *session)
 {
-    DBG(FUNC, D("c"))
-
     if(!session)
     {
-        DBG(FUNC, D("r (session is null)"))
-        return SWITCH_STATUS_SUCCESS;
+        LOG(ERROR, D("cr (session is null)"))
+        return SWITCH_STATUS_FALSE;
     }
     
     Board::KhompPvt *tech_pvt = NULL;
@@ -345,24 +343,36 @@ switch_status_t khompDestroy(switch_core_session_t *session)
 
     if(!tech_pvt)
     {
-        DBG(FUNC, D("r (pvt is null)"))
+        LOG(ERROR, D("cr (pvt is null)"))
         return SWITCH_STATUS_FALSE;
     }
-    try
-    {       
-        ScopedPvtLock lock(tech_pvt);
 
-        switch_core_session_set_private(session, NULL);
-        tech_pvt->destroyAll();
-    }
-    catch (ScopedLockFailed & err)
+    DBG(FUNC, PVT_FMT(tech_pvt->target(), "c"))
+
+    do
     {
-        DBG(FUNC, PVT_FMT(tech_pvt->target(), "r (unable to lock: %s!)") %  err._msg.c_str());
+        try
+        {
+            ScopedPvtLock lock(tech_pvt);
+
+            switch_core_session_set_private(session, NULL);
+            tech_pvt->destroyAll();
+            
+            DBG(FUNC, PVT_FMT(tech_pvt->target(), "r"));
+
+            return SWITCH_STATUS_SUCCESS;
+        }
+        catch (ScopedLockFailed & err)
+        {
+            LOG(ERROR, PVT_FMT(tech_pvt->target(), "unable to lock: %s!: try again...") %  err._msg.c_str());
+        }
+
     }
+    while(true);
+            
+    DBG(FUNC, PVT_FMT(tech_pvt->target(), "r (unable to lock!)"));
 
-    DBG(FUNC, D("r"))
-
-    return SWITCH_STATUS_SUCCESS;
+    return SWITCH_STATUS_FALSE;
 }
 
 switch_status_t khompSMSDestroy(switch_core_session_t *session)
@@ -372,7 +382,7 @@ switch_status_t khompSMSDestroy(switch_core_session_t *session)
     if(!session)
     {
         DBG(FUNC, D("r (session is null)"))
-        return SWITCH_STATUS_SUCCESS;
+        return SWITCH_STATUS_FALSE;
     }
 /*    
     Board::KhompPvt *tech_pvt = NULL;
@@ -569,7 +579,7 @@ switch_status_t khompWrite(switch_core_session_t *session, switch_frame_t *frame
             {
                 Board::board(tech_pvt->target().device)->_timers.del(tech_pvt->call()->_idx_co_ring);
             }
-            catch (K3LAPI::invalid_device & err)
+            catch (K3LAPITraits::invalid_device & err)
             {
                 LOG(ERROR, PVT_FMT(tech_pvt->target(), "Unable to get device: %d!") % err.device);
             }
@@ -666,7 +676,7 @@ switch_status_t khompAnswer(switch_core_session_t *session)
 
 
     }
-    catch (K3LAPI::invalid_device & err)
+    catch (K3LAPITraits::invalid_device & err)
     {
         LOG(ERROR, D("unable to get device: %d!") % err.device);
         return SWITCH_STATUS_FALSE;
@@ -826,7 +836,7 @@ switch_call_cause_t khompCall
     }
 
     Board::KhompPvt *tech_pvt;
-    int cause = (int)SWITCH_CAUSE_SUCCESS;
+    int cause = (int)SWITCH_CAUSE_NONE;
     
     try
     {
@@ -882,7 +892,7 @@ switch_call_cause_t khompCall
     {
         if(err._fail == ScopedLockFailed::ALLOC_FAILED)
         {
-            LOG(ERROR, PVT_FMT(tech_pvt->target(), "unable to global alloc lock"));
+            LOG(ERROR, D("unable to global alloc lock: %s!") % err._msg.c_str());
         }
         else
         {
@@ -1295,7 +1305,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_khomp_load)
     }
 
     /* apply global volume now */
-    if(Opt::_input_volume != 0 || Opt::_output_volume != 0)
+    if(Opt::_options._input_volume() != 0 || Opt::_options._output_volume() != 0)
         Board::applyGlobalVolume();
 
     Opt::commit();
@@ -1320,6 +1330,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_khomp_load)
 
     /* Register cli commands */
     Cli::registerCommands(apiKhomp,module_interface);
+    
+    ESL::registerEvents();
 
     /* Add applications */
     SWITCH_ADD_APP(Globals::khomp_app_inteface, "KLog", "KLog", "KLog log every string to khomp log system", klogFunction, "<value>", SAF_SUPPORT_NOMEDIA);
@@ -1352,6 +1364,9 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_khomp_shutdown)
     Board::kommuter.stop();
 
     Cli::unregisterCommands();
+    
+    ESL::unregisterEvents();
+
 
     /* Finnish him! */
     DBG(FUNC, "Unloading mod_khomp...")
@@ -1412,7 +1427,7 @@ extern "C" void Kstdcall khompAudioListener (int32 deviceid, int32 objectid, byt
     try
     {
     
-    //If NULL get throws K3LAPI::invalid_channel exception.
+    //If NULL get throws K3LAPITraits::invalid_channel exception.
     Board::KhompPvt * pvt = Board::get(deviceid, objectid);
 
     /* add listener audio to the read buffer */
@@ -1485,7 +1500,7 @@ extern "C" void Kstdcall khompAudioListener (int32 deviceid, int32 objectid, byt
     }
 
     }
-    catch (K3LAPI::invalid_channel & err)
+    catch (K3LAPITraits::invalid_channel & err)
     {
         LOG(ERROR, OBJ_FMT(deviceid, objectid, "Invalid channel..."));
         return;
diff --git a/src/mod/endpoints/mod_khomp/src/applications.cpp b/src/mod/endpoints/mod_khomp/src/applications.cpp
index d4a50e0adb..bd17d3622b 100644
--- a/src/mod/endpoints/mod_khomp/src/applications.cpp
+++ b/src/mod/endpoints/mod_khomp/src/applications.cpp
@@ -44,6 +44,7 @@
 #include "applications.h"
 #include "lock.h"
 
+
 bool Fax::adjustForFax()
 {
     /* Don't worry, let the man work */
@@ -379,18 +380,20 @@ bool Fax::addFaxFile(const char * filename, bool last)
 }
 
 /******************************************************************************/
+SMS::_SMSEvent SMS::SMSEvent;
+
 bool SMS::justAlloc(unsigned int count)
 {
     /* incoming contexts */
     MatchExtension::ContextListType contexts;
 
-    contexts.push_back(Opt::_context_gsm_sms);
+    contexts.push_back(Opt::_options._context_gsm_sms());
 
     /* temporary variables */
     std::string context;
     std::string exten("s");
 
-    K3L_DEVICE_CONFIG & dev_cfg = Globals::k3lapi.device_config(_pvt->_target.device);
+    const K3L_DEVICE_CONFIG & dev_cfg = Globals::k3lapi.device_config(_pvt->_target);
 
     for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++)
     {
@@ -438,7 +441,7 @@ bool SMS::justAlloc(unsigned int count)
 
         switch_caller_profile_t *caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session),
                 "Khomp_SMS",                       //username
-                Opt::_dialplan.c_str(),            //dialplan
+                Opt::_options._dialplan().c_str(), //dialplan
                 NULL,                              //caller_id_name
                 _got_sms._from.c_str(),            //caller_id_number
                 NULL,                              //network_addr
@@ -465,7 +468,7 @@ bool SMS::justAlloc(unsigned int count)
             return false;
         }
 
-        std::string name = STG(FMT("Khomp_SMS/%hu/%hu")
+        std::string name = STG(FMT("Khomp_SMS/%d/%d")
                 % _pvt->target().device
                 % _pvt->target().object);
 
@@ -744,6 +747,8 @@ bool SMS::onSMSData(K3L_EVENT *e)
         {
             _got_sms._body = (const char *)(e->Params ? e->Params : "");
 
+            SMSEvent(_pvt, _got_sms);
+
             if(!justStart())
             {
                 if(_got_sms._type != "broadcast")
@@ -945,6 +950,8 @@ int SMS::smsThread(void * sms_ptr)
 
             if (sms->_result == kgccNone)
             {
+                sms->SMSEvent(pvt, sms->_send_sms);
+
                 /* stats update if sent! */
                 sms->statistics<SMSStatistics>()->incrementOutgoing();
             }
diff --git a/src/mod/endpoints/mod_khomp/src/cli.cpp b/src/mod/endpoints/mod_khomp/src/cli.cpp
index 709abb9303..621afe6a20 100644
--- a/src/mod/endpoints/mod_khomp/src/cli.cpp
+++ b/src/mod/endpoints/mod_khomp/src/cli.cpp
@@ -93,12 +93,12 @@ void Cli::registerCommands(APIFunc func,switch_loadable_module_interface_t **mod
 " khomp set <option> <value>\n"                                                \
 " khomp show calls [<board> [<channel>]]\n"                                    \
 " khomp show channels [{<board> [<channel>]} | \n"                             \
-"                               {{concise|verbose} [<board> [<channel>]]}]\n"  \
-" khomp show links [[errors] [{<board>} | {{concise|verbose} [<board>]}]]\n"   \
-" khomp show statistics [{verbose [<board> [<channel>]]} | \n"                 \
+"                      {{concise|verbose|xml} [<board> [<channel>]]}]\n"       \
+" khomp show links [[errors] [{<board>} | {{concise|verbose|xml}[<board>]}]]\n"\
+" khomp show statistics [{{verbose|xml} [<board> [<channel>]]} | \n"           \
 "                        {detailed <board> <channel>}]\n"                      \
 " khomp sms <device> <destination> <message..>\n"                              \
-" khomp summary [concise]\n"                                                   \
+" khomp summary [concise|verbose|xml]\n"                                       \
 "---------------------------------------------------------------------------\n\n";
 
     /* we need this module_inteface, is used by SWITCH_ADD_API, there's no escape */
@@ -319,13 +319,18 @@ bool Cli::_KhompSummary::execute(int argc, char *argv[])
         return false;
     }
 
-    /* show concise ? */
-    bool concise = ARG_CMP(1, "concise") ? true:false;
-
+    Cli::OutputType output_type = Cli::VERBOSE;
+    if(ARG_CMP(1, "concise")) output_type = Cli::CONCISE;
+    if(ARG_CMP(1, "xml")) 
+    {
+        output_type = Cli::XML;
+        createRoot("summary");
+    }
+        
     class_type classe = ( !_on_cli_term ? C_MESSAGE : C_CLI );
     K3L_API_CONFIG apiCfg;
 
-    if (!concise)
+    if (output_type == Cli::VERBOSE)
     {
         K::Logger::Logg2(classe, stream, " ------------------------------------------------------------------");
         K::Logger::Logg2(classe, stream, "|---------------------- Khomp System Summary ----------------------|");
@@ -334,17 +339,41 @@ bool Cli::_KhompSummary::execute(int argc, char *argv[])
 
     if (k3lGetDeviceConfig(-1, ksoAPI, &apiCfg, sizeof(apiCfg)) == ksSuccess)
     {
-        if (concise)
+        switch(output_type)
         {
-            K::Logger::Logg2(classe, stream, FMT("%d.%d.%d;%d;%s")
+            case Cli::VERBOSE:
+            {
+                K::Logger::Logg2(classe, stream, FMT("| K3L API %d.%d.%d [m.VPD %d] - %-38s |")
                         % apiCfg.MajorVersion % apiCfg.MinorVersion % apiCfg.BuildVersion
                         % apiCfg.VpdVersionNeeded % apiCfg.StrVersion);
-        }
-        else
-        {
-            K::Logger::Logg2(classe, stream, FMT("| K3L API %d.%d.%d [m.VPD %d] - %-38s |")
+            } break;
+
+            case Cli::CONCISE:
+            {
+                K::Logger::Logg2(classe, stream, FMT("%d.%d.%d;%d;%s")
                         % apiCfg.MajorVersion % apiCfg.MinorVersion % apiCfg.BuildVersion
                         % apiCfg.VpdVersionNeeded % apiCfg.StrVersion);
+            } break;
+
+            case Cli::XML:
+            {
+                /* summary/k3lapi */
+                switch_xml_t xk3lapi = switch_xml_add_child_d(root, "k3lapi",0);
+                
+                /* summary/k3lapi/version */
+                switch_xml_t xk3l_version = switch_xml_add_child_d(xk3lapi,"version", 0);
+                switch_xml_set_attr_d(xk3l_version,"major",STR(FMT("%d") % apiCfg.MajorVersion));
+                switch_xml_set_attr_d(xk3l_version,"minor",STR(FMT("%d") % apiCfg.MinorVersion));
+                switch_xml_set_attr_d(xk3l_version,"build",STR(FMT("%d") % apiCfg.BuildVersion));
+                switch_xml_set_attr_d(xk3l_version,"vpd",STR(FMT("%d")   % apiCfg.VpdVersionNeeded));
+
+                /* summary/k3lapi/version/revision */
+                switch_xml_t xk3l_rev = switch_xml_add_child_d(xk3l_version,"revision",0);
+                switch_xml_set_txt_d(xk3l_rev,STR(FMT("%s") % apiCfg.StrVersion));
+            } break;
+
+            default:
+                break;
         }
     }
 
@@ -359,25 +388,54 @@ bool Cli::_KhompSummary::execute(int argc, char *argv[])
     std::string khomp_endpoint_rev(MOD_KHOMP_VERSION);
     std::string freeswitch_rev(SWITCH_VERSION_FULL);
 
-    if (concise)
+    switch(output_type)
     {
-        K::Logger::Logg2(classe, stream, FMT("%s") % khomp_endpoint_rev);
-        K::Logger::Logg2(classe, stream, FMT("%s") % freeswitch_rev);
-    }
-    else
-    {
-        K::Logger::Logg2(classe, stream, FMT("| Khomp Endpoint - %-47s |") % khomp_endpoint_rev);
-        K::Logger::Logg2(classe, stream, FMT("| FreeSWITCH - %-51s |") % freeswitch_rev);
+        case Cli::VERBOSE:
+        {
+            K::Logger::Logg2(classe, stream, FMT("| Khomp Endpoint - %-47s |") % khomp_endpoint_rev);
+            K::Logger::Logg2(classe, stream, FMT("| FreeSWITCH - %-51s |") % freeswitch_rev);
+        } break;
+
+        case Cli::CONCISE:
+        {
+            K::Logger::Logg2(classe, stream, FMT("%s") % khomp_endpoint_rev);
+            K::Logger::Logg2(classe, stream, FMT("%s") % freeswitch_rev);
+        } break;
+
+        case Cli::XML:
+        {
+            /* summary/mod_khomp */
+            switch_xml_t xmod_khomp = switch_xml_add_child_d(root,"mod_khomp",0);
+
+            /* summary/mod_khomp/revision */
+            switch_xml_t xrevision  = switch_xml_add_child_d(xmod_khomp,"revision",0);
+            switch_xml_set_txt_d(xrevision, khomp_endpoint_rev.c_str());
+
+            /* summary/freeswitch */
+            switch_xml_t xfs = switch_xml_add_child_d(root,"freeswitch",0);
+
+            /* summary/freeswitch/revision */
+            switch_xml_t xfs_rev = switch_xml_add_child_d(xfs,"revision",0);
+            switch_xml_set_txt_d(xfs_rev, freeswitch_rev.c_str());
+        } break;
+
+        default:
+            break;
     }
 
+    if (output_type == Cli::XML)
+    {
+        /* summary/board */
+        xdevs = switch_xml_add_child_d(root,"devices",0);
+    }
 
     for (unsigned int i = 0; i < Globals::k3lapi.device_count(); i++)
     {
-        K3L_DEVICE_CONFIG & devCfg = Globals::k3lapi.device_config(i);
+        const K3L_DEVICE_CONFIG & devCfg = Globals::k3lapi.device_config(i);
 
         std::string tipo = Verbose::deviceName((KDeviceType)Globals::k3lapi.device_type(i), devCfg.DeviceModel);
 
-        if (!concise)
+        if (output_type == Cli::VERBOSE)
             K::Logger::Logg2(classe, stream, " ------------------------------------------------------------------");
 
         switch (Globals::k3lapi.device_type(i))
@@ -400,29 +458,92 @@ bool Cli::_KhompSummary::execute(int argc, char *argv[])
                 if ((k3lGetDeviceConfig(i, ksoFirmware + kfiE1600A, &dspAcfg, sizeof(dspAcfg)) == ksSuccess) &&
                     (k3lGetDeviceConfig(i, ksoFirmware + kfiE1600B, &dspBcfg, sizeof(dspBcfg)) == ksSuccess))
                 {
-                    if (concise)
+                    switch(output_type)
                     {
-                        K::Logger::Logg2(classe, stream, FMT("%02u;%s;%d;%d;%d;%s;%s;%02d;%02d;%s;%s;%s;%s")
+                        case Cli::VERBOSE:
+                        {
+                            K::Logger::Logg2(classe, stream, FMT("| [[ %02u ]] %s, serial '%s', %02d channels, %d links.%s|")
+                                    % i % tipo % devCfg.SerialNumber % devCfg.ChannelCount % devCfg.LinkCount
+                                    % std::string(std::max<int>(0, 22 - tipo.size() - strlen(devCfg.SerialNumber)), ' '));
+                            K::Logger::Logg2(classe, stream, FMT("| * DSP A: %s, DSP B: %s - PCI bus: %02d, PCI slot: %02d %s|")
+                                    % dspAcfg.DspVersion % dspBcfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
+                                    % std::string(18 - strlen(dspAcfg.DspVersion) - strlen(dspBcfg.DspVersion), ' '));
+                            K::Logger::Logg2(classe, stream, FMT("| * %-62s |") % dspAcfg.FwVersion);
+                            K::Logger::Logg2(classe, stream, FMT("| * %-62s |") % dspBcfg.FwVersion);
+
+                            K::Logger::Logg2(classe, stream, FMT("| * Echo Canceller: %-20s - Location: %-12s  |")
+                                    % Verbose::echoCancellerConfig(devCfg.EchoConfig)
+                                    % Verbose::echoLocation(devCfg.EchoLocation));
+                        } break;
+
+                        case Cli::CONCISE:
+                        {
+                            K::Logger::Logg2(classe, stream, FMT("%02u;%s;%d;%d;%d;%s;%s;%02d;%02d;%s;%s;%s;%s")
                                     % i % tipo % atoi(devCfg.SerialNumber) % devCfg.ChannelCount % devCfg.LinkCount
                                     % dspAcfg.DspVersion % dspBcfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
                                     % dspAcfg.FwVersion % dspBcfg.FwVersion
                                     % Verbose::echoCancellerConfig(devCfg.EchoConfig)
                                     % Verbose::echoLocation(devCfg.EchoLocation));
-                    }
-                    else
-                    {
-                        K::Logger::Logg2(classe, stream, FMT("| [[ %02u ]] %s, serial '%s', %02d channels, %d links.%s|")
-                                    % i % tipo % devCfg.SerialNumber % devCfg.ChannelCount % devCfg.LinkCount
-                                    % std::string(std::max<int>(0, 22 - tipo.size() - strlen(devCfg.SerialNumber)), ' '));
-                        K::Logger::Logg2(classe, stream, FMT("| * DSP A: %s, DSP B: %s - PCI bus: %02d, PCI slot: %02d %s|")
-                                    % dspAcfg.DspVersion % dspBcfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
-                                    % std::string(18 - strlen(dspAcfg.DspVersion) - strlen(dspBcfg.DspVersion), ' '));
-                        K::Logger::Logg2(classe, stream, FMT("| * %-62s |") % dspAcfg.FwVersion);
-                        K::Logger::Logg2(classe, stream, FMT("| * %-62s |") % dspBcfg.FwVersion);
+                        } break;
 
-                        K::Logger::Logg2(classe, stream, FMT("| * Echo Canceller: %-20s - Location: %-12s  |")
-                                    % Verbose::echoCancellerConfig(devCfg.EchoConfig)
-                                    % Verbose::echoLocation(devCfg.EchoLocation));
+                        case Cli::XML:
+                        {
+                            /* boards/board */
+                            switch_xml_t xdev = switch_xml_add_child_d(xdevs,"device",0);
+                            switch_xml_set_attr_d(xdev,"id",STR(FMT("%02u") % i));
+
+                            /* boards/board/general */
+                            switch_xml_t xgeneral = switch_xml_add_child_d(xdev,"general",0);
+    
+                            /* boards/board/general/type */
+                            switch_xml_t xtype = switch_xml_add_child_d(xgeneral,"type",0);
+                            switch_xml_set_txt_d(xtype,tipo.c_str());
+
+                            /* boards/board/general/serial */
+                            switch_xml_t xserial = switch_xml_add_child_d(xgeneral,"serial",0);
+                            switch_xml_set_txt_d(xserial, devCfg.SerialNumber);
+
+                            /* boards/board/general/channels */
+                            switch_xml_t xchannels = switch_xml_add_child_d(xgeneral,"channels",0);
+                            switch_xml_set_txt_d(xchannels, STR(FMT("%02d") % devCfg.ChannelCount));
+
+                            /* boards/board/general/links */
+                            switch_xml_t xlinks = switch_xml_add_child_d(xgeneral,"links",0);
+                            switch_xml_set_txt_d(xlinks, STR(FMT("%d") % devCfg.LinkCount));
+
+                            /* boards/board/hardware */
+                            switch_xml_t xhardware = switch_xml_add_child_d(xdev,"hardware",0);
+
+                            /* boards/board/hardware/dsps */
+                            switch_xml_t xdsps = switch_xml_add_child_d(xhardware,"dsps",0);
+                           
+                            /* boards/board/hardware/dsps/dsp (0) */
+                            switch_xml_t xdsp0 = switch_xml_add_child_d(xdsps,"dsp",0);
+                            switch_xml_set_attr_d(xdsp0,"id","0");
+
+                            /* boards/board/hardware/dsps/dsp/version */
+                            switch_xml_t xversion0 = switch_xml_add_child_d(xdsp0,"version",0);
+                            switch_xml_set_txt_d(xversion0, dspAcfg.DspVersion);
+
+                            /* boards/board/hardware/dsps/dsp/firmware */
+                            switch_xml_t xfirmware0 = switch_xml_add_child_d(xdsp0,"firmware",0);
+                            switch_xml_set_txt_d(xfirmware0,dspAcfg.FwVersion);
+
+                            /* boards/board/hardware/dsps/dsp (1) */
+                            switch_xml_t xdsp1 = switch_xml_add_child_d(xdsps,"dsp",0);
+                            switch_xml_set_attr_d(xdsp1,"id","1");
+
+                            /* boards/board/hardware/dsps/dsp/version */
+                            switch_xml_t xversion1 = switch_xml_add_child_d(xdsp1,"version",0);
+                            switch_xml_set_txt_d(xversion1, dspBcfg.DspVersion);
+
+                            /* boards/board/hardware/dsps/dsp/firmware */
+                            switch_xml_t xfirmware1 = switch_xml_add_child_d(xdsp1,"firmware",0);
+                            switch_xml_set_txt_d(xfirmware1,dspBcfg.FwVersion);
+                        } break;
+
+                        default:
+                            break;
                     }
                 }
 
@@ -442,28 +563,84 @@ bool Cli::_KhompSummary::execute(int argc, char *argv[])
 
                 if (k3lGetDeviceConfig(i, ksoFirmware + kfiFXO80, &dspCfg, sizeof(dspCfg)) == ksSuccess)
                 {
-                    if (concise)
+                    switch(output_type)
                     {
-                        K::Logger::Logg2(classe, stream, FMT("%02u;%s;%d;%d;%s;%02d;%02d;%s")
-                                    % i % tipo % atoi(devCfg.SerialNumber) % devCfg.ChannelCount
-                                    % dspCfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
-                                    % dspCfg.FwVersion);
-                    }
-                    else
-                    {
-                        K::Logger::Logg2(classe, stream, FMT("| [[ %02u ]] %s, serial '%s', %02d channels. %s|")
-                                    % i % tipo % devCfg.SerialNumber % devCfg.ChannelCount
-                                    % std::string(std::max<int>(0, 30 - tipo.size() - strlen(devCfg.SerialNumber)), ' '));
-                        K::Logger::Logg2(classe, stream, FMT("| * DSP: %s - PCI bus: %02d, PCI slot: %02d%s|")
-                                    % dspCfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
-                                    % std::string(30 - strlen(dspCfg.DspVersion), ' '));
-                        K::Logger::Logg2(classe, stream, FMT("| * %-63s|") % dspCfg.FwVersion);
+                        case Cli::VERBOSE:
+                        {
+                            K::Logger::Logg2(classe, stream, FMT("| [[ %02u ]] %s, serial '%s', %02d channels. %s|")
+                                        % i % tipo % devCfg.SerialNumber % devCfg.ChannelCount
+                                        % std::string(std::max<int>(0, 30 - tipo.size() - strlen(devCfg.SerialNumber)), ' '));
+                            K::Logger::Logg2(classe, stream, FMT("| * DSP: %s - PCI bus: %02d, PCI slot: %02d%s|")
+                                        % dspCfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
+                                        % std::string(30 - strlen(dspCfg.DspVersion), ' '));
+                            K::Logger::Logg2(classe, stream, FMT("| * %-63s|") % dspCfg.FwVersion);
+                        } break;
+
+                        case Cli::CONCISE:
+                        {
+                            K::Logger::Logg2(classe, stream, FMT("%02u;%s;%d;%d;%s;%02d;%02d;%s")
+                                        % i % tipo % atoi(devCfg.SerialNumber) % devCfg.ChannelCount
+                                        % dspCfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
+                                        % dspCfg.FwVersion);
+                        } break;
+
+                        case Cli::XML:
+                        {
+                            /* boards/board  */
+                            switch_xml_t xdev = switch_xml_add_child_d(xdevs,"device",0);
+                            switch_xml_set_attr_d(xdev,"id",STR(FMT("%02u") % i));
+
+                            /* boards/board/general  */
+                            switch_xml_t xgeneral = switch_xml_add_child_d(xdev,"general",0);
+    
+                            /* boards/board/general/type  */
+                            switch_xml_t xtype = switch_xml_add_child_d(xgeneral,"type",0);
+                            switch_xml_set_txt_d(xtype,tipo.c_str());
+
+                            /* boards/board/general/serial */
+                            switch_xml_t xserial = switch_xml_add_child_d(xgeneral,"serial",0);
+                            switch_xml_set_txt_d(xserial, devCfg.SerialNumber);
+
+                            /* boards/board/general/channels */
+                            switch_xml_t xchannels = switch_xml_add_child_d(xgeneral,"channels",0);
+                            switch_xml_set_txt_d(xchannels, STR(FMT("%02d") % devCfg.ChannelCount));
+
+                            /* boards/board/general/links */
+                            switch_xml_t xlinks = switch_xml_add_child_d(xgeneral,"links",0);
+                            switch_xml_set_txt_d(xlinks, STR(FMT("%d") % devCfg.LinkCount));
+
+                            /* boards/hardware */
+                            switch_xml_t xhardware = switch_xml_add_child_d(xdev,"hardware",0);
+                            
+                            /* boards/board/hardware/dsps */
+                            switch_xml_t xdsps = switch_xml_add_child_d(xhardware,"dsps",0);
+
+                            /* boards/board/hardware/dsps/dsp */
+                            switch_xml_t xdsp = switch_xml_add_child_d(xdsps,"dsp",0);
+                            switch_xml_set_attr_d(xdsp,"id","0");
+
+                            /* boards/board/hardware/dsps/dsps/version */
+                            switch_xml_t xversion_a = switch_xml_add_child_d(xdsp,"version",0);
+                            switch_xml_set_txt_d(xversion_a, dspCfg.DspVersion);
+
+                            /* boards/board/hardware/dsps/dsps/firmare */
+                            switch_xml_t xfirmware = switch_xml_add_child_d(xdsp,"firmware",0);
+                            switch_xml_set_txt_d(xfirmware,dspCfg.FwVersion);
+
+                            /* boards/board/hardware/pci */
+                            switch_xml_t xpci = switch_xml_add_child_d(xhardware,"pci",0);
+                            switch_xml_set_attr_d(xpci,"bus" ,STR(FMT("%02d") % devCfg.PciBus ));
+                            switch_xml_set_attr_d(xpci,"slot",STR(FMT("%02d") % devCfg.PciSlot));
+                        } break;
+
+                        default:
+                            break;
                     }
                 }
 
                 if (Globals::k3lapi.device_type(i) == kdtFXOVoIP)
                 {
-                    if (!concise)
+                    if (output_type == Cli::VERBOSE)
                     {
                         K::Logger::Logg2(classe, stream, FMT("| * Echo Canceller: %-20s - Location: %-12s  |")
                             % Verbose::echoCancellerConfig(devCfg.EchoConfig)
@@ -480,24 +657,80 @@ bool Cli::_KhompSummary::execute(int argc, char *argv[])
 
                 if (k3lGetDeviceConfig(i, ksoFirmware + kfiGSM40, &dspCfg, sizeof(dspCfg)) == ksSuccess)
                 {
-                    if (concise)
+                    switch(output_type)
                     {
-                        K::Logger::Logg2(classe, stream, FMT("%02d;%s;%d;%d;%s;%02d;%02d;%s")
-                                    % i % tipo % atoi(devCfg.SerialNumber) % devCfg.ChannelCount
-                                    % dspCfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
-                                    % dspCfg.FwVersion);
-                    }
-                    else
-                    {
-                        K::Logger::Logg2(classe, stream, FMT("| [[ %02d ]] %s, serial '%s', %02d channels. %s|")
-                            % i % tipo % devCfg.SerialNumber % devCfg.ChannelCount
-                            % std::string(std::max<int>(0, 30 - tipo.size() - strlen(devCfg.SerialNumber)), ' '));
+                        case Cli::VERBOSE:
+                        {
+                            K::Logger::Logg2(classe, stream, FMT("| [[ %02d ]] %s, serial '%s', %02d channels. %s|")
+                                % i % tipo % devCfg.SerialNumber % devCfg.ChannelCount
+                                % std::string(std::max<int>(0, 30 - tipo.size() - strlen(devCfg.SerialNumber)), ' '));
 
-                        K::Logger::Logg2(classe, stream, FMT("| * DSP: %s - PCI bus: %02d, PCI slot: %02d%s|")
-                                    % dspCfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
-                                    % std::string(std::max<int>(30 - strlen(dspCfg.DspVersion), 0), ' '));
+                            K::Logger::Logg2(classe, stream, FMT("| * DSP: %s - PCI bus: %02d, PCI slot: %02d%s|")
+                                        % dspCfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
+                                        % std::string(std::max<int>(30 - strlen(dspCfg.DspVersion), 0), ' '));
 
-                        K::Logger::Logg2(classe, stream, FMT("| * %-62s |") % dspCfg.FwVersion);
+                            K::Logger::Logg2(classe, stream, FMT("| * %-62s |") % dspCfg.FwVersion);
+                        } break;
+
+                        case Cli::CONCISE:
+                        {
+                            K::Logger::Logg2(classe, stream, FMT("%02d;%s;%d;%d;%s;%02d;%02d;%s")
+                                        % i % tipo % atoi(devCfg.SerialNumber) % devCfg.ChannelCount
+                                        % dspCfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
+                                        % dspCfg.FwVersion);
+                        } break;
+
+                        case Cli::XML:
+                        {
+                            /* boards/board */
+                            switch_xml_t xdev = switch_xml_add_child_d(xdev,"device",0);
+                            switch_xml_set_attr_d(xdev,"id",STR(FMT("%02u") % i));
+
+                            /* boards/board/general */
+                            switch_xml_t xgeneral = switch_xml_add_child_d(xdev,"general",0);
+    
+                            /* boards/board/general/type */
+                            switch_xml_t xtype = switch_xml_add_child_d(xgeneral,"type",0);
+                            switch_xml_set_txt_d(xtype,tipo.c_str());
+
+                            /* boards/board/general/serial */
+                            switch_xml_t xserial = switch_xml_add_child_d(xgeneral,"serial",0);
+                            switch_xml_set_txt_d(xserial, devCfg.SerialNumber);
+
+                            /* boards/board/general/channels */
+                            switch_xml_t xchannels = switch_xml_add_child_d(xgeneral,"channels",0);
+                            switch_xml_set_txt_d(xchannels, STR(FMT("%02d") % devCfg.ChannelCount));
+
+                            /* boards/board/general/links */
+                            switch_xml_t xlinks = switch_xml_add_child_d(xgeneral,"links",0);
+                            switch_xml_set_txt_d(xlinks, STR(FMT("%d") % devCfg.LinkCount));
+
+                            /* boards/board/hardware */
+                            switch_xml_t xhardware = switch_xml_add_child_d(xdev,"hardware",0);
+
+                            /* boards/board/hardware/dsps */
+                            switch_xml_t xdsps = switch_xml_add_child_d(xhardware,"dsps",0);
+
+                            /* boards/board/hardware/dsps/dsp */
+                            switch_xml_t xdsp = switch_xml_add_child_d(xdsps,"dsp",0);
+                            switch_xml_set_attr_d(xdsp,"id","0");
+
+                            /* boards/board/hardware/dsps/dsp/version */
+                            switch_xml_t xversion_a = switch_xml_add_child_d(xdsp,"version",0);
+                            switch_xml_set_txt_d(xversion_a, dspCfg.DspVersion);
+
+                            /* boards/board/hardware/dsps/dsp/firmware*/
+                            switch_xml_t xfirmware = switch_xml_add_child_d(xdsp,"firmware",0);
+                            switch_xml_set_txt_d(xfirmware,dspCfg.FwVersion);
+
+                            /* boards/board/hardware/dsps/dsp/pci */
+                            switch_xml_t xpci = switch_xml_add_child_d(xhardware,"pci",0);
+                            switch_xml_set_attr_d(xpci,"bus" ,STR(FMT("%02d") % devCfg.PciBus ));
+                            switch_xml_set_attr_d(xpci,"slot",STR(FMT("%02d") % devCfg.PciSlot));
+                        } break;
+
+                        default:
+                            break;
                     }
                 }
 
@@ -510,24 +743,71 @@ bool Cli::_KhompSummary::execute(int argc, char *argv[])
 
                 if (k3lGetDeviceConfig(i, ksoFirmware + kfiGSMUSB, &dspCfg, sizeof(dspCfg)) == ksSuccess)
                 {
-                    if (concise)
+                    switch(output_type)
                     {
-                        K::Logger::Logg2(classe, stream, FMT("%02d;%s;%d;%d;%s;%02d;%02d;%s")
-                                    % i % tipo % atoi(devCfg.SerialNumber) % devCfg.ChannelCount
-                                    % dspCfg.DspVersion % devCfg.PciBus % devCfg.PciSlot
-                                    % dspCfg.FwVersion);
-                    }
-                    else
-                    {
-                        K::Logger::Logg2(classe, stream, FMT("| [[ %02d ]] %s, serial '%s', %02d channels. %s|")
-                            % i % tipo % devCfg.SerialNumber % devCfg.ChannelCount
-                            % std::string(std::max<int>(0, 30 - tipo.size() - strlen(devCfg.SerialNumber)), ' '));
+                        case Cli::VERBOSE:
+                        {
+                            K::Logger::Logg2(classe, stream, FMT("| [[ %02d ]] %s, serial '%s', %02d channels. %s|")
+                                % i % tipo % devCfg.SerialNumber % devCfg.ChannelCount
+                                % std::string(std::max<int>(0, 30 - tipo.size() - strlen(devCfg.SerialNumber)), ' '));
 
-                        int size = strlen(dspCfg.DspVersion) + strlen(dspCfg.FwVersion);
+                            int size = strlen(dspCfg.DspVersion) + strlen(dspCfg.FwVersion);
 
-                        K::Logger::Logg2(classe, stream, FMT("| * DSP: %s - %s%s|")
-                            % dspCfg.DspVersion % dspCfg.FwVersion
-                            % std::string(std::max<int>(55 - size, 0), ' '));
+                            K::Logger::Logg2(classe, stream, FMT("| * DSP: %s - %s%s|")
+                                % dspCfg.DspVersion % dspCfg.FwVersion
+                                % std::string(std::max<int>(55 - size, 0), ' '));
+                            
+                        } break;
+
+                        case Cli::CONCISE:
+                        {
+                            K::Logger::Logg2(classe, stream, FMT("%02d;%s;%d;%d;%s;%s")
+                                        % i % tipo % atoi(devCfg.SerialNumber) % devCfg.ChannelCount
+                                        % dspCfg.DspVersion % dspCfg.FwVersion);
+                        } break;
+
+                        case Cli::XML:
+                        {
+                            /* boards/board */
+                            switch_xml_t xdev = switch_xml_add_child_d(xdev,"device",0);
+                            switch_xml_set_attr_d(xdev,"id",STR(FMT("%02u") % i));
+
+                            /* boards/board/general */
+                            switch_xml_t xgeneral = switch_xml_add_child_d(xdev,"general",0);
+    
+                            /* boards/board/general/type */
+                            switch_xml_t xtype = switch_xml_add_child_d(xgeneral,"type",0);
+                            switch_xml_set_txt_d(xtype,tipo.c_str());
+
+                            /* boards/board/general/serial */
+                            switch_xml_t xserial = switch_xml_add_child_d(xgeneral,"serial",0);
+                            switch_xml_set_txt_d(xserial, devCfg.SerialNumber);
+
+                            /* boards/board/general/channels */
+                            switch_xml_t xchannels = switch_xml_add_child_d(xgeneral,"channels",0);
+                            switch_xml_set_txt_d(xchannels, STR(FMT("%02d") % devCfg.ChannelCount));
+
+                            /* boards/board/hardware */
+                            switch_xml_t xhardware = switch_xml_add_child_d(xdev,"hardware",0);
+                            
+                            /* boards/board/hardware/dsps */
+                            switch_xml_t xdsps = switch_xml_add_child_d(xhardware,"dsps",0);
+
+                            /* boards/board/hardware/dsp */
+                            switch_xml_t xdsp = switch_xml_add_child_d(xdsps,"dsp",0);
+                            switch_xml_set_attr_d(xdsp,"id","0");
+
+                            /* boards/board/hardware/dsps/dsp/version */
+                            switch_xml_t xversion_a = switch_xml_add_child_d(xdsp,"version",0);
+                            switch_xml_set_txt_d(xversion_a, dspCfg.DspVersion);
+
+                            /* boards/board/hardware/dsps/dsp/firmware */
+                            switch_xml_t xfirmware = switch_xml_add_child_d(xdsp,"firmware",0);
+                            switch_xml_set_txt_d(xfirmware,dspCfg.FwVersion);
+                        } break;
+
+                        default:
+                            break;
                     }
                 }
 
@@ -541,8 +821,14 @@ bool Cli::_KhompSummary::execute(int argc, char *argv[])
         }
     }
 
-    if (!concise)
+    if (output_type == Cli::VERBOSE)
         K::Logger::Logg2(classe,stream, " ------------------------------------------------------------------");
+      
+    if (output_type == Cli::XML)
+    {
+        printXMLOutput(stream);
+        clearRoot();
+    }
 
     return true;
 }
@@ -622,7 +908,7 @@ bool Cli::_KhompShowCalls::execute(int argc, char *argv[])
             }    
         }
     }
-    catch(K3LAPI::invalid_channel & err)
+    catch(K3LAPITraits::invalid_channel & err)
     {
         K::Logger::Logg2(C_CLI, stream, "ERROR: No such chanel");
         return false;
@@ -653,9 +939,9 @@ bool Cli::_KhompChannelsDisconnect::forceDisconnect(unsigned int device, unsigne
         ret = pvt->command(KHOMP_LOG,CM_DISCONNECT);
         DBG(FUNC,PVT_FMT(pvt->target(),"Command CM_DISCONNECT sent!"));
     }
-    catch (K3LAPI::invalid_channel & err)
+    catch (K3LAPITraits::invalid_channel & err)
     {
-        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.channel % err.device );
+        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.object % err.device );
     }
     catch (ScopedLockFailed & err)
     {
@@ -835,35 +1121,69 @@ bool Cli::_KhompChannelsUnblock::execute(int argc, char *argv[])
     return true;
 }
 
-void Cli::_KhompShowStatistics::cliStatistics(unsigned int device)
+void Cli::_KhompShowStatistics::cliStatistics(unsigned int device, OutputType output_type)
 {
+    if(output_type == Cli::XML)
+    {
+        /* device */
+        xdevs = switch_xml_add_child_d(root,"device",0);
+        switch_xml_set_attr_d(xdevs,"id",STR(FMT("%d") % device));
+    }
+
     for (unsigned int channel = 0; channel < Globals::k3lapi.channel_count(device); channel++)
     {
         try
         {
             Board::KhompPvt *pvt = Board::get(device, channel);
-            K::Logger::Logg2(C_CLI,stream,pvt->getStatistics(Statistics::ROW).c_str());
+            switch(output_type)
+            {
+                case Cli::VERBOSE:
+                    K::Logger::Logg2(C_CLI,stream,pvt->getStatistics(Statistics::ROW).c_str());
+                    break;
+                case Cli::CONCISE:
+                    /* do we need concise ? */
+                    break;
+                case Cli::XML:
+                    switch_xml_insert(pvt->getStatisticsXML(Statistics::ROW),xdevs,0);
+                    break;
+            }
         }
-        catch (K3LAPI::invalid_channel & err)
+        catch (K3LAPITraits::invalid_channel & err)
         {
-            K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.channel % err.device );
+            K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.object % err.device );
         }
     }    
 }
 
-void Cli::_KhompShowStatistics::cliDetailedStatistics(unsigned int device, unsigned int channel)
+void Cli::_KhompShowStatistics::cliDetailedStatistics(unsigned int device, unsigned int channel, OutputType output_type)
 {
     try
     {
         Board::KhompPvt *pvt = Board::get(device, channel);
-        K::Logger::Logg2(C_CLI,stream,"----------------------------------------------");
-        K::Logger::Logg2(C_CLI,stream,FMT("Detailed statistics of: Device %02d - Channel %02d") % pvt->target().device % pvt->target().object);
-        K::Logger::Logg2(C_CLI,stream,pvt->getStatistics(Statistics::DETAILED).c_str());
-        K::Logger::Logg2(C_CLI,stream,"----------------------------------------------");
+        switch(output_type)
+        {
+            case Cli::DETAILED:
+            {
+                K::Logger::Logg2(C_CLI,stream,"----------------------------------------------");
+                K::Logger::Logg2(C_CLI,stream,FMT("Detailed statistics of: Device %02d - Channel %02d") % pvt->target().device % pvt->target().object);
+                K::Logger::Logg2(C_CLI,stream,pvt->getStatistics(Statistics::DETAILED).c_str());
+                K::Logger::Logg2(C_CLI,stream,"----------------------------------------------");
+            } break;
+
+            case Cli::CONCISE:
+            {
+                /* We don't have xml, need concise yet ? */
+            } break;
+
+            case Cli::XML:
+            {
+                /* We don't have concise, need XML yet ? */
+            } break;
+        }
     }
-    catch (K3LAPI::invalid_channel & err)
+    catch (K3LAPITraits::invalid_channel & err)
     {
-        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.channel % err.device );
+        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.object % err.device );
     }
 }
 
@@ -874,19 +1194,21 @@ bool Cli::_KhompShowStatistics::execute(int argc, char *argv[])
         printUsage(stream);
         return false;
     }
+
     unsigned int dev = UINT_MAX;
     unsigned int obj = UINT_MAX;
-    int detailed = 0, verbose  = 0; 
+    int detailed = 0, verbose  = 0, as_xml = 0; 
+    OutputType output_type = Cli::VERBOSE;
 
     detailed = ((argc > 2)  && (!strcasecmp(argv[2], "detailed")) ? 1 : 0 ); 
     verbose  = ((argc > 2)  && (!strcasecmp(argv[2], "verbose"))  ? 1 : 0 ); 
+    as_xml   = ((argc > 2)  && (!strcasecmp(argv[2], "xml"))      ? 1 : 0 ); 
 
     try  
     {   
-
-        if(argc > (2+detailed+verbose))
+        if(argc > (2+detailed+verbose+as_xml))
         {
-            dev = Strings::tolong(argv[2+detailed+verbose]);
+            dev = Strings::tolong(argv[2+detailed+verbose+as_xml]);
             if (!Globals::k3lapi.valid_device(dev))
             {    
                 K::Logger::Logg2(C_CLI, stream, "ERROR: No such device!");
@@ -894,9 +1216,9 @@ bool Cli::_KhompShowStatistics::execute(int argc, char *argv[])
             }    
         }
 
-        if (argc > (3+detailed+verbose))
+        if (argc > (3+detailed+verbose+as_xml))
         {   
-            std::string object(argv[3+detailed+verbose]);
+            std::string object(argv[3+detailed+verbose+as_xml]);
             obj = Strings::tolong(object);
 
             if (!Globals::k3lapi.valid_channel(dev, obj))
@@ -910,7 +1232,14 @@ bool Cli::_KhompShowStatistics::execute(int argc, char *argv[])
     {    
         K::Logger::Logg2(C_CLI, stream, "ERROR: Invalid numeric value!");
         return false;
-    }    
+    }
+
+    if(detailed) output_type = Cli::DETAILED;
+    if(as_xml) 
+    {
+        createRoot("statistics");
+        output_type = Cli::XML;
+    }
     
     std::string header;
     header.append( " ------------------------------------------------------------------------------------\n");
@@ -926,42 +1255,92 @@ bool Cli::_KhompShowStatistics::execute(int argc, char *argv[])
     {
         if (obj != UINT_MAX)
         {
-            if(detailed != 0)
+            switch(output_type)
             {
-                cliDetailedStatistics (dev, obj);
-            }
-            else
-            {
-                K::Logger::Logg2(C_CLI,stream,header.c_str());
-                Board::KhompPvt *pvt = Board::get(dev, obj);
-                K::Logger::Logg2(C_CLI,stream,pvt->getStatistics(Statistics::ROW).c_str());
-                K::Logger::Logg2(C_CLI,stream,footer.c_str());
+                case Cli::VERBOSE:
+                {
+                    K::Logger::Logg2(C_CLI,stream,header.c_str());
+                    Board::KhompPvt *pvt = Board::get(dev, obj);
+                    K::Logger::Logg2(C_CLI,stream,pvt->getStatistics(Statistics::ROW).c_str());
+                    K::Logger::Logg2(C_CLI,stream,footer.c_str());
+                } break;
+
+                case Cli::DETAILED:
+                {
+                    cliDetailedStatistics (dev, obj, output_type);
+                } break;
+
+                case Cli::XML:
+                {
+                    /* no problem, nothing created */
+                    switch_xml_t xboard = NULL;
+
+                    /* device */
+                    xdevs = switch_xml_add_child_d(root,"device",0);
+                    switch_xml_set_attr_d(xdevs,"id",STR(FMT("%d") % dev));
+
+                    try
+                    {
+                        Board::KhompPvt *pvt = Board::get(dev, obj);
+                        switch_xml_insert(pvt->getStatisticsXML(Statistics::ROW),xdevs,0);
+                    }
+                    catch (K3LAPITraits::invalid_channel & err)
+                    {
+                        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.object % err.device );
+                    }
+
+                    printXMLOutput(stream);
+                    clearRoot();
+                } break;
             }
         }
         else
         {
-            if(detailed != 0)
+            switch(output_type)
             {
-                printUsage(stream);
-                return false;
-            }
+                case Cli::VERBOSE:
+                {
+                    K::Logger::Logg2(C_CLI,stream,header.c_str());
 
-            K::Logger::Logg2(C_CLI,stream,header.c_str());
+                    if (dev == UINT_MAX)
+                    {
+                        for (dev = 0; dev < Globals::k3lapi.device_count(); dev++)
+                            cliStatistics (dev, output_type);
+                    }
+                    else
+                    {
+                        cliStatistics (dev, output_type);
+                    }
 
-            if (dev == UINT_MAX)
-            {
-                for (dev = 0; dev < Globals::k3lapi.device_count(); dev++)
-                    cliStatistics (dev);
+                    K::Logger::Logg2(C_CLI,stream,footer.c_str());
+                } break;
+
+                case Cli::XML:
+                {
+                    if (dev == UINT_MAX)
+                    {
+                        for (dev = 0; dev < Globals::k3lapi.device_count(); dev++)
+                            cliStatistics (dev, output_type);
+                    }
+                    else
+                    {
+                        cliStatistics (dev, output_type);
+                    }
+
+                    printXMLOutput(stream);
+                    clearRoot();
+
+                } break;
+
+                case Cli::DETAILED:
+                {
+                    printUsage(stream);
+                    return false;
+                } break;
             }
-            else
-            {
-                cliStatistics (dev);
-            }
-        
-            K::Logger::Logg2(C_CLI,stream,footer.c_str());
         }
     }
-    catch(K3LAPI::invalid_channel &e)
+    catch(K3LAPITraits::invalid_channel &e)
     {
         K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % obj % dev );
     }
@@ -969,11 +1348,10 @@ bool Cli::_KhompShowStatistics::execute(int argc, char *argv[])
     return true;
 }
 
-void Cli::_KhompShowChannels::showChannel(unsigned int device, bool concise, unsigned int channel)
+void Cli::_KhompShowChannels::showChannel(unsigned int device, unsigned int channel, OutputType output_type)
 {
     try
     {
-
         Board::KhompPvt *pvt = Board::get(device, channel);
 
         DBG(FUNC, PVT_FMT(pvt->target(), "found channel.."));
@@ -990,78 +1368,129 @@ void Cli::_KhompShowChannels::showChannel(unsigned int device, bool concise, uns
         std::string tmp_call = Globals::k3lutil.callStatus(
                 pvt->target().device, 
                 pvt->target().object, 
-                (concise ? Verbose::EXACT : Verbose::HUMAN));
+                (output_type == Cli::CONCISE ? Verbose::EXACT : Verbose::HUMAN));
 
         std::string tmp_chan = Globals::k3lutil.channelStatus(
                 pvt->target().device, 
                 pvt->target().object, 
-                (concise ? Verbose::EXACT : Verbose::HUMAN));
+                (output_type == Cli::CONCISE ? Verbose::EXACT : Verbose::HUMAN));
 
-        if (concise)
-        {   
-            std::string state = pvt->getStateString();
 
-            if (pvt->getSignaling() == ksigGSM)
-            {    
-                K3L_GSM_CHANNEL_STATUS gsmStatus;
+        switch(output_type)
+        {
+            case Cli::VERBOSE:
+            {
+                if (pvt->getSignaling() == ksigGSM)
+                {    
+                    K3L_GSM_CHANNEL_STATUS gsmStatus;
 
-                if (k3lGetDeviceStatus(device, channel + ksoGsmChannel, &gsmStatus, sizeof(gsmStatus)) != ksSuccess)
-                    return;
+                    if (k3lGetDeviceStatus(device, channel + ksoGsmChannel, &gsmStatus, sizeof(gsmStatus)) != ksSuccess)
+                        return;
 
-                const unsigned int sign_numb = (gsmStatus.SignalStrength != 255 ? gsmStatus.SignalStrength : 0);
+                    const unsigned int sign_numb = (gsmStatus.SignalStrength != 255 ? gsmStatus.SignalStrength : 0);
 
-                std::string gsm_registry = (strlen(gsmStatus.OperName) != 0 ? gsmStatus.OperName : "<none>");
+                    const unsigned int full_size = 10;
+                    const unsigned int sign_size = std::min((sign_numb * full_size) / 100, full_size);
 
-                K::Logger::Logg2(C_CLI, stream, FMT("B%02dC%02d:%s:%s:%s:%d%%:%s")
-                        % device % channel % state % tmp_call % tmp_chan
-                        % sign_numb % gsm_registry);
-            }    
-            else 
-            {    
-                K::Logger::Logg2(C_CLI, stream, FMT("B%02dC%02d:%s:%s:%s")
-                        % device % channel %  state % tmp_call % tmp_chan);
-            }    
-        }    
-        else 
-        {    
-            if (pvt->getSignaling() == ksigGSM)
-            {    
-                K3L_GSM_CHANNEL_STATUS gsmStatus;
+                    std::string tmp_antenna_level;
 
-                if (k3lGetDeviceStatus(device, channel + ksoGsmChannel, &gsmStatus, sizeof(gsmStatus)) != ksSuccess)
-                    return;
+                    for (unsigned int i = 0; i < sign_size; i++) 
+                        tmp_antenna_level += '*'; 
 
-                const unsigned int sign_numb = (gsmStatus.SignalStrength != 255 ? gsmStatus.SignalStrength : 0);
+                    for (unsigned int i = sign_size; i < full_size; i++) 
+                        tmp_antenna_level += ' '; 
 
-                const unsigned int full_size = 10;
-                const unsigned int sign_size = std::min((sign_numb * full_size) / 100, full_size);
+                    tmp_chan += " (";
+                    tmp_chan += (strlen(gsmStatus.OperName) != 0 ? gsmStatus.OperName : "...");
+                    tmp_chan += ")"; 
 
-                std::string tmp_antenna_level;
+                    K::Logger::Logg2(C_CLI, stream, FMT("| %d,%02d | %8s | %8s | %-23s | %02d%% |%s|")
+                            % device % channel %  pvt->getStateString() % tmp_call % tmp_chan
+                            % sign_numb % tmp_antenna_level);
+                }    
+                else 
+                {    
+                    K::Logger::Logg2(C_CLI, stream, FMT("| %d,%02d | %8s | %8s | %-40s |")
+                            % device % channel % pvt->getStateString() % tmp_call % tmp_chan);
+                }    
 
-                for (unsigned int i = 0; i < sign_size; i++) 
-                    tmp_antenna_level += '*'; 
+            } break;
 
-                for (unsigned int i = sign_size; i < full_size; i++) 
-                    tmp_antenna_level += ' '; 
+            case Cli::CONCISE:   
+            {
+                std::string state = pvt->getStateString();
 
-                tmp_chan += " (";
-                tmp_chan += (strlen(gsmStatus.OperName) != 0 ? gsmStatus.OperName : "...");
-                tmp_chan += ")"; 
+                if (pvt->getSignaling() == ksigGSM)
+                {    
+                    K3L_GSM_CHANNEL_STATUS gsmStatus;
+
+                    if (k3lGetDeviceStatus(device, channel + ksoGsmChannel, &gsmStatus, sizeof(gsmStatus)) != ksSuccess)
+                        return;
+
+                    const unsigned int sign_numb = (gsmStatus.SignalStrength != 255 ? gsmStatus.SignalStrength : 0);
+
+                    std::string gsm_registry = (strlen(gsmStatus.OperName) != 0 ? gsmStatus.OperName : "<none>");
+
+                    K::Logger::Logg2(C_CLI, stream, FMT("B%02dC%02d:%s:%s:%s:%d%%:%s")
+                            % device % channel % state % tmp_call % tmp_chan
+                            % sign_numb % gsm_registry);
+                }    
+                else 
+                {    
+                    K::Logger::Logg2(C_CLI, stream, FMT("B%02dC%02d:%s:%s:%s")
+                            % device % channel %  state % tmp_call % tmp_chan);
+                }    
+
+            } break;
+
+            case Cli::XML:
+            {
+                /* device/channel */
+                switch_xml_t xchannel = switch_xml_add_child_d(xdev,"channel",0);
+                switch_xml_set_attr_d(xchannel,"id",STR(FMT("%d") % channel));
+
+                /* device/channel/fs_state */
+                switch_xml_t xstate = switch_xml_add_child_d(xchannel,"fs_state",0);
+                switch_xml_set_txt_d(xstate, pvt->getStateString().c_str());
+               
+                /* device/channel/call */
+                switch_xml_t xcall = switch_xml_add_child_d(xchannel,"call",0);
+                switch_xml_set_txt_d(xcall, tmp_call.c_str());
+
+                /* device/channel/status */
+                switch_xml_t xstatus = switch_xml_add_child_d(xchannel,"status",0);
+                switch_xml_set_txt_d(xstatus, tmp_chan.c_str());
+
+                if (pvt->getSignaling() == ksigGSM)
+                {   
+                    K3L_GSM_CHANNEL_STATUS gsmStatus;
+
+                    if (k3lGetDeviceStatus(device, channel + ksoGsmChannel, &gsmStatus, sizeof(gsmStatus)) != ksSuccess)
+                        return;
+
+                    const unsigned int sign_numb = (gsmStatus.SignalStrength != 255 ? gsmStatus.SignalStrength : 0);
+                    std::string gsm_registry = (strlen(gsmStatus.OperName) != 0 ? gsmStatus.OperName : "<none>");
+
+                    /* device/channel/signal */
+                    switch_xml_t xsign_numb = switch_xml_add_child_d(xchannel, "signal", 0);
+                    switch_xml_set_txt_d(xsign_numb, STR(FMT("%d") % sign_numb));
+
+                    /* device/channel/registry */
+                    switch_xml_t xgsm_registry = switch_xml_add_child_d(xchannel, "registry", 9);
+                    switch_xml_set_txt_d(xgsm_registry, gsm_registry.c_str());
+                }    
+            
+            } break;
+
+            default:
+                /* do nothing */ 
+                break;
+        }
 
-                K::Logger::Logg2(C_CLI, stream, FMT("| %d,%02d | %8s | %8s | %-23s | %02d%% |%s|")
-                        % device % channel %  pvt->getStateString() % tmp_call % tmp_chan
-                        % sign_numb % tmp_antenna_level);
-            }    
-            else 
-            {    
-                K::Logger::Logg2(C_CLI, stream, FMT("| %d,%02d | %8s | %8s | %-40s |")
-                        % device % channel % pvt->getStateString() % tmp_call % tmp_chan);
-            }    
-        }    
     }    
-    catch (K3LAPI::invalid_channel & err)
+    catch (K3LAPITraits::invalid_channel & err)
     {
-        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.channel % err.device );
+        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.object % err.device );
     }
     catch (...)
     {    
@@ -1069,18 +1498,26 @@ void Cli::_KhompShowChannels::showChannel(unsigned int device, bool concise, uns
     }   
 }
 
-void Cli::_KhompShowChannels::showChannels(unsigned int device, bool concise)
+void Cli::_KhompShowChannels::showChannels(unsigned int device, OutputType output_type)
 {
+    if(output_type == Cli::XML)
+    {
+        /* channels/device */
+        xdev = switch_xml_add_child_d(root,"device",0);
+        switch_xml_set_attr_d(xdev, "id", STR(FMT("%d") % device));
+    }
+
     for (unsigned int channel = 0; channel < Globals::k3lapi.channel_count(device); channel++)
     {
-        showChannel(device, concise, channel);
+        showChannel(device, channel, output_type);
     }
 }
 
 bool Cli::_KhompShowChannels::execute(int argc, char *argv[])
 {
     unsigned int dev = UINT_MAX;
-    int concise = 0, verbose = 0; 
+    int concise = 0, verbose = 0, as_xml = 0;
+    OutputType output_type = Cli::VERBOSE;
 
     bool onlyShowOneChannel = false;
     unsigned int channelToShow = 0; 
@@ -1093,10 +1530,11 @@ bool Cli::_KhompShowChannels::execute(int argc, char *argv[])
 
     concise = ( ((argc == 3) || (argc == 4) || (argc == 5) ) && (ARG_CMP(2, "concise")) ? 1 : 0 ); 
     verbose = ( ((argc == 3) || (argc == 4) || (argc == 5) ) && (ARG_CMP(2, "verbose")) ? 1 : 0 ); 
+    as_xml  = ( ((argc == 3) || (argc == 4) || (argc == 5) ) && (ARG_CMP(2, "xml"))     ? 1 : 0 ); 
 
-    if (argc >= (3 + concise + verbose))
+    if (argc >= (3 + concise + verbose + as_xml))
     {    
-        dev = atoi (argv[2 + concise + verbose]);
+        dev = atoi (argv[2 + concise + verbose + as_xml]);
 
         if (!Globals::k3lapi.valid_device(dev))
         {    
@@ -1104,14 +1542,14 @@ bool Cli::_KhompShowChannels::execute(int argc, char *argv[])
             return false;
         }    
         
-        if (argc == ( 4 + concise + verbose ))
+        if (argc == ( 4 + concise + verbose + as_xml))
         {
             onlyShowOneChannel = true;
-            channelToShow = atoi (argv[3 + concise + verbose]);
+            channelToShow = atoi (argv[3 + concise + verbose + as_xml]);
         }    
     }    
 
-    if (concise == 0)
+    if (concise == 0 && as_xml == 0)
     {    
         K::Logger::Logg2(C_CLI, stream, " -----------------------------------------------------------------------");
         K::Logger::Logg2(C_CLI, stream, "|-------------------- Khomp Channels and Connections -------------------|");
@@ -1119,13 +1557,29 @@ bool Cli::_KhompShowChannels::execute(int argc, char *argv[])
         K::Logger::Logg2(C_CLI, stream, "|  hw  |freeSWITCH|   call   |                   channel                |");
         K::Logger::Logg2(C_CLI, stream, "|  id  |  status  |  status  |                   status                 |");
         K::Logger::Logg2(C_CLI, stream, " -----------------------------------------------------------------------");
-    }    
+    } 
+
+    if (concise != 0) output_type = Cli::CONCISE;
+    if (as_xml  != 0) 
+    {
+        output_type = Cli::XML;
+
+        /* channels */
+        createRoot("channels");
+    }
 
     if ( onlyShowOneChannel )
     {    
         if ( channelToShow <  Globals::k3lapi.channel_count(dev) )
         {    
-            showChannel (dev,(concise == 0 ? false : true), channelToShow);
+            if(output_type == Cli::XML)
+            {
+                /* channels/device */
+                xdev = switch_xml_add_child_d(root,"device",0);
+                switch_xml_set_attr_d(xdev, "id", STR(FMT("%d") % dev));
+            }
+
+            showChannel (dev, channelToShow, output_type);
         }    
         else 
         {    
@@ -1136,74 +1590,173 @@ bool Cli::_KhompShowChannels::execute(int argc, char *argv[])
     {    
         for (dev = 0; dev < Globals::k3lapi.device_count(); dev++)
         {
-            showChannels(dev, (concise == 0 ? false : true));
+            showChannels(dev, output_type);
         }
     }    
     else 
     {    
-        showChannels ( dev, (concise == 0 ? false : true));
+        showChannels ( dev, output_type);
     }
 
-    if (concise == 0)
+    if (concise == 0 && as_xml == 0)
         K::Logger::Logg2(C_CLI, stream, " -----------------------------------------------------------------------");
 
+    if(output_type == Cli::XML)
+    {
+        printXMLOutput(stream);
+        clearRoot();
+    }
+
     return true;
 }
 
-void Cli::_KhompShowLinks::showLinks(unsigned int device, bool concise)
+std::string Cli::_KhompShowLinks::getLinkStatus(int dev, int obj, Verbose::Presentation fmt)
 {
-    if (!concise)
+    switch(Globals::k3lapi.device_type(dev))
+    {
+        case kdtE1FXSSpx:
+            if (obj == 1)
+                return Globals::k3lutil.linkStatus(dev, obj, fmt, ksigAnalogTerminal, true);
+        default:
+            break;
+    }
+
+    std::string res;
+
+    try  
+    {    
+        const K3L_LINK_CONFIG & conf = Globals::k3lapi.link_config(dev, obj);
+        
+        res = Globals::k3lutil.linkStatus(dev, obj, fmt);
+
+        if (conf.ReceivingClock & 0x01)
+           res += (fmt == Verbose::EXACT ? ",sync" : " (sync)");
+    }    
+    catch (K3LAPITraits::invalid_target & e) 
+    {    
+        res = "<error>";
+    }    
+
+    return res; 
+}
+
+void Cli::_KhompShowLinks::showLinks(unsigned int device, OutputType output_type)
+{
+    if (output_type != Cli::CONCISE && output_type != Cli::XML)
         K::Logger::Logg2(C_CLI, stream, "|------------------------------------------------------------------------|");
 
     switch (Globals::k3lutil.physicalLinkCount(device, true))
     {
         case 1:
         {
-            std::string str_link0 = Globals::k3lutil.getLinkStatus(device, 0, (concise ? Verbose::EXACT : Verbose::HUMAN));
+            std::string str_link0 = getLinkStatus(device, 0, (output_type == Cli::CONCISE ? Verbose::EXACT : Verbose::HUMAN));
+        
+            switch(output_type)
+            {
+                case Cli::VERBOSE:
+                {
+                    K::Logger::Logg2(C_CLI, stream, FMT("| Link '0' on board '%d': %-47s |") % device % str_link0);
+                } break;
+
+                case Cli::CONCISE:
+                {
+                    K::Logger::Logg2(C_MESSAGE, stream, FMT("B%02dL00:%s") % device % str_link0);
+                } break;
+
+                case Cli::XML:
+                {
+                    /* device */
+                    xdev = switch_xml_add_child_d(root,"device",0);
+                    switch_xml_set_attr_d(xdev,"id",STR(FMT("%d") % device));
+                  
+                    /* device/links */
+                    switch_xml_t xlinks = switch_xml_add_child_d(xdev,"links",0);
+
+                    /* device/links/link */
+                    switch_xml_t xlink = switch_xml_add_child_d(xlinks,"link",0);
+                    switch_xml_set_attr_d(xlink, "id", "0");
+                    switch_xml_set_txt_d(xlink, str_link0.c_str());
+                } break;
+            }
 
-            if (concise)
-                K::Logger::Logg2(C_MESSAGE, stream, FMT("B%02dL00:%s") % device % str_link0);
-            else
-                K::Logger::Logg2(C_CLI, stream, FMT("| Link '0' on board '%d': %-47s |") % device % str_link0);
             break;
         }
 
         case 2:
         {
-            std::string str_link0 = Globals::k3lutil.getLinkStatus(device, 0, (concise ? Verbose::EXACT : Verbose::HUMAN));
-            std::string str_link1 = Globals::k3lutil.getLinkStatus(device, 1, (concise ? Verbose::EXACT : Verbose::HUMAN));
+            std::string str_link0 = getLinkStatus(device, 0, (output_type == Cli::CONCISE ? Verbose::EXACT : Verbose::HUMAN));
+            std::string str_link1 = getLinkStatus(device, 1, (output_type == Cli::CONCISE ? Verbose::EXACT : Verbose::HUMAN));
 
-            if (concise)
+            switch(output_type)
             {
-                K::Logger::Logg2(C_MESSAGE, stream, FMT("B%02dL00:%s") % device % str_link0);
-                K::Logger::Logg2(C_MESSAGE, stream, FMT("B%02dL01:%s") % device % str_link1);
-            }
-            else
-            {
-                K::Logger::Logg2(C_CLI, stream, FMT("|------ Link '0' on board '%d' ------||------ Link '1' on board '%d' ------|")
-                    % device % device);
+                case Cli::VERBOSE:
+                {
+                    K::Logger::Logg2(C_CLI, stream, FMT("|------ Link '0' on board '%d' ------||------ Link '1' on board '%d' ------|")
+                        % device % device);
 
-                K::Logger::Logg2(C_CLI, stream, FMT("| %-33s || %-33s |") % str_link0 % str_link1);
+                    K::Logger::Logg2(C_CLI, stream, FMT("| %-33s || %-33s |") % str_link0 % str_link1);
+                } break;
+
+                case Cli::CONCISE:
+                {
+                    K::Logger::Logg2(C_MESSAGE, stream, FMT("B%02dL00:%s") % device % str_link0);
+                    K::Logger::Logg2(C_MESSAGE, stream, FMT("B%02dL01:%s") % device % str_link1);
+                } break;
+
+                case Cli::XML:
+                {
+                    /* device */
+                    xdev = switch_xml_add_child_d(root,"device",0);
+                    switch_xml_set_attr_d(xdev,"id",STR(FMT("%d") % device));
+                  
+                    /* device/links */
+                    switch_xml_t xlinks = switch_xml_add_child_d(xdev,"links",0);
+
+                    /* device/links/link (0) */
+                    switch_xml_t xlink = switch_xml_add_child_d(xlinks,"link",0);
+                    switch_xml_set_attr_d(xlink, "id", "0");
+                    switch_xml_set_txt_d(xlink, str_link0.c_str());
+
+                    /* device/links/link (1) */
+                    switch_xml_t xlink1 = switch_xml_add_child_d(xlinks,"link",0);
+                    switch_xml_set_attr_d(xlink1, "id", "1");
+                    switch_xml_set_txt_d(xlink1, str_link0.c_str());
+                } break;
             }
 
             break;
         }
         default:
         {
-            if (concise)
-                K::Logger::Logg2(C_MESSAGE, stream, FMT("B%02dLXX:NoLinksAvailable") % device);
-            else
-                K::Logger::Logg2(C_CLI, stream, FMT("| Board '%d': %-59s |") % device % "No links available.");
+            switch(output_type)
+            {
+                case Cli::VERBOSE:
+                {
+                    K::Logger::Logg2(C_CLI, stream, FMT("| Board '%d': %-59s |") % device % "No links available.");
+                } break;
+
+                case Cli::CONCISE:
+                {
+                    K::Logger::Logg2(C_MESSAGE, stream, FMT("B%02dLXX:NoLinksAvailable") % device);
+                } break;
+
+                case Cli::XML:
+                {
+                    /* device */
+                    xdev = switch_xml_add_child_d(root,"device",0);
+                    switch_xml_set_attr_d(xdev,"id",STR(FMT("%d") % device));
+                    switch_xml_set_txt_d(xdev,"NoLinksAvailable");
+                } break;
+            }
+
             break;
         }
     }
-
 }
 
-void Cli::_KhompShowLinks::showErrors(unsigned int device, bool concise)
+void Cli::_KhompShowLinks::showErrors(unsigned int device, OutputType output_type)
 {
-
-    if (!concise)
+    if (output_type != Cli::CONCISE && output_type != Cli::XML)
         K::Logger::Logg2(C_CLI, stream, "|-----------------------------------------------------------------------|");
 
     switch (Globals::k3lutil.physicalLinkCount(device, true))
@@ -1211,33 +1764,77 @@ void Cli::_KhompShowLinks::showErrors(unsigned int device, bool concise)
         case 2:
         {
             K3LUtil::ErrorCountType link0 = Globals::k3lutil.linkErrorCount(
-                    device, 0, (concise ? Verbose::EXACT : Verbose::HUMAN));
+                    device, 0, (output_type == Cli::CONCISE ? Verbose::EXACT : Verbose::HUMAN));
             K3LUtil::ErrorCountType link1 = Globals::k3lutil.linkErrorCount(
-                    device, 1, (concise ? Verbose::EXACT : Verbose::HUMAN));
+                    device, 1, (output_type == Cli::CONCISE ? Verbose::EXACT : Verbose::HUMAN));
 
-            if (concise)
+            switch(output_type)
             {
-                for (K3LUtil::ErrorCountType::iterator i = link0.begin(); i != link0.end(); i++)
-                    K::Logger::Logg2(C_CLI, stream, FMT("%d:0:%s:%d") % device % i->first % i->second);
-
-                for (K3LUtil::ErrorCountType::iterator i = link1.begin(); i != link1.end(); i++)
-                    K::Logger::Logg2(C_CLI, stream, FMT("%d:1:%s:%d") % device % i->first % i->second);
-            }
-            else
-            {
-                K::Logger::Logg2(C_CLI, stream, FMT("|----- Link '0' on board '%d' ------| |----- Link '1' on board '%d' ------|") % device % device);
-                K::Logger::Logg2(C_CLI, stream, "|----------------------------------| |----------------------------------|");
-                K::Logger::Logg2(C_CLI, stream, "|       Error type       | Number  | |       Error type       | Number  |");
-                K::Logger::Logg2(C_CLI, stream, "|----------------------------------| |----------------------------------|");
-
-                K3LUtil::ErrorCountType::iterator i = link0.begin();
-                K3LUtil::ErrorCountType::iterator j = link1.begin();
-
-                for (; i != link0.end() && j != link1.end(); i++, j++)
+                case Cli::VERBOSE:
                 {
-                    K::Logger::Logg2(C_CLI, stream, FMT("| %22s | %-7d | | %22s | %-7d |")
-                       % i->first % i->second % j->first % j->second);
-                }
+                    K::Logger::Logg2(C_CLI, stream, FMT("|----- Link '0' on board '%d' ------| |----- Link '1' on board '%d' ------|") % device % device);
+                    K::Logger::Logg2(C_CLI, stream, "|----------------------------------| |----------------------------------|");
+                    K::Logger::Logg2(C_CLI, stream, "|       Error type       | Number  | |       Error type       | Number  |");
+                    K::Logger::Logg2(C_CLI, stream, "|----------------------------------| |----------------------------------|");
+
+                    K3LUtil::ErrorCountType::iterator i = link0.begin();
+                    K3LUtil::ErrorCountType::iterator j = link1.begin();
+
+                    for (; i != link0.end() && j != link1.end(); i++, j++)
+                    {
+                        K::Logger::Logg2(C_CLI, stream, FMT("| %22s | %-7d | | %22s | %-7d |")
+                           % i->first % i->second % j->first % j->second);
+                    }
+                } break;
+
+                case Cli::CONCISE:
+                {
+                    for (K3LUtil::ErrorCountType::iterator i = link0.begin(); i != link0.end(); i++)
+                        K::Logger::Logg2(C_CLI, stream, FMT("%d:0:%s:%d") % device % i->first % i->second);
+
+                    for (K3LUtil::ErrorCountType::iterator i = link1.begin(); i != link1.end(); i++)
+                        K::Logger::Logg2(C_CLI, stream, FMT("%d:1:%s:%d") % device % i->first % i->second);
+                } break;
+
+                case Cli::XML:
+                {
+                    /* device */
+                    xdev = switch_xml_add_child_d(root,"device",0);
+                    switch_xml_set_attr_d(xdev,"id",STR(FMT("%d") % device));
+                  
+                    /* device/errors */
+                    switch_xml_t xerrors = switch_xml_add_child_d(xdev,"errors",0);
+
+                    /* device/errors/link (0) */ 
+                    switch_xml_t xlinks0 = switch_xml_add_child_d(xerrors,"link",0);
+                    switch_xml_set_attr_d(xlinks0,"id","0");
+
+                    for (K3LUtil::ErrorCountType::iterator i = link0.begin(); i != link0.end(); i++)
+                    {
+                        /* device/errors/link/type */
+                        switch_xml_t xtype0 = switch_xml_add_child_d(xlinks0,"type",0);
+                        switch_xml_set_txt_d(xtype0,i->first.c_str());
+
+                        /* device/errors/link/number */
+                        switch_xml_t xnumber0  = switch_xml_add_child_d(xlinks0,"number",0);
+                        switch_xml_set_txt_d(xnumber0,STR(FMT("%d") % i->second));
+                    }
+
+                    /* device/errors/link (1) */ 
+                    switch_xml_t xlinks1 = switch_xml_add_child_d(xerrors,"link",0);
+                    switch_xml_set_attr_d(xlinks1,"id","1");
+
+                    for (K3LUtil::ErrorCountType::iterator i = link1.begin(); i != link1.end(); i++)
+                    {
+                        /* device/errors/link/type */
+                        switch_xml_t xtype1 = switch_xml_add_child_d(xlinks1,"type",0);
+                        switch_xml_set_txt_d(xtype1,i->first.c_str());
+
+                        /* device/errors/link/number */
+                        switch_xml_t xnumber1  = switch_xml_add_child_d(xlinks1,"number",0);
+                        switch_xml_set_txt_d(xnumber1,STR(FMT("%d") % i->second));
+                    }
+                } break;
             }
 
             break;
@@ -1245,22 +1842,51 @@ void Cli::_KhompShowLinks::showErrors(unsigned int device, bool concise)
 
         case 1:
         {
-            K3LUtil::ErrorCountType link0 = Globals::k3lutil.linkErrorCount(device, 0, (concise ? Verbose::EXACT : Verbose::HUMAN));
+            K3LUtil::ErrorCountType link0 = Globals::k3lutil.linkErrorCount(device, 0, (output_type == Cli::CONCISE ? Verbose::EXACT : Verbose::HUMAN));
 
-            if (concise)
+            switch(output_type)
             {
-                for (K3LUtil::ErrorCountType::iterator i = link0.begin(); i != link0.end(); i++)
-                    K::Logger::Logg2(C_CLI, stream, FMT("%d:0:%s:%d") % device % i->first % i->second);
-            }
-            else
-            {
-                K::Logger::Logg2(C_CLI, stream, FMT("|------------------------ Link '0' on board '%d' ------------------------|") % device);
-                K::Logger::Logg2(C_CLI, stream, "|-----------------------------------------------------------------------|");
-                K::Logger::Logg2(C_CLI, stream, "|                      Error type                      |     Number     |");
-                K::Logger::Logg2(C_CLI, stream, "|-----------------------------------------------------------------------|");
+                case Cli::VERBOSE:
+                {
+                    K::Logger::Logg2(C_CLI, stream, FMT("|------------------------ Link '0' on board '%d' ------------------------|") % device);
+                    K::Logger::Logg2(C_CLI, stream, "|-----------------------------------------------------------------------|");
+                    K::Logger::Logg2(C_CLI, stream, "|                      Error type                      |     Number     |");
+                    K::Logger::Logg2(C_CLI, stream, "|-----------------------------------------------------------------------|");
 
-                for (K3LUtil::ErrorCountType::iterator i = link0.begin(); i != link0.end(); i++)
-                    K::Logger::Logg2(C_CLI, stream, FMT("| %52s | %-14d |") % i->first % i->second);
+                    for (K3LUtil::ErrorCountType::iterator i = link0.begin(); i != link0.end(); i++)
+                        K::Logger::Logg2(C_CLI, stream, FMT("| %52s | %-14d |") % i->first % i->second);
+                } break;
+
+                case Cli::CONCISE:
+                {
+                    for (K3LUtil::ErrorCountType::iterator i = link0.begin(); i != link0.end(); i++)
+                        K::Logger::Logg2(C_CLI, stream, FMT("%d:0:%s:%d") % device % i->first % i->second);
+                } break;
+
+                case Cli::XML:
+                {
+                    /* device */
+                    xdev = switch_xml_add_child_d(root,"device",0);
+                    switch_xml_set_attr_d(xdev,"id",STR(FMT("%d") % device));
+                  
+                    /* device/errors */
+                    switch_xml_t xerrors = switch_xml_add_child_d(xdev,"errors",0);
+
+                    /* device/errors/link (0) */ 
+                    switch_xml_t xlinks0 = switch_xml_add_child_d(xerrors,"link",0);
+                    switch_xml_set_attr_d(xlinks0,"id","0");
+
+                    for (K3LUtil::ErrorCountType::iterator i = link0.begin(); i != link0.end(); i++)
+                    {
+                        /* device/errors/link/type */
+                        switch_xml_t xtype0 = switch_xml_add_child_d(xlinks0,"type",0);
+                        switch_xml_set_txt_d(xtype0,i->first.c_str());
+
+                        /* device/errors/link/number */
+                        switch_xml_t xnumber0  = switch_xml_add_child_d(xlinks0,"number",0);
+                        switch_xml_set_txt_d(xnumber0,STR(FMT("%d") % i->second));
+                    }
+                } break;
             }
 
             break;
@@ -1268,7 +1894,7 @@ void Cli::_KhompShowLinks::showErrors(unsigned int device, bool concise)
 
         case 0:
         {
-            if (!concise)
+            if (output_type != Cli::XML && output_type != Cli::CONCISE)
                 K::Logger::Logg2(C_CLI, stream, FMT("|                     No links detected on board %d!                     |") % device);
 
             break;
@@ -1285,16 +1911,18 @@ bool Cli::_KhompShowLinks::execute(int argc, char *argv[])
     }
 
     unsigned int dev = UINT_MAX;
-    int concise = 0, verbose = 0, errors = 0;
+    int concise = 0, verbose = 0, as_xml = 0, errors = 0;
+    OutputType output_type = Cli::VERBOSE;
 
     errors = ( (argc > 2) && (!strcasecmp(argv[2],"errors")) ? 1 : 0 );
 
     concise = ( (argc > (2+errors)) && (!strcasecmp(argv[(2+errors)],"concise")) ? 1 : 0 );
     verbose = ( (argc > (2+errors)) && (!strcasecmp(argv[(2+errors)],"verbose")) ? 1 : 0 );
+    as_xml  = ( (argc > (2+errors)) && (!strcasecmp(argv[(2+errors)],"xml"))     ? 1 : 0 );
 
-    if(argc > (2+errors+concise+verbose))
+    if(argc > (2+errors+concise+verbose+as_xml))
     {
-        dev = atoi(argv[(2+errors+concise+verbose)]);
+        dev = atoi(argv[(2+errors+concise+verbose+as_xml)]);
 
         if (!Globals::k3lapi.valid_device(dev))
         {
@@ -1303,7 +1931,8 @@ bool Cli::_KhompShowLinks::execute(int argc, char *argv[])
         }
     }
 
-    if (!concise)
+
+    if (!concise && !as_xml)
     {
         K::Logger::Logg2(C_CLI, stream, " ------------------------------------------------------------------------");
         if(!errors)
@@ -1316,17 +1945,24 @@ bool Cli::_KhompShowLinks::execute(int argc, char *argv[])
         }
     }
 
+    if(concise) output_type = Cli::CONCISE;
+    if(as_xml)
+    {
+        output_type = Cli::XML;
+        createRoot("links");
+    }
+
     if (dev == UINT_MAX)
     {
         for (dev = 0; dev < Globals::k3lapi.device_count(); dev++)
         {
             if(!errors)
             {
-                showLinks (dev, (concise == 1));
+                showLinks (dev, output_type);
             }
             else
             {
-                showErrors(dev, (concise == 1));
+                showErrors(dev, output_type);
             }
         }
     }
@@ -1334,19 +1970,25 @@ bool Cli::_KhompShowLinks::execute(int argc, char *argv[])
     {
         if(!errors)
         {
-            showLinks (dev, (concise == 1));
+            showLinks (dev, output_type);
         }
         else
         {
-            showErrors(dev, (concise == 1));
+            showErrors(dev, output_type);
         }
     }
 
-    if (!concise)
+    if (!concise && !as_xml)
     {
         K::Logger::Logg2(C_CLI, stream, " ------------------------------------------------------------------------");
     }
 
+    if (as_xml) 
+    {
+        printXMLOutput(stream);
+        clearRoot();
+    }
+
     return true;
 }
 
@@ -1503,9 +2145,9 @@ bool Cli::_KhompClearStatistics::execute(int argc, char *argv[])
     }
 
     }
-    catch (K3LAPI::invalid_channel & err)
+    catch (K3LAPITraits::invalid_channel & err)
     {
-        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.channel % err.device );
+        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.object % err.device );
         return false;
     }
 
@@ -1636,7 +2278,7 @@ bool Cli::_KhompSMS::execute(int argc, char *argv[])
     }
 
     std::string complete = begin + devs + "/" + numb + "/" + mesg;
-    int cause;
+    int cause = (int)SWITCH_CAUSE_NONE;
 
     try
     {
@@ -1922,7 +2564,7 @@ bool Cli::_KhompLogTraceISDN::execute(int argc, char *argv[])
 
     std::string what;
 
-    for (unsigned int i = 4; i < (unsigned int)argc; i++)
+    for (unsigned int i = 3; i < (unsigned int)argc; i++)
     {
         what += argv[i];
         what += ",";
@@ -2045,10 +2687,10 @@ bool Cli::_KhompGet::execute(int argc, char *argv[])
 
     try  
     {    
-       std::string res = Globals::options.get((const char*) argv[1]);
+       std::string res = Globals::options.get(&Opt::_options, (const char*) argv[1]);
        K::Logger::Logg2(C_CLI, stream, FMT("Result for command %s is %s.") % std::string(argv[1]) % res);
-    }catch(ConfigProcessFailure &e){ 
-       K::Logger::Logg2(C_CLI, stream, (char*) e.msg.c_str());
+    }catch(Config::Failure &e){ 
+       K::Logger::Logg2(C_CLI, stream, e.what());
     }    
 
     return true;
@@ -2075,11 +2717,11 @@ bool Cli::_KhompSet::execute(int argc, char *argv[])
 
     try  
     {    
-        Globals::options.process((const char *) argv[1], (const char *) args.c_str());
+        Globals::options.process(&Opt::_options, (const char *) argv[1], (const char *) args.c_str());
     }    
-    catch (ConfigProcessFailure &e)
+    catch (Config::Failure &e)
     {    
-        K::Logger::Logg2(C_CLI,stream, FMT("config processing error: %s.") % e.msg.c_str());
+        K::Logger::Logg2(C_CLI,stream, FMT("config processing error: %s.") % e.what());
     }    
 
     return true;
@@ -2256,9 +2898,9 @@ bool Cli::_KhompSelectSim::execute(int argc, char *argv[])
         K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Invalid number '%s'!") % e.value());
         return false;
     }
-    catch (K3LAPI::invalid_channel & err)
+    catch (K3LAPITraits::invalid_channel & err)
     {
-        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.channel % err.device );
+        K::Logger::Logg2(C_CLI, stream, FMT("ERROR: Unable to find channel %d on device %d!") % err.object % err.device );
         return false;
     }
     catch(...)
@@ -2284,7 +2926,7 @@ bool Cli::_KhompKommuterOnOff::execute(int argc, char *argv[])
         case 0:  K::Logger::Logg2(C_CLI, stream, "ERROR: none Kommuter was found on the system." );              return false;
     }
     
-    if (Opt::_kommuter_activation == "auto")
+    if (Opt::_options._kommuter_activation() == "auto")
     {
         K::Logger::Logg2(C_CLI, stream, "ERROR: Kommuter is set to be started automatically by kommuter-activation configuration.");
         return false;
@@ -2295,7 +2937,7 @@ bool Cli::_KhompKommuterOnOff::execute(int argc, char *argv[])
     int ret = 0;
     if (on_off)
     {
-        int timeout = Opt::_kommuter_timeout;
+        int timeout = Opt::_options._kommuter_timeout();
         K::Logger::Logg2(C_CLI, stream, FMT("NOTICE: Activating Kommuters with timeout of %d seconds .") % timeout);
         bool start_timer = false;
 
diff --git a/src/mod/endpoints/mod_khomp/src/globals.cpp b/src/mod/endpoints/mod_khomp/src/globals.cpp
index cdc20efd4e..d43ff53bee 100644
--- a/src/mod/endpoints/mod_khomp/src/globals.cpp
+++ b/src/mod/endpoints/mod_khomp/src/globals.cpp
@@ -52,7 +52,9 @@ Globals::GlobalTimer           * Globals::global_timer = NULL;
 
 Globals::Mutex                   Globals::khomp_alloc_mutex;
 
-ConfigOptions                    Globals::options;
+Config::Options                  Globals::options;
+
+const Regex::Expression          Globals::regex_allocation("(((([bB])[ ]*([0-9]+))|(([sS])[ ]*([0-9]+)))[ ]*(([cClL])[ ]*([0-9]+)[ ]*([-][ ]*([0-9]+))?)?)|(([rR])[ ]*([0-9]+)[ ]*([-][ ]*([0-9]+))?)", Regex::E_EXTENDED);
 
 switch_endpoint_interface_t    * Globals::khomp_endpoint_interface     = NULL;
 switch_endpoint_interface_t    * Globals::khomp_sms_endpoint_interface = NULL;
diff --git a/src/mod/endpoints/mod_khomp/src/khomp_pvt.cpp b/src/mod/endpoints/mod_khomp/src/khomp_pvt.cpp
index 225312be54..3abbe3ecfb 100644
--- a/src/mod/endpoints/mod_khomp/src/khomp_pvt.cpp
+++ b/src/mod/endpoints/mod_khomp/src/khomp_pvt.cpp
@@ -54,7 +54,7 @@ char                Board::_cng_buffer[Globals::cng_buffer_size];
 Kommuter            Board::kommuter;
 
 
-Board::KhompPvt::KhompPvt(K3LAPI::target & target) :
+Board::KhompPvt::KhompPvt(K3LAPIBase::GenericTarget & target) :
   _target(target),
   _mutex(Globals::module_pool),
   _session(NULL),
@@ -66,6 +66,10 @@ Board::KhompPvt::KhompPvt(K3LAPI::target & target) :
     _write_codec.implementation = NULL;
 
     _pvt_statistics = new PvtStatistics(this);
+
+    _mohclass    = Opt::_options._global_mohclass();
+    _language    = Opt::_options._global_language();
+    _accountcode = Opt::_options._accountcode();
 }
 
 bool Board::initializeK3L(void)
@@ -82,7 +86,7 @@ bool Board::initializeK3L(void)
     }
     catch (K3LAPI::start_failed & e)
     {
-        LOG(ERROR,FMT("loading K3L API failed: %s") % e.msg);
+        LOG(ERROR,FMT("loading K3L API failed: %s") % e.what());
         return false;
     }
 
@@ -236,7 +240,7 @@ void Board::initializeChannels(void)
 
     for (unsigned obj = 0; obj < Globals::k3lapi.channel_count(_device_id); obj++)
     {
-        K3LAPI::target tgt(Globals::k3lapi, K3LAPI::target::CHANNEL, _device_id, obj);
+        K3LAPIBase::GenericTarget tgt(Globals::k3lapi, K3LAPIBase::GenericTarget::CHANNEL, _device_id, obj);
 
         KhompPvt * pvt;
 
@@ -328,7 +332,25 @@ bool Board::initialize(void)
 {
     initializeCngBuffer();
 
-    initializeBoards();
+    try
+    {
+       initializeBoards();
+    }
+    catch(K3LAPITraits::invalid_device & err)
+    {
+        LOG(ERROR, FMT("Invalid device at initialize boards: %s") %  err.what());
+        return false;
+    }
+    catch(K3LAPITraits::invalid_channel & err)
+    {
+        LOG(ERROR, FMT("Invalid channel at initialize boards: %s") %  err.what());
+        return false;
+    }
+    catch(K3LAPITraits::invalid_link & err)
+    {
+        LOG(ERROR, FMT("Invalid link at initialize boards: %s") %  err.what());
+        return false;
+    }
 
     return true;
 }
@@ -340,7 +362,7 @@ bool Board::finalize(void)
     return finalizeK3L();
 }
 
-void Board::khomp_add_event_board_data(const K3LAPI::target target, switch_event_t *event)
+void Board::khomp_add_event_board_data(const K3LAPIBase::GenericTarget target, switch_event_t *event)
 {
 
     //if (!event) {
@@ -349,7 +371,7 @@ void Board::khomp_add_event_board_data(const K3LAPI::target target, switch_event
 
     try
     {
-        if (target.type == K3LAPI::target::CHANNEL)
+        if (target.type == K3LAPIBase::GenericTarget::CHANNEL)
         {
             switch_core_session_t * s = get(target.device, target.object)->session();
             switch_channel_event_set_data(Board::KhompPvt::getFSChannel(s), event);
@@ -358,7 +380,7 @@ void Board::khomp_add_event_board_data(const K3LAPI::target target, switch_event
         switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Khomp-DeviceId", "%u", target.device);
         switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Khomp-Object", "%u", target.object);
     }
-    catch(K3LAPI::invalid_channel & err)
+    catch(K3LAPITraits::invalid_channel & err)
     {
         LOG(ERROR, PVT_FMT(target, "Invalid channel"));
     }
@@ -385,6 +407,23 @@ std::string Board::KhompPvt::getStatistics(Statistics::Type type)
     }
 }
 
+switch_xml_t Board::KhompPvt::getStatisticsXML(Statistics::Type type)
+{
+    switch(type)
+    {
+        case Statistics::DETAILED:
+        {
+            return _pvt_statistics->getDetailedXML();
+        }
+        case Statistics::ROW:
+        {
+            return _pvt_statistics->getNode();
+        }
+        default:
+            return NULL;
+    }
+}
+
 std::string Board::KhompPvt::PvtStatistics::getDetailedRates()
 {
     /* skip inactive channels */
@@ -429,6 +468,49 @@ std::string Board::KhompPvt::PvtStatistics::getDetailedRates()
     return strBuffer;
 }
 
+switch_xml_t Board::KhompPvt::PvtStatistics::getDetailedRatesXML()
+{
+    switch_xml_t xrates = switch_xml_new("rates");
+
+    /* this values come from kserver */
+    unsigned int call_incoming = Globals::k3lapi.channel_stats(
+            _pvt->target().device, _pvt->target().object, kcsiInbound);
+    unsigned int call_outgoing = Globals::k3lapi.channel_stats(
+            _pvt->target().device, _pvt->target().object, kcsiOutbound);
+
+    float occupation_rate = 100.0;
+
+    if (_pvt->call()->statistics()->_total_idle_time > 0)
+    {
+        occupation_rate = 100 * (
+            _pvt->call()->statistics()->_total_time_incoming + 
+            _pvt->call()->statistics()->_total_time_outgoing
+            ) / (
+            _pvt->call()->statistics()->_total_idle_time + 
+            _pvt->call()->statistics()->_total_time_incoming + 
+            _pvt->call()->statistics()->_total_time_outgoing);
+    }
+
+    switch_xml_t xoccupation = switch_xml_add_child_d(xrates,"oucpation",0);
+    switch_xml_set_txt_d(xoccupation,STR(FMT("%d") % occupation_rate));
+
+    if (call_incoming > 0) 
+    {    
+        std::string str_calls_incoming_mean = timeToString ( (time_t) (_pvt->call()->statistics()->_total_time_incoming / call_incoming) );
+        switch_xml_t xmean_in = switch_xml_add_child_d(xrates,"incoming",0);
+        switch_xml_set_txt_d(xmean_in,str_calls_incoming_mean.c_str());
+    }    
+
+    if (call_outgoing > 0) 
+    {    
+        std::string str_calls_outgoing_mean = timeToString ( (time_t) (_pvt->call()->statistics()->_total_time_outgoing / call_outgoing) );
+        switch_xml_t xmean_out = switch_xml_add_child_d(xrates,"outgoing",0);
+        switch_xml_set_txt_d(xmean_out,str_calls_outgoing_mean.c_str());
+    }    
+
+    return xrates;
+}
+
 std::string Board::KhompPvt::PvtStatistics::getDetailed()
 { 
     /* skip inactive channels */
@@ -456,6 +538,34 @@ std::string Board::KhompPvt::PvtStatistics::getDetailed()
     return strBuffer;
 }
 
+
+switch_xml_t Board::KhompPvt::PvtStatistics::getDetailedXML()
+{
+    switch_xml_t xch = _pvt->call()->statistics()->getDetailedXML();
+
+    /* this values come from kserver */
+    unsigned int call_incoming = Globals::k3lapi.channel_stats(
+            _pvt->target().device, _pvt->target().object, kcsiInbound);
+    unsigned int call_outgoing = Globals::k3lapi.channel_stats(
+            _pvt->target().device, _pvt->target().object, kcsiOutbound);
+    unsigned int call_fails    = Globals::k3lapi.channel_stats(
+            _pvt->target().device, _pvt->target().object, kcsiOutFailed);
+
+    /* total/call_incoming */
+    switch_xml_t xin_calls = switch_xml_add_child_d(xch,"calls_incoming",0);
+    switch_xml_set_txt_d(xin_calls,STR(FMT("%d") % call_incoming));
+
+    /* total/call_outgoing */
+    switch_xml_t xout_calls = switch_xml_add_child_d(xch,"calls_outgoing",0);
+    switch_xml_set_txt_d(xout_calls,STR(FMT("%d") % call_outgoing));
+
+    /* total/calls_failed */
+    switch_xml_t xfailed_calls = switch_xml_add_child_d(xch,"calls_failed",0);
+    switch_xml_set_txt_d(xfailed_calls,STR(FMT("%d") % call_fails));
+
+    return xch;
+}
+
 std::string Board::KhompPvt::PvtStatistics::getRow() 
 {
     /* skip inactive channels */
@@ -498,6 +608,71 @@ std::string Board::KhompPvt::PvtStatistics::getRow()
             % string_time);
 }
 
+switch_xml_t Board::KhompPvt::PvtStatistics::getNode()
+{
+    time_t action_time;
+    time (&action_time);
+   
+    action_time -= _pvt->call()->statistics()->_base_time;
+
+    uint32 calls_incoming = Globals::k3lapi.channel_stats(
+            _pvt->target().device, _pvt->target().object, kcsiInbound);
+    uint32 calls_outgoing = Globals::k3lapi.channel_stats(
+            _pvt->target().device, _pvt->target().object, kcsiOutbound);
+    uint32 call_fails     = Globals::k3lapi.channel_stats(
+            _pvt->target().device, _pvt->target().object, kcsiOutFailed);
+    
+    std::string string_time = "  n/a  ";
+    std::string call_type   = "  none  ";
+
+    if (_pvt->call()->_flags.check(Kflags::IS_INCOMING))
+        call_type = "incoming";
+    else if (_pvt->call()->_flags.check(Kflags::IS_OUTGOING))
+        call_type = "outgoing";
+
+    if (_pvt->owner())
+    {    
+        string_time = timeToString(action_time);
+    }    
+
+    /* device/channel */
+    switch_xml_t xchn = switch_xml_new("channel");
+    switch_xml_set_attr_d(xchn,"id",STR(FMT("%d") % _pvt->target().object));
+
+    /* device/channel/details */
+    switch_xml_t xdetails = switch_xml_add_child_d(xchn,"details",0);
+
+    /* device/channel/details/calls_incomming */
+    switch_xml_t xin_calls = switch_xml_add_child_d(xdetails,"calls_incoming",0);
+    switch_xml_set_txt_d(xin_calls,STR(FMT("%d") % calls_incoming));
+
+    /* device/channel/details/calls_outgoing */
+    switch_xml_t xout_calls = switch_xml_add_child_d(xdetails,"calls_incoming",0);
+    switch_xml_set_txt_d(xout_calls,STR(FMT("%d") % calls_outgoing));
+
+    /* device/channel/details/channel_fails */
+    switch_xml_t xchn_fails = switch_xml_add_child_d(xdetails,"channel_fails",0);
+    switch_xml_set_txt_d(xchn_fails,STR(FMT("%d") % _pvt->call()->statistics()->_channel_fails));
+
+    /* device/channel/details/calls_fails */
+    switch_xml_t xcall_fails = switch_xml_add_child_d(xdetails,"calls_fails",0);
+    switch_xml_set_txt_d(xcall_fails,STR(FMT("%d") % call_fails));
+
+    /* device/channel/details/state */
+    switch_xml_t xstate = switch_xml_add_child_d(xdetails,"state",0);
+    switch_xml_set_txt_d(xstate,_pvt->getStateString().c_str());
+
+    /* device/channel/details/call_type */
+    switch_xml_t xcall_type = switch_xml_add_child_d(xdetails,"call_type",0);
+    switch_xml_set_txt_d(xcall_type,call_type.c_str());
+
+    /* device/channel/details/time */
+    switch_xml_t xtime = switch_xml_add_child_d(xdetails,"time",0);
+    switch_xml_set_txt_d(xtime,string_time.c_str());
+
+    return xchn;
+}
+
 switch_status_t Board::KhompPvt::justAlloc(bool is_answering, switch_memory_pool_t **pool)
 {
     DBG(FUNC, PVT_FMT(target(), "c"));
@@ -572,6 +747,20 @@ switch_status_t Board::KhompPvt::justAlloc(bool is_answering, switch_memory_pool
         return SWITCH_STATUS_FALSE;
     }
 
+    try
+    {
+        /* accounttcode for CDR identification */
+        setFSChannelVar(getFSChannel(),"accountcode",_accountcode.c_str());
+
+        /* language for IVR machine */
+        setFSChannelVar(getFSChannel(),"language",_language.c_str());
+    }
+    catch (Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "(%s)") % err._msg.c_str() );
+        return SWITCH_STATUS_FALSE;
+    }
+
     DBG(FUNC, PVT_FMT(target(), "r"));
     return SWITCH_STATUS_SUCCESS;
 }
@@ -612,7 +801,7 @@ switch_status_t Board::KhompPvt::justStart(switch_caller_profile_t *profile)
                                 % _call->_dest_addr % (contexts.size() >= 1 ? contexts[0] : "default"));
                         return SWITCH_STATUS_FALSE; 
                     default:
-                        DBG(FUNC, PVT_FMT(_target, "our: dialplan '%s', context '%s', exten '%s'") % Opt::_dialplan % context % exten);
+                        DBG(FUNC, PVT_FMT(_target, "our: dialplan '%s', context '%s', exten '%s'") % Opt::_options._dialplan() % context % exten);
                         break;
                 }
 
@@ -621,12 +810,12 @@ switch_status_t Board::KhompPvt::justStart(switch_caller_profile_t *profile)
             else
             {
                 exten = call()->_dest_addr;
-                DBG(FUNC, PVT_FMT(target(), "already found our: dialplan '%s', context '%s', exten '%s'") % Opt::_dialplan % call()->_incoming_context % exten);
+                DBG(FUNC, PVT_FMT(target(), "already found our: dialplan '%s', context '%s', exten '%s'") % Opt::_options._dialplan() % call()->_incoming_context % exten);
             }
             
             _caller_profile = switch_caller_profile_new(switch_core_session_get_pool(_session),
                     "Khomp",                           //username
-                    Opt::_dialplan.c_str(),            //dialplan
+                    Opt::_options._dialplan().c_str(), //dialplan
                     NULL,                              //caller_id_name
                     _call->_orig_addr.c_str(),         //caller_id_number
                     NULL,                              //network_addr
@@ -645,7 +834,7 @@ switch_status_t Board::KhompPvt::justStart(switch_caller_profile_t *profile)
                 return SWITCH_STATUS_FALSE;
             }
 
-            std::string name = STG(FMT("Khomp/%hu/%hu/%s")
+            std::string name = STG(FMT("Khomp/%d/%d/%s")
                     % target().device
                     % target().object
                     % _call->_dest_addr);
@@ -672,7 +861,7 @@ switch_status_t Board::KhompPvt::justStart(switch_caller_profile_t *profile)
             if(_call->_orig_addr.empty())
                 _call->_orig_addr = profile->caller_id_number;
 
-            switch_channel_set_name(channel, STG(FMT("Khomp/%hu/%hu/%s")
+            switch_channel_set_name(channel, STG(FMT("Khomp/%d/%d/%s")
                         % target().device
                         % target().object
                         % (!_call->_dest_addr.empty() ? _call->_dest_addr.c_str() : "")).c_str());
@@ -772,7 +961,7 @@ bool Board::KhompPvt::indicateBusyUnlocked(int cause, bool sent_signaling)
                 Board::board(_target.device)->_timers.del(call()->_idx_pbx_ring);
                 Board::board(_target.device)->_timers.del(call()->_idx_co_ring);
             }
-            catch (K3LAPI::invalid_device & err)
+            catch (K3LAPITraits::invalid_device & err)
             {
                 LOG(ERROR, PVT_FMT(_target, "Unable to get device: %d!") % err.device);
             }
@@ -824,6 +1013,8 @@ void Board::KhompPvt::destroyAll()
         switch_core_session_set_private(_session, NULL);
         _session = NULL;
     }
+    
+    owner(NULL);
 
     if(_caller_profile)
     {
@@ -854,8 +1045,6 @@ void Board::KhompPvt::destroyAll()
 
 void Board::KhompPvt::doHangup()
 {
-    owner(NULL);
-
     try
     {
         switch_channel_t *channel = getFSChannel();
@@ -903,7 +1092,7 @@ bool Board::KhompPvt::cleanup(CleanupType type)
         Board::board(_target.device)->_timers.del(call()->_idx_pbx_ring);
         Board::board(_target.device)->_timers.del(call()->_idx_co_ring);
     }
-    catch (K3LAPI::invalid_device & err)
+    catch (K3LAPITraits::invalid_device & err)
     {
         LOG(ERROR, PVT_FMT(_target, "Unable to get device: %d!") % err.device);
     }
@@ -939,10 +1128,10 @@ bool Board::KhompPvt::cleanup(CleanupType type)
         }
 
         if(call()->_input_volume >= -10 && call()->_input_volume <= 10)
-            setVolume("input" , Opt::_input_volume);
+            setVolume("input" , Opt::_options._input_volume());
 
         if(call()->_output_volume >= -10 && call()->_output_volume <= 10)
-            setVolume("output", Opt::_output_volume);        
+            setVolume("output", Opt::_options._output_volume());        
 
         return _call->clear();
     case CLN_SOFT:
@@ -1037,7 +1226,7 @@ void Board::queueAddChannel(PriorityCallQueue &pqueue, unsigned int board, unsig
         KhompPvt * pvt = get(board, object);
         pqueue.insert(pvt);
     }
-    catch(K3LAPI::invalid_channel & err)
+    catch(K3LAPITraits::invalid_channel & err)
     {
         //...
     }
@@ -1050,7 +1239,7 @@ Board::KhompPvt * Board::findFree(unsigned int board, unsigned int object, bool
         KhompPvt * pvt = get(board, object);
         return ((fully_available ? pvt->isFree() : pvt->isOK()) ? pvt : NULL);
     }
-    catch(K3LAPI::invalid_channel & err)
+    catch(K3LAPITraits::invalid_channel & err)
     {
     }
     return NULL;
@@ -1066,10 +1255,10 @@ void Board::applyGlobalVolume(void)
         {
             try
             {
-                Board::get(dev,obj)->setVolume("input", Opt::_input_volume);
-                Board::get(dev,obj)->setVolume("output",Opt::_output_volume);
+                Board::get(dev,obj)->setVolume("input", Opt::_options._input_volume());
+                Board::get(dev,obj)->setVolume("output",Opt::_options._output_volume());
             }
-            catch(K3LAPI::invalid_channel & err)
+            catch(K3LAPITraits::invalid_channel & err)
             {
                 DBG(FUNC, OBJ_FMT(dev, obj, "Channel not found"));
             }
@@ -1096,7 +1285,7 @@ bool Board::KhompPvt::startCadence(CadencesType type)
     {    
         call()->_cadence = type;
 
-        Opt::CadencesMapType::iterator i = Opt::_cadences.find(tone);
+        CadencesMapType::iterator i = Opt::_cadences.find(tone);
         std::string cmd_params;
 
         if (i != Opt::_cadences.end())
@@ -1220,9 +1409,10 @@ bool Board::KhompPvt::obtainRX(bool with_delay)
     }
     catch(K3LAPI::failed_raw_command & e)
     {
-        LOG(ERROR, PVT_FMT(target(), "ERROR sending mixer record command!"));
+        LOG(ERROR, PVT_FMT(target(), "ERROR sending mixer command!"));
         return false;
     }    
+
     return true;
 }
 
@@ -1236,7 +1426,7 @@ bool Board::KhompPvt::obtainTX()
 
     try
     {
-        int dsp = Globals::k3lapi.get_dsp(_target.device, K3LAPI::DSP_AUDIO);
+        int dsp = Globals::k3lapi.get_dsp(_target, K3LAPI::DSP_AUDIO);
 
         Globals::k3lapi.raw_command(_target.device, dsp, cmd1, sizeof(cmd1));
 
@@ -1347,7 +1537,7 @@ bool Board::KhompPvt::dtmfSuppression(bool enable)
 
 bool Board::KhompPvt::echoCancellation(bool enable)
 {
-    K3L_DEVICE_CONFIG & devCfg = Globals::k3lapi.device_config(_target.device);
+    const K3L_DEVICE_CONFIG & devCfg = Globals::k3lapi.device_config(_target);
 
     /* echo canceller should not be used for non-echo cancellable channels */
     switch (devCfg.EchoConfig)
@@ -1432,8 +1622,8 @@ bool Board::KhompPvt::setCollectCall()
     const char * tmp_var = NULL;
 
     // get option configuration value
-    confvalues.push_back(Opt::_drop_collect_call ? T_TRUE : T_FALSE);
-    DBG(FUNC, PVT_FMT(_target, "option drop collect call is '%s'") % (Opt::_drop_collect_call ? "yes" : "no"));
+    confvalues.push_back(Opt::_options._drop_collect_call() ? T_TRUE : T_FALSE);
+    DBG(FUNC, PVT_FMT(_target, "option drop collect call is '%s'") % (Opt::_options._drop_collect_call() ? "yes" : "no"));
 
     // get global filter configuration value
     tmp_var = switch_core_get_variable("KDropCollectCall");
@@ -1622,7 +1812,7 @@ bool Board::KhompPvt::onAudioStatus(K3L_EVENT *e)
 
                 if (!call()->_flags.check(Kflags::CONNECTED))
                 {
-                    obtainRX(Opt::_suppression_delay);
+                    obtainRX(Opt::_options._suppression_delay());
             
                     //Marcar para o Freeswitch que jah tem audio passando
                     if (call()->_flags.check(Kflags::IS_OUTGOING))
@@ -1660,7 +1850,7 @@ bool Board::KhompPvt::onAudioStatus(K3L_EVENT *e)
         LOG(ERROR, PVT_FMT(target(), "r (%s)") % err._msg.c_str() );
         return false;
     }
-    catch (K3LAPI::invalid_device & err)
+    catch (K3LAPITraits::invalid_device & err)
     {
         LOG(ERROR, PVT_FMT(_target, "r (unable to get device: %d!)") % err.device);
         return false;
@@ -1679,7 +1869,7 @@ bool Board::KhompPvt::onCollectCall(K3L_EVENT *e)
         //K::internal::ami_event(pvt, EVENT_FLAG_CALL, "CollectCall",
           //      STG(FMT("Channel: Khomp/B%dC%d\r\n") % pvt->boardid % pvt->objectid));
 
-        if (Opt::_drop_collect_call || _call->_flags.check(Kflags::DROP_COLLECT))
+        if (Opt::_options._drop_collect_call() || _call->_flags.check(Kflags::DROP_COLLECT))
         {     
             /* disconnect! */
             //TODO: SCE_HIDE !?
@@ -1790,7 +1980,7 @@ bool Board::KhompPvt::onConnect(K3L_EVENT *e)
         LOG(ERROR, PVT_FMT(target(), "r (%s)") % err._msg.c_str() );
         return false;
     }
-    catch (K3LAPI::invalid_device & err)
+    catch (K3LAPITraits::invalid_device & err)
     {
         LOG(ERROR, PVT_FMT(_target, "r (unable to get device: %d!)") % err.device);
         return false;
@@ -1896,7 +2086,7 @@ bool Board::KhompPvt::onDtmfDetected(K3L_EVENT *e)
                 return true;
             }    
 
-            if (Opt::_ignore_letter_dtmfs)
+            if (Opt::_options._ignore_letter_dtmfs())
             {    
                 switch (e->AddInfo)
                 {    
@@ -2105,7 +2295,7 @@ bool Board::KhompPvt::indicateRinging()
         {    
             int ringback_value = RingbackDefs::RB_SEND_DEFAULT;
 
-            bool do_drop_call = Opt::_drop_collect_call
+            bool do_drop_call = Opt::_options._drop_collect_call()
                                         || call()->_flags.check(Kflags::DROP_COLLECT);
 
             if (do_drop_call && call()->_collect_call)
@@ -2128,7 +2318,7 @@ bool Board::KhompPvt::indicateRinging()
         if (send_ringback)
         {    
             call()->_flags.set(Kflags::GEN_CO_RING);
-            call()->_idx_co_ring = Board::board(_target.device)->_timers.add(Opt::_ringback_co_delay, &Board::KhompPvt::coRingGen,this);
+            call()->_idx_co_ring = Board::board(_target.device)->_timers.add(Opt::_options._ringback_co_delay(), &Board::KhompPvt::coRingGen,this);
 
             /* start grabbing audio */
             startListen();
@@ -2145,7 +2335,7 @@ bool Board::KhompPvt::indicateRinging()
         LOG(ERROR, PVT_FMT(_target, "r (unable to lock %s!)") % err._msg.c_str() );
         return false;
     }
-    catch (K3LAPI::invalid_device & err)
+    catch (K3LAPITraits::invalid_device & err)
     {
         LOG(ERROR, PVT_FMT(_target, "r (unable to get device: %d!)") % err.device);
         return false;
@@ -2333,7 +2523,7 @@ int Board::eventThread(void *void_evt)
                         % Globals::verbose.event(evt.obj(), evt.event()));
             }
         }
-        catch (K3LAPI::invalid_device & invalid)
+        catch (K3LAPITraits::invalid_device & invalid)
         {
             LOG(ERROR, D("invalid device on event '%s'") 
                 % Verbose::eventName(evt.event()->Code).c_str());
@@ -2378,7 +2568,7 @@ int Board::commandThread(void *void_evt)
                 LOG(ERROR, D("(d=%d) Error on command(%d)") % devid % cmd.code());
             }
         }
-        catch (K3LAPI::invalid_channel & invalid)
+        catch (K3LAPITraits::invalid_channel & invalid)
         {
             LOG(ERROR, OBJ_FMT(devid,cmd.obj(), "invalid device on command '%d'") %  cmd.code());
         }
@@ -2418,7 +2608,7 @@ extern "C" int32 Kstdcall khompEventCallback(int32 obj, K3L_EVENT * e)
             EventRequest e_req(obj, e);
             Board::board(e->DeviceId)->chanEventHandler()->write(e_req);
         }
-        catch (K3LAPI::invalid_device & err)
+        catch (K3LAPITraits::invalid_device & err)
         {
             LOG(ERROR, D("Unable to get device: %d!") % err.device);
             return ksFail;
diff --git a/src/mod/endpoints/mod_khomp/src/khomp_pvt_fxo.cpp b/src/mod/endpoints/mod_khomp/src/khomp_pvt_fxo.cpp
index f45638b3b4..0f7862dc19 100644
--- a/src/mod/endpoints/mod_khomp/src/khomp_pvt_fxo.cpp
+++ b/src/mod/endpoints/mod_khomp/src/khomp_pvt_fxo.cpp
@@ -305,10 +305,11 @@ bool BoardFXO::KhompPvtFXO::onCallSuccess(K3L_EVENT *e)
 
         if (call()->_pre_answer)
         {
-            dtmfSuppression(Opt::_out_of_band_dtmfs && !call()->_flags.check(Kflags::FAX_DETECTED));
+            dtmfSuppression(Opt::_options._out_of_band_dtmfs() && !call()->_flags.check(Kflags::FAX_DETECTED));
 
             startListen();
             startStream();
+            switch_channel_mark_pre_answered(getFSChannel());
         }
     }
     catch (ScopedLockFailed & err)
@@ -316,6 +317,11 @@ bool BoardFXO::KhompPvtFXO::onCallSuccess(K3L_EVENT *e)
         LOG(ERROR, PVT_FMT(_target, "(FXO) r (unable to lock %s!)") % err._msg.c_str() );
         return false;
     }
+    catch (Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "(FXO) r (%s)") % err._msg.c_str() );
+        return false;
+    }
         
     DBG(FUNC, PVT_FMT(_target, "(FXO) r"));
 
@@ -355,16 +361,24 @@ bool BoardFXO::KhompPvtFXO::onAudioStatus(K3L_EVENT *e)
 
         if(e->AddInfo == kmtFax)
         {
-            DBG(FUNC, PVT_FMT(_target, "Fax detected"));
+            DBG(STRM, PVT_FMT(_target, "Fax detected"));
 
-            bool already_detected = call()->_flags.check(Kflags::FAX_DETECTED);  
+            /* hadn't we did this already? */
+            bool already_detected = call()->_flags.check(Kflags::FAX_DETECTED);            
+
+            time_t time_was = call()->_call_statistics->_base_time;
+            time_t time_now = time(NULL);
+
+            bool detection_timeout = (time_now > (time_was + (time_t) (Opt::_options._fax_adjustment_timeout())));
+            
             BEGIN_CONTEXT
             {
-                if(already_detected)
-                    break;
-
                 ScopedPvtLock lock(this);
 
+                /* already adjusted? do not adjust again. */
+                if (already_detected || detection_timeout)
+                    break;
+
                 if (callFXO()->_call_info_drop != 0 || callFXO()->_call_info_report)
                 {
                     /* we did not detected fax yet, send answer info! */
@@ -377,7 +391,7 @@ bool BoardFXO::KhompPvtFXO::onAudioStatus(K3L_EVENT *e)
                     }
                 }
 
-                if (Opt::_auto_fax_adjustment)
+                if (Opt::_options._auto_fax_adjustment())
                 {
                     DBG(FUNC, PVT_FMT(_target, "communication will be adjusted for fax!"));
                     _fax->adjustForFax();
@@ -483,9 +497,9 @@ bool BoardFXO::KhompPvtFXO::onDtmfSendFinish(K3L_EVENT *e)
             /* activate resources early... */
             bool fax_detected = callFXO()->_flags.check(Kflags::FAX_DETECTED);
 
-            bool res_out_of_band_dtmf = Opt::_suppression_delay && Opt::_out_of_band_dtmfs && !fax_detected;
-            bool res_echo_cancellator = Opt::_echo_canceller && !fax_detected;
-            bool res_auto_gain_cntrol = Opt::_auto_gain_control && !fax_detected;
+            bool res_out_of_band_dtmf = Opt::_options._suppression_delay() && Opt::_options._out_of_band_dtmfs() && !fax_detected;
+            bool res_echo_cancellator = Opt::_options._echo_canceller() && !fax_detected;
+            bool res_auto_gain_cntrol = Opt::_options._auto_gain_control() && !fax_detected;
 
             if (!call()->_flags.check(Kflags::KEEP_DTMF_SUPPRESSION))
                 dtmfSuppression(res_out_of_band_dtmf);
@@ -497,7 +511,7 @@ bool BoardFXO::KhompPvtFXO::onDtmfSendFinish(K3L_EVENT *e)
                 autoGainControl(res_auto_gain_cntrol);
 
             /* start sending audio if wanted so */
-            if (Opt::_fxo_send_pre_audio)
+            if (Opt::_options._fxo_send_pre_audio())
                 startStream();
 
             //TODO: Verificar isso aqui
@@ -624,13 +638,13 @@ bool BoardFXO::KhompPvtFXO::setupConnection()
     bool fax_detected = callFXO()->_flags.check(Kflags::FAX_DETECTED) || (callFXO()->_var_fax_adjust == T_TRUE);
 
     bool res_out_of_band_dtmf = (call()->_var_dtmf_state == T_UNKNOWN || fax_detected ?
-        Opt::_suppression_delay && Opt::_out_of_band_dtmfs && !fax_detected : (call()->_var_dtmf_state == T_TRUE));
+        Opt::_options._suppression_delay() && Opt::_options._out_of_band_dtmfs() && !fax_detected : (call()->_var_dtmf_state == T_TRUE));
 
     bool res_echo_cancellator = (call()->_var_echo_state == T_UNKNOWN || fax_detected ?
-        Opt::_echo_canceller && !fax_detected : (call()->_var_echo_state == T_TRUE));
+        Opt::_options._echo_canceller() && !fax_detected : (call()->_var_echo_state == T_TRUE));
 
     bool res_auto_gain_cntrol = (call()->_var_gain_state == T_UNKNOWN || fax_detected ?
-        Opt::_auto_gain_control && !fax_detected : (call()->_var_gain_state == T_TRUE));
+        Opt::_options._auto_gain_control() && !fax_detected : (call()->_var_gain_state == T_TRUE));
 
     if (!call()->_flags.check(Kflags::REALLY_CONNECTED))
     {
@@ -739,8 +753,13 @@ bool BoardFXO::KhompPvtFXO::validContexts(
 {
     DBG(FUNC,PVT_FMT(_target,"(FXO) c"));
 
-    contexts.push_back(Opt::_context_fxo);
-    contexts.push_back(Opt::_context2_fxo);
+    if(!_group_context.empty())
+    {
+        contexts.push_back(_group_context);
+    }
+
+    contexts.push_back(Opt::_options._context_fxo());
+    contexts.push_back(Opt::_options._context2_fxo());
 
     for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++)
     {
diff --git a/src/mod/endpoints/mod_khomp/src/khomp_pvt_gsm.cpp b/src/mod/endpoints/mod_khomp/src/khomp_pvt_gsm.cpp
index 1095c5a296..05020a0c59 100644
--- a/src/mod/endpoints/mod_khomp/src/khomp_pvt_gsm.cpp
+++ b/src/mod/endpoints/mod_khomp/src/khomp_pvt_gsm.cpp
@@ -115,10 +115,11 @@ bool BoardGSM::KhompPvtGSM::onCallSuccess(K3L_EVENT *e)
 
         if (call()->_pre_answer)
         {
-            dtmfSuppression(Opt::_out_of_band_dtmfs);
+            dtmfSuppression(Opt::_options._out_of_band_dtmfs());
 
             startListen();
             startStream();
+            switch_channel_mark_pre_answered(getFSChannel());
         }
     }
     catch (ScopedLockFailed & err)
@@ -126,6 +127,11 @@ bool BoardGSM::KhompPvtGSM::onCallSuccess(K3L_EVENT *e)
         LOG(ERROR, PVT_FMT(_target, "(GSM) r (unable to lock %s!)") % err._msg.c_str() );
         return false;
     }
+    catch (Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "(GSM) r (%s)") % err._msg.c_str() );
+        return false;
+    }
         
     DBG(FUNC, PVT_FMT(_target, "(GSM) r"));
 
@@ -401,14 +407,14 @@ bool BoardGSM::KhompPvtGSM::setupConnection()
     }
 
     bool res_out_of_band_dtmf = (call()->_var_dtmf_state == T_UNKNOWN ?
-        Opt::_suppression_delay && Opt::_out_of_band_dtmfs : (call()->_var_dtmf_state == T_TRUE));
+        Opt::_options._suppression_delay() && Opt::_options._out_of_band_dtmfs() : (call()->_var_dtmf_state == T_TRUE));
 
     bool res_echo_cancellator = (call()->_var_echo_state == T_UNKNOWN ?
-        Opt::_echo_canceller : (call()->_var_echo_state == T_TRUE));
+        Opt::_options._echo_canceller() : (call()->_var_echo_state == T_TRUE));
 
 
     bool res_auto_gain_cntrol = (call()->_var_gain_state == T_UNKNOWN ?
-        Opt::_auto_gain_control : (call()->_var_gain_state == T_TRUE));
+        Opt::_options._auto_gain_control() : (call()->_var_gain_state == T_TRUE));
 
 
     if (!call()->_flags.check(Kflags::REALLY_CONNECTED))
@@ -516,6 +522,11 @@ bool BoardGSM::KhompPvtGSM::validContexts(
 {
     DBG(FUNC,PVT_FMT(_target,"(GSM) c"));
 
+    if(!_group_context.empty())
+    {
+        contexts.push_back(_group_context);
+    }
+
     if (!extra_context.empty())
     {    
         if (!_group_context.empty())
@@ -526,25 +537,25 @@ bool BoardGSM::KhompPvtGSM::validContexts(
             contexts.push_back(pvt_context);
         }    
 
-        if (!Opt::_context_gsm_call.empty())
+        if (!Opt::_options._context_gsm_call().empty())
         {    
-            std::string context(Opt::_context_gsm_call);
+            std::string context(Opt::_options._context_gsm_call());
             context += "-"; 
             context += extra_context;
             contexts.push_back(_group_context);
         }
 
-        if (!Opt::_context2_gsm_call.empty())
+        if (!Opt::_options._context2_gsm_call().empty())
         {    
-            std::string context(Opt::_context2_gsm_call);
+            std::string context(Opt::_options._context2_gsm_call());
             context += "-"; 
             context += extra_context;
             contexts.push_back(_group_context);
         }    
     }  
 
-    contexts.push_back(Opt::_context_gsm_call);
-    contexts.push_back(Opt::_context2_gsm_call);
+    contexts.push_back(Opt::_options._context_gsm_call());
+    contexts.push_back(Opt::_options._context2_gsm_call());
 
     for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++) 
         replaceTemplate((*i), "CC", _target.object);
diff --git a/src/mod/endpoints/mod_khomp/src/khomp_pvt_kxe1.cpp b/src/mod/endpoints/mod_khomp/src/khomp_pvt_kxe1.cpp
index c0eb1a3403..0d3c3b38ff 100644
--- a/src/mod/endpoints/mod_khomp/src/khomp_pvt_kxe1.cpp
+++ b/src/mod/endpoints/mod_khomp/src/khomp_pvt_kxe1.cpp
@@ -121,15 +121,16 @@ bool BoardE1::KhompPvtE1::onCallSuccess(K3L_EVENT *e)
 
         if (call()->_pre_answer)
         {
-            dtmfSuppression(Opt::_out_of_band_dtmfs && !call()->_flags.check(Kflags::FAX_DETECTED));     
+            dtmfSuppression(Opt::_options._out_of_band_dtmfs()&& !call()->_flags.check(Kflags::FAX_DETECTED));     
 
             startListen();
             startStream();
+            switch_channel_mark_pre_answered(getFSChannel());
         }
         else
         {
             call()->_flags.set(Kflags::GEN_PBX_RING);
-            call()->_idx_pbx_ring = Board::board(_target.device)->_timers.add(Opt::_ringback_pbx_delay,
+            call()->_idx_pbx_ring = Board::board(_target.device)->_timers.add(Opt::_options._ringback_pbx_delay(),
                                              &Board::KhompPvt::pbxRingGen,this, TM_VAL_CALL);
         }
 
@@ -139,7 +140,7 @@ bool BoardE1::KhompPvtE1::onCallSuccess(K3L_EVENT *e)
         LOG(ERROR, PVT_FMT(_target, "(E1) r (unable to lock %s!)") % err._msg.c_str() );
         return false;
     }
-    catch (K3LAPI::invalid_device & err)
+    catch (K3LAPITraits::invalid_device & err)
     {
         LOG(ERROR, PVT_FMT(_target, "(E1) r (unable to get device: %d!)") % err.device);
         return false;
@@ -152,7 +153,7 @@ bool BoardE1::KhompPvtE1::onCallSuccess(K3L_EVENT *e)
 
 bool BoardE1::KhompPvtE1::onAudioStatus(K3L_EVENT *e)
 {
-    //DBG(FUNC, PVT_FMT(_target, "(E1) c"));
+    DBG(STRM, PVT_FMT(_target, "(E1) c"));
 
     try
     {
@@ -160,16 +161,27 @@ bool BoardE1::KhompPvtE1::onAudioStatus(K3L_EVENT *e)
 
         if(e->AddInfo == kmtFax)
         {
-            DBG(FUNC, PVT_FMT(_target, "Fax detected"));
+            DBG(STRM, PVT_FMT(_target, "Fax detected"));
 
+            /* hadn't we did this already? */
             bool already_detected = call()->_flags.check(Kflags::FAX_DETECTED);            
+
+            time_t time_was = call()->_call_statistics->_base_time;
+            time_t time_now = time(NULL);
+
+            bool detection_timeout = (time_now > (time_was + (time_t) (Opt::_options._fax_adjustment_timeout())));
+            
+            DBG(STRM, PVT_FMT(_target, "is set? (%s) timeout? (%s)")
+                            % (already_detected ? "true" : "false") % (detection_timeout ? "true" : "false"));
+
             BEGIN_CONTEXT
             {
-                if(already_detected)
-                    break;
-                    
                 ScopedPvtLock lock(this);
 
+                /* already adjusted? do not adjust again. */
+                if (already_detected || detection_timeout)
+                    break;
+
                 if (callE1()->_call_info_drop != 0 || callE1()->_call_info_report)
                 {    
                     /* we did not detected fax yet, send answer info! */
@@ -182,7 +194,7 @@ bool BoardE1::KhompPvtE1::onAudioStatus(K3L_EVENT *e)
                     }    
                 }
 
-                if (Opt::_auto_fax_adjustment)
+                if (Opt::_options._auto_fax_adjustment())
                 {
                     DBG(FUNC, PVT_FMT(_target, "communication will be adjusted for fax!"));
                     _fax->adjustForFax();
@@ -207,7 +219,7 @@ bool BoardE1::KhompPvtE1::onAudioStatus(K3L_EVENT *e)
 
     bool ret = KhompPvt::onAudioStatus(e);
     
-    //DBG(FUNC, PVT_FMT(_target, "(E1) r"));
+    DBG(STRM, PVT_FMT(_target, "(E1) r"));
 
     return ret;
 }
@@ -283,7 +295,7 @@ bool BoardE1::KhompPvtE1::onDisconnect(K3L_EVENT *e)
         if (call()->_flags.check(Kflags::IS_OUTGOING) ||
             call()->_flags.check(Kflags::IS_INCOMING))
         {
-            if(Opt::_disconnect_delay == 0)
+            if(Opt::_options._disconnect_delay()== 0)
             {
                 DBG(FUNC, PVT_FMT(_target, "queueing disconnecting outgoing channel!"));
                 command(KHOMP_LOG, CM_DISCONNECT);       
@@ -291,7 +303,7 @@ bool BoardE1::KhompPvtE1::onDisconnect(K3L_EVENT *e)
             else
             {
                 callE1()->_idx_disconnect = Board::board(_target.device)->_timers.add(
-                    1000 * Opt::_disconnect_delay,&BoardE1::KhompPvtE1::delayedDisconnect,this);
+                    1000 * Opt::_options._disconnect_delay(),&BoardE1::KhompPvtE1::delayedDisconnect,this);
             }
         }
         else
@@ -309,7 +321,7 @@ bool BoardE1::KhompPvtE1::onDisconnect(K3L_EVENT *e)
         LOG(ERROR, PVT_FMT(_target, "(E1) r (unable to lock %s!)") % err._msg.c_str() );
         return false;
     }
-    catch (K3LAPI::invalid_device & err)
+    catch (K3LAPITraits::invalid_device & err)
     {
         LOG(ERROR, PVT_FMT(_target, "(E1) r (unable to get device: %d!)") % err.device);
         return false;
@@ -767,13 +779,13 @@ bool BoardE1::KhompPvtE1::setupConnection()
     bool fax_detected = callE1()->_flags.check(Kflags::FAX_DETECTED) || (callE1()->_var_fax_adjust == T_TRUE);
     
     bool res_out_of_band_dtmf = (call()->_var_dtmf_state == T_UNKNOWN || fax_detected ?
-        Opt::_suppression_delay && Opt::_out_of_band_dtmfs && !fax_detected : (call()->_var_dtmf_state == T_TRUE));
+        Opt::_options._suppression_delay()&& Opt::_options._out_of_band_dtmfs()&& !fax_detected : (call()->_var_dtmf_state == T_TRUE));
     
     bool res_echo_cancellator = (call()->_var_echo_state == T_UNKNOWN || fax_detected ?
-        Opt::_echo_canceller && !fax_detected : (call()->_var_echo_state == T_TRUE));
+        Opt::_options._echo_canceller()&& !fax_detected : (call()->_var_echo_state == T_TRUE));
 
     bool res_auto_gain_cntrol = (call()->_var_gain_state == T_UNKNOWN || fax_detected ?
-        Opt::_auto_gain_control && !fax_detected : (call()->_var_gain_state == T_TRUE));
+        Opt::_options._auto_gain_control()&& !fax_detected : (call()->_var_gain_state == T_TRUE));
 
     if (!call()->_flags.check(Kflags::REALLY_CONNECTED))
     {
@@ -823,7 +835,12 @@ bool BoardE1::KhompPvtE1::validContexts(
 {
     DBG(FUNC,PVT_FMT(_target, "(E1) c"));
 
-    contexts.push_back(Opt::_context_digital);
+    if(!_group_context.empty())
+    {
+        contexts.push_back(_group_context);
+    }
+
+    contexts.push_back(Opt::_options._context_digital());
 
     for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++) 
     {    
@@ -1122,7 +1139,7 @@ void BoardE1::KhompPvtR2::reportFailToReceive(int fail_code)
 {
     KhompPvt::reportFailToReceive(fail_code);
 
-    if (Opt::_r2_strict_behaviour && fail_code != -1)
+    if (Opt::_options._r2_strict_behaviour()&& fail_code != -1)
     {
         DBG(FUNC,PVT_FMT(_target, "sending a 'unknown number' message/audio")); 
 
@@ -1586,7 +1603,7 @@ bool BoardE1::KhompPvtR2::sendPreAudio(int rb_value)
     DBG(FUNC,PVT_FMT(_target, "doing the R2 pre_connect wait..."));   
 
     /* wait some ms, just to be sure the command has been sent. */
-    usleep(Opt::_r2_preconnect_wait * 1000);
+    usleep(Opt::_options._r2_preconnect_wait()* 1000);
 
     if (call()->_flags.check(Kflags::HAS_PRE_AUDIO))
     {
@@ -1654,7 +1671,7 @@ bool BoardE1::KhompPvtR2::indicateRinging()
         {    
             int ringback_value = RingbackDefs::RB_SEND_DEFAULT;
 
-            bool do_drop_call = Opt::_drop_collect_call
+            bool do_drop_call = Opt::_options._drop_collect_call()
                                         || call()->_flags.check(Kflags::DROP_COLLECT);
 
             if (do_drop_call && call()->_collect_call)
@@ -1679,7 +1696,7 @@ bool BoardE1::KhompPvtR2::indicateRinging()
                         % condition_string);
             }    
 
-            if (Opt::_r2_strict_behaviour)
+            if (Opt::_options._r2_strict_behaviour())
             {
                 /* send ringback too? */
                 send_ringback = sendPreAudio(ringback_value);
@@ -1700,7 +1717,7 @@ bool BoardE1::KhompPvtR2::indicateRinging()
             DBG(FUNC, PVT_FMT(_target, "Send ringback!"));
 
             call()->_flags.set(Kflags::GEN_CO_RING);
-            call()->_idx_co_ring = Board::board(_target.device)->_timers.add(Opt::_ringback_co_delay, &Board::KhompPvt::coRingGen,this);
+            call()->_idx_co_ring = Board::board(_target.device)->_timers.add(Opt::_options._ringback_co_delay(), &Board::KhompPvt::coRingGen,this);
 
             /* start grabbing audio */
             startListen();
@@ -1722,7 +1739,7 @@ bool BoardE1::KhompPvtR2::indicateRinging()
         LOG(ERROR,PVT_FMT(_target, "(R2) r (%s)") % err._msg.c_str());
         return false;
     }
-    catch (K3LAPI::invalid_device & err)
+    catch (K3LAPITraits::invalid_device & err)
     {
         LOG(ERROR, PVT_FMT(_target, "(R2) r (unable to get device: %d!)") % err.device);
         return false;
@@ -1768,9 +1785,9 @@ bool BoardE1::KhompPvtR2::onNewCall(K3L_EVENT *e)
         if(!ret)
             return false;
 
-        if (!Opt::_r2_strict_behaviour)
+        if (!Opt::_options._r2_strict_behaviour())
         {
-            bool do_drop_collect = Opt::_drop_collect_call;
+            bool do_drop_collect = Opt::_options._drop_collect_call();
             const char* drop_str = getFSGlobalVar("KDropCollectCall");
 
             if(checkTrueString(drop_str))
@@ -1936,7 +1953,7 @@ bool BoardE1::KhompPvtR2::onNumberDetected(K3L_EVENT *e)
         LOG(ERROR, PVT_FMT(target(), "unable to lock %s!") % err._msg.c_str() );
         return false;
     }    
-    catch (K3LAPI::invalid_device & err)
+    catch (K3LAPITraits::invalid_device & err)
     {
         LOG(ERROR, PVT_FMT(_target, "unable to get device: %d!") % err.device);
         return false;
@@ -1973,32 +1990,32 @@ bool BoardE1::KhompPvtFlash::sendDtmf(std::string digit)
     return ret;
 }
 
-Opt::OrigToNseqMapType BoardE1::KhompPvtFXS::generateNseqMap()
+OrigToNseqMapType BoardE1::KhompPvtFXS::generateNseqMap()
 {
-    Opt::OrigToNseqMapType fxs_nseq; /* sequence numbers on FXS */
+    OrigToNseqMapType fxs_nseq; /* sequence numbers on FXS */
 
-    fxs_nseq.insert(Opt::OrigToNseqPairType("", 0)); /* global sequence */
+    fxs_nseq.insert(OrigToNseqPairType("", 0)); /* global sequence */
 
-    for (Opt::BoardToOrigMapType::iterator i = Opt::_fxs_orig_base.begin(); i != Opt::_fxs_orig_base.end(); i++)
+    for (BoardToOrigMapType::iterator i = Opt::_fxs_orig_base.begin(); i != Opt::_fxs_orig_base.end(); i++)
     {
-        fxs_nseq.insert(Opt::OrigToNseqPairType((*i).second, 0));
+        fxs_nseq.insert(OrigToNseqPairType((*i).second, 0));
     }
 
     return fxs_nseq;
 }
 
 
-void BoardE1::KhompPvtFXS::load(Opt::OrigToNseqMapType & fxs_nseq)
+void BoardE1::KhompPvtFXS::load(OrigToNseqMapType & fxs_nseq)
 {
-    Opt::BoardToOrigMapType::iterator it1 = Opt::_fxs_orig_base.find(_target.device);
-    Opt::OrigToNseqMapType::iterator  it2;
+    BoardToOrigMapType::iterator it1 = Opt::_fxs_orig_base.find(_target.device);
+    OrigToNseqMapType::iterator  it2;
 
     std::string orig_base("invalid"); /* will have orig base */
 
     if (it1 == Opt::_fxs_orig_base.end())
     {
         it2 = fxs_nseq.find("");
-        orig_base = Opt::_fxs_global_orig_base;
+        orig_base = Opt::_options._fxs_global_orig_base();
     }
     else
     {
@@ -2024,8 +2041,8 @@ void BoardE1::KhompPvtFXS::load(Opt::OrigToNseqMapType & fxs_nseq)
             loadOptions();
 
             /* makes a "reverse mapping" for Dial using 'r' identifiers */
-            Opt::_fxs_branch_map.insert(Opt::BranchToObjectPairType(_fxs_orig_addr,
-                Opt::ObjectIdType(_target.device, _target.object)));
+            Opt::_fxs_branch_map.insert(BranchToObjectPairType(_fxs_orig_addr,
+                ObjectIdType(_target.device, _target.object)));
 
             /* increment sequence number */
             ++((*it2).second);
@@ -2045,19 +2062,16 @@ void BoardE1::KhompPvtFXS::loadOptions()
 
     /* Initialize fxs default options */
     _calleridname.clear();
-    _amaflags = Opt::_amaflags;
-    _callgroup = Opt::_callgroup;
-    _pickupgroup = Opt::_pickupgroup;
+    //_amaflags = Opt::_amaflags;
+    _callgroup = Opt::_options._callgroup();
+    _pickupgroup = Opt::_options._pickupgroup();
     _context.clear();
-    _input_volume = Opt::_input_volume;
-    _output_volume = Opt::_output_volume;
-    _mohclass = Opt::_global_mohclass;
-    _language = Opt::_global_language;
-    _accountcode = Opt::_accountcode;
+    _input_volume = Opt::_options._input_volume();
+    _output_volume = Opt::_options._output_volume();
     _mailbox.clear();
-    _flash = Opt::_flash;
+    _flash = Opt::_options._flash();
 
-    Opt::BranchToOptMapType::iterator it3 = Opt::_branch_options.find(_fxs_orig_addr);
+    BranchToOptMapType::iterator it3 = Opt::_branch_options.find(_fxs_orig_addr);
 
     if (it3 != Opt::_branch_options.end())
     {
@@ -2066,9 +2080,9 @@ void BoardE1::KhompPvtFXS::loadOptions()
 
     //TODO: Implementar o setVolume para levar em consideracao que o 
     //       padrao pode ser o da FXS
-    if (_input_volume != Opt::_input_volume)
+    if (_input_volume != Opt::_options._input_volume())
         setVolume("input", _input_volume);
-    if (_output_volume != Opt::_output_volume)
+    if (_output_volume != Opt::_options._output_volume())
         setVolume("output", _output_volume);
 }
 
@@ -2163,11 +2177,11 @@ bool BoardE1::KhompPvtFXS::parseBranchOptions(std::string options_str)
             }
             else if (opt_name == "calleridnum") // conscious ultra chuncho!
             {
-                Opt::BranchToOptMapType::iterator it3 = Opt::_branch_options.find(_fxs_orig_addr);
+                BranchToOptMapType::iterator it3 = Opt::_branch_options.find(_fxs_orig_addr);
 
                 if (it3 != Opt::_branch_options.end())
                 {
-                    Opt::_branch_options.insert(Opt::BranchToOptPairType(opt_value, it3->second));
+                    Opt::_branch_options.insert(BranchToOptPairType(opt_value, it3->second));
 
                     Opt::_branch_options.erase(it3);
                 }
@@ -2221,10 +2235,11 @@ bool BoardE1::KhompPvtFXS::alloc()
     startStream();
 
     /* do this procedures early (as audio is already being heard) */
-    dtmfSuppression(Opt::_out_of_band_dtmfs && !callFXS()->_flags.check(Kflags::FAX_DETECTED));
-    echoCancellation(Opt::_echo_canceller && !callFXS()->_flags.check(Kflags::FAX_DETECTED));
-    autoGainControl(Opt::_auto_gain_control && !callFXS()->_flags.check(Kflags::FAX_DETECTED));
+    dtmfSuppression(Opt::_options._out_of_band_dtmfs() && !callFXS()->_flags.check(Kflags::FAX_DETECTED));
+    echoCancellation(Opt::_options._echo_canceller() && !callFXS()->_flags.check(Kflags::FAX_DETECTED));
+    autoGainControl(Opt::_options._auto_gain_control() && !callFXS()->_flags.check(Kflags::FAX_DETECTED));
 
+    //TODO: NEED RECORD HERE !?
     /* if it does not need context, probably it's a pickupcall and will
        not pass throw setup_connection, so we start recording here*/
     //if (!need_context && K::opt::recording && !pvt->is_recording)
@@ -2234,7 +2249,6 @@ bool BoardE1::KhompPvtFXS::alloc()
     return true;
 }
 
-
 bool BoardE1::KhompPvtFXS::onSeizureStart(K3L_EVENT *e)
 {
     DBG(FUNC, PVT_FMT(_target, "(FXS) c"));
@@ -2260,13 +2274,13 @@ bool BoardE1::KhompPvtFXS::onSeizureStart(K3L_EVENT *e)
             return false;
         }
 
-        /* desabilita para evitar problemas de detecção de DTMF */
+        /* disable to avoid problems with DTMF detection */
         echoCancellation(false);
         autoGainControl(false);
 
         call()->_orig_addr = _fxs_orig_addr;
 
-        Opt::OrigToDestMapType::iterator i = Opt::_fxs_hotline.find(_fxs_orig_addr);
+        OrigToDestMapType::iterator i = Opt::_fxs_hotline.find(_fxs_orig_addr);
 
         if (i != Opt::_fxs_hotline.end())
         {
@@ -2285,7 +2299,6 @@ bool BoardE1::KhompPvtFXS::onSeizureStart(K3L_EVENT *e)
             call()->_flags.clear(Kflags::FXS_DIAL_ONGOING);
             call()->_flags.set(Kflags::FXS_OFFHOOK);
         }
-
     }
     catch (ScopedLockFailed & err)
     {
@@ -2312,16 +2325,17 @@ bool BoardE1::KhompPvtFXS::onCallSuccess(K3L_EVENT *e)
 
         if (call()->_pre_answer)
         {
-            dtmfSuppression(Opt::_out_of_band_dtmfs);     
+            dtmfSuppression(Opt::_options._out_of_band_dtmfs());     
 
             startListen();
             startStream();
+            switch_channel_mark_pre_answered(getFSChannel());
         }
         else
         {
             call()->_flags.set(Kflags::GEN_PBX_RING);
             call()->_idx_pbx_ring = Board::board(_target.device)->_timers.add(
-                    Opt::_ringback_pbx_delay,
+                    Opt::_options._ringback_pbx_delay(),
                     &Board::KhompPvt::pbxRingGen, 
                     this, 
                     TM_VAL_CALL);
@@ -2333,11 +2347,16 @@ bool BoardE1::KhompPvtFXS::onCallSuccess(K3L_EVENT *e)
         LOG(ERROR, PVT_FMT(_target, "(FXS) r (unable to lock %s!)") % err._msg.c_str() );
         return false;
     }
-    catch (K3LAPI::invalid_device & err)
+    catch (K3LAPITraits::invalid_device & err)
     {
         LOG(ERROR, PVT_FMT(_target, "(FXS) r (unable to get device: %d!)") % err.device);
         return false;
     }
+    catch (Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "(FXS) r (%s)") % err._msg.c_str() );
+        return false;
+    }
     
     DBG(FUNC, PVT_FMT(_target, "(FXS) r"));
 
@@ -2536,7 +2555,7 @@ bool BoardE1::KhompPvtFXS::startTransfer()
     
         startCadence(PLAY_PBX_TONE);
 
-        callFXS()->_idx_transfer = Board::board(_target.device)->_timers.add(Opt::_fxs_digit_timeout * 1000, &BoardE1::KhompPvtFXS::transferTimer, this, TM_VAL_CALL);        
+        callFXS()->_idx_transfer = Board::board(_target.device)->_timers.add(Opt::_options._fxs_digit_timeout()* 1000, &BoardE1::KhompPvtFXS::transferTimer, this, TM_VAL_CALL);        
 
     }
     catch(Board::KhompPvt::InvalidSwitchChannel & err)
@@ -2545,7 +2564,7 @@ bool BoardE1::KhompPvtFXS::startTransfer()
         LOG(ERROR, PVT_FMT(target(), "r (no valid partner %s!)") % err._msg.c_str());
         return false;
     }
-    catch (K3LAPI::invalid_device & err)
+    catch (K3LAPITraits::invalid_device & err)
     {
         LOG(ERROR, PVT_FMT(_target, "unable to get device: %d!") % err.device);
     }
@@ -2570,7 +2589,7 @@ bool BoardE1::KhompPvtFXS::stopTransfer()
     {
         Board::board(_target.device)->_timers.del(callFXS()->_idx_transfer);
     }
-    catch (K3LAPI::invalid_device & err)
+    catch (K3LAPITraits::invalid_device & err)
     {
         LOG(ERROR, PVT_FMT(_target, "unable to get device: %d!") % err.device);
     }
@@ -2690,7 +2709,7 @@ bool BoardE1::KhompPvtFXS::transfer(std::string & context, bool blind)
     {
         Board::board(_target.device)->_timers.del(callFXS()->_idx_transfer);
     }
-    catch (K3LAPI::invalid_device & err)
+    catch (K3LAPITraits::invalid_device & err)
     {
         LOG(ERROR, PVT_FMT(_target, "unable to get device: %d!") % err.device);
     }
@@ -2709,7 +2728,7 @@ bool BoardE1::KhompPvtFXS::transfer(std::string & context, bool blind)
         if(blind)
         {
             DBG(FUNC, PVT_FMT(_target, "Blind Transfer"));
-            switch_ivr_session_transfer(peer_session, number.c_str(), Opt::_dialplan.c_str(), context.c_str());
+            switch_ivr_session_transfer(peer_session, number.c_str(), Opt::_options._dialplan().c_str(), context.c_str());
         }
         else
         {
@@ -2748,7 +2767,7 @@ bool BoardE1::KhompPvtFXS::transfer(std::string & context, bool blind)
             switch_channel_set_variable(channel, SWITCH_PARK_AFTER_BRIDGE_VARIABLE, "true");
             switch_core_event_hook_add_state_change(session(), xferHook);
 
-            switch_ivr_session_transfer(session(), number.c_str(), Opt::_dialplan.c_str(), context.c_str());
+            switch_ivr_session_transfer(session(), number.c_str(), Opt::_options._dialplan().c_str(), context.c_str());
 
             DBG(FUNC, PVT_FMT(target(), "Generating ring"));
             call()->_indication = INDICA_RING;
@@ -2758,9 +2777,9 @@ bool BoardE1::KhompPvtFXS::transfer(std::string & context, bool blind)
             /*
             try
             {
-                call()->_idx_co_ring = Board::board(_target.device)->_timers.add(Opt::_ringback_co_delay, &Board::KhompPvt::coRingGen,this);
+                call()->_idx_co_ring = Board::board(_target.device)->_timers.add(Opt::_options._ringback_co_delay(), &Board::KhompPvt::coRingGen,this);
             }
-            catch (K3LAPI::invalid_device & err)
+            catch (K3LAPITraits::invalid_device & err)
             {
                 LOG(ERROR, PVT_FMT(_target, "unable to get device: %d!") % err.device);
             }
@@ -2816,7 +2835,7 @@ bool BoardE1::KhompPvtFXS::onDtmfDetected(K3L_EVENT *e)
 
                 mixer(KHOMP_LOG, 1, kmsGenerator, kmtSilence);
 
-                callFXS()->_idx_dial = Board::board(_target.device)->_timers.add(Opt::_fxs_digit_timeout * 1000, &BoardE1::KhompPvtFXS::dialTimer, this, TM_VAL_CALL);
+                callFXS()->_idx_dial = Board::board(_target.device)->_timers.add(Opt::_options._fxs_digit_timeout()* 1000, &BoardE1::KhompPvtFXS::dialTimer, this, TM_VAL_CALL);
             }
             else
             {
@@ -2849,7 +2868,7 @@ bool BoardE1::KhompPvtFXS::onDtmfDetected(K3L_EVENT *e)
                     DBG(FUNC, PVT_FMT(target(), "match more..."));
 
                     /* can match, will match more, and it's an external call? */
-                    for (Opt::DestVectorType::iterator i = Opt::_fxs_co_dialtone.begin(); i != Opt::_fxs_co_dialtone.end(); i++)
+                    for (DestVectorType::const_iterator i = Opt::_options._fxs_co_dialtone().begin(); i != Opt::_options._fxs_co_dialtone().end(); i++)
                     {
                         if (callFXS()->_incoming_exten == (*i))
                         {
@@ -2931,7 +2950,7 @@ bool BoardE1::KhompPvtFXS::onDtmfDetected(K3L_EVENT *e)
                     DBG(FUNC, PVT_FMT(target(), "match more..."));
 
                     /* can match, will match more, and it's an external call? */
-                    for (Opt::DestVectorType::iterator i = Opt::_fxs_co_dialtone.begin(); i != Opt::_fxs_co_dialtone.end(); i++)
+                    for (DestVectorType::const_iterator i = Opt::_options._fxs_co_dialtone().begin(); i != Opt::_options._fxs_co_dialtone().end(); i++)
                     {
                         if (callFXS()->_flash_transfer == (*i))
                         {
@@ -2967,7 +2986,7 @@ bool BoardE1::KhompPvtFXS::onDtmfDetected(K3L_EVENT *e)
         LOG(ERROR, PVT_FMT(_target, "(FXS) r (unable to lock %s!)") % err._msg.c_str() );
         return false;
     }
-    catch (K3LAPI::invalid_device & err)
+    catch (K3LAPITraits::invalid_device & err)
     {
         LOG(ERROR, PVT_FMT(_target, "(FXS) r (unable to get device: %d!)") % err.device);
         return false;
@@ -3080,7 +3099,7 @@ int BoardE1::KhompPvtFXS::makeCall(std::string params)
     /* we always have audio */
     call()->_flags.set(Kflags::HAS_PRE_AUDIO);
     
-    if (Opt::_fxs_bina && !call()->_orig_addr.empty())
+    if (Opt::_options._fxs_bina()&& !call()->_orig_addr.empty())
     {
         /* Sending Bina DTMF*/
         callFXS()->_flags.set(Kflags::WAIT_SEND_DTMF);
@@ -3165,6 +3184,11 @@ bool BoardE1::KhompPvtFXS::doChannelAnswer(CommandRequest &cmd)
         LOG(ERROR,PVT_FMT(_target, "(FXS) r (unable to lock %s!)") % err._msg.c_str() );
         return false;
     }
+    catch (Board::KhompPvt::InvalidSwitchChannel & err)
+    {
+        LOG(ERROR, PVT_FMT(target(), "r (%s)") % err._msg.c_str() );
+        return false;
+    }
 
     DBG(FUNC, PVT_FMT(_target, "(FXS) r"));
 
@@ -3276,14 +3300,14 @@ bool BoardE1::KhompPvtFXS::setupConnection()
     }
 
     bool res_out_of_band_dtmf = (call()->_var_dtmf_state == T_UNKNOWN ?
-        Opt::_suppression_delay && Opt::_out_of_band_dtmfs : (call()->_var_dtmf_state == T_TRUE));
+        Opt::_options._suppression_delay() && Opt::_options._out_of_band_dtmfs(): (call()->_var_dtmf_state == T_TRUE));
 
     bool res_echo_cancellator = (call()->_var_echo_state == T_UNKNOWN ?
-        Opt::_echo_canceller : (call()->_var_echo_state == T_TRUE));
+        Opt::_options._echo_canceller() : (call()->_var_echo_state == T_TRUE));
 
 
     bool res_auto_gain_cntrol = (call()->_var_gain_state == T_UNKNOWN ?
-        Opt::_auto_gain_control : (call()->_var_gain_state == T_TRUE));
+        Opt::_options._auto_gain_control() : (call()->_var_gain_state == T_TRUE));
 
 
     if (!call()->_flags.check(Kflags::REALLY_CONNECTED))
@@ -3408,8 +3432,13 @@ bool BoardE1::KhompPvtFXS::validContexts(
     if(!_context.empty())
         contexts.push_back(_context);
 
-    contexts.push_back(Opt::_context_fxs);
-    contexts.push_back(Opt::_context2_fxs);
+    if(!_group_context.empty())
+    {
+        contexts.push_back(_group_context);
+    }
+
+    contexts.push_back(Opt::_options._context_fxs());
+    contexts.push_back(Opt::_options._context2_fxs());
 
     for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++)
     {
diff --git a/src/mod/endpoints/mod_khomp/src/khomp_pvt_passive.cpp b/src/mod/endpoints/mod_khomp/src/khomp_pvt_passive.cpp
index 28ccb99cfb..48e0010418 100644
--- a/src/mod/endpoints/mod_khomp/src/khomp_pvt_passive.cpp
+++ b/src/mod/endpoints/mod_khomp/src/khomp_pvt_passive.cpp
@@ -50,7 +50,12 @@ bool BoardPassive::KhompPvtPassive::validContexts(
 {
     DBG(FUNC,PVT_FMT(_target,"(Passive) c"));
 
-    contexts.push_back(Opt::_context_pr);
+    if(!_group_context.empty())
+    {
+        contexts.push_back(_group_context);
+    }
+
+    contexts.push_back(Opt::_options._context_pr());
 
     for (MatchExtension::ContextListType::iterator i = contexts.begin(); i != contexts.end(); i++)
     {
diff --git a/src/mod/endpoints/mod_khomp/src/opt.cpp b/src/mod/endpoints/mod_khomp/src/opt.cpp
index 8a08023b37..8001bab6cf 100644
--- a/src/mod/endpoints/mod_khomp/src/opt.cpp
+++ b/src/mod/endpoints/mod_khomp/src/opt.cpp
@@ -47,170 +47,109 @@
 #include "logger.h"
 #include "spec.h"
 
-bool                            Opt::_debug;
-std::string                     Opt::_dialplan;
-std::string                     Opt::_context;
-std::string                     Opt::_user_xfer;
-std::map < std::string, CSpan > Opt::_spans;
-Opt::GroupToDestMapType         Opt::_groups;
-Opt::CadencesMapType            Opt::_cadences;
+#include <function.hpp>
 
-bool Opt::_echo_canceller;
-bool Opt::_auto_gain_control;
-bool Opt::_out_of_band_dtmfs;
-bool Opt::_suppression_delay;
-bool Opt::_pulse_forwarding;
-bool Opt::_native_bridge;
-bool Opt::_recording;
-bool Opt::_has_ctbus;
-bool Opt::_fxs_bina;
-bool Opt::_fxo_send_pre_audio;
-bool Opt::_drop_collect_call;
-bool Opt::_ignore_letter_dtmfs;
-bool Opt::_optimize_audio_path;
+Options               Opt::_options;
+CadencesMapType       Opt::_cadences;
+GroupToDestMapType    Opt::_groups;
+OrigToDestMapType     Opt::_fxs_hotline;
+BoardToOrigMapType    Opt::_fxs_orig_base;
+BranchToOptMapType    Opt::_branch_options;
+BranchToObjectMapType Opt::_fxs_branch_map;
 
-bool         Opt::_auto_fax_adjustment;
-unsigned int Opt::_fax_adjustment_timeout;
-
-bool         Opt::_r2_strict_behaviour;
-unsigned int Opt::_r2_preconnect_wait;
-
-unsigned int Opt::_fxs_digit_timeout;
-
-unsigned int Opt::_transferdigittimeout;
-
-std::string Opt::_flash;
-std::string Opt::_atxfer;
-std::string Opt::_blindxfer;
-
-unsigned int Opt::_ringback_co_delay;
-unsigned int Opt::_ringback_pbx_delay;
-
-unsigned int Opt::_disconnect_delay;
-
-int Opt::_input_volume;
-int Opt::_output_volume;
-
-Opt::DestVectorType     Opt::_fxs_co_dialtone;
-Opt::OrigToDestMapType  Opt::_fxs_hotline;
-std::string             Opt::_fxs_global_orig_base;
-
-Opt::BoardToOrigMapType    Opt::_fxs_orig_base;
-Opt::BranchToObjectMapType Opt::_fxs_branch_map;
-Opt::BranchToOptMapType    Opt::_branch_options;
-
-std::string Opt::_global_mohclass;
-std::string Opt::_global_language;
-
-std::string Opt::_record_prefix;
-
-std::string Opt::_context_gsm_call;
-std::string Opt::_context2_gsm_call;
-std::string Opt::_context_gsm_sms;
-std::string Opt::_context_fxo;
-std::string Opt::_context2_fxo;
-std::string Opt::_context_fxs;
-std::string Opt::_context2_fxs;
-std::string Opt::_context_digital;
-std::string Opt::_context_pr;
-
-int Opt::_amaflags;
-std::string Opt::_callgroup;
-std::string Opt::_pickupgroup;
-
-std::string Opt::_accountcode;
-
-unsigned int Opt::_kommuter_timeout;
-std::string  Opt::_kommuter_activation;
-
-unsigned int Opt::_audio_packet_size;
+/* not beautiful, should think of something! */
+#define FUNCTION_VALUE(x) reinterpret_cast< Config::FunctionValue Options::* >( x )
 
 void Opt::initialize(void) 
 { 
-    Globals::options.add(ConfigOption("debug",    _debug,    false));
-    Globals::options.add(ConfigOption("dialplan", _dialplan, "XML"));
-    Globals::options.add(ConfigOption("context",  _context,  "default"));
+    Globals::options.add(Config::Option("debug",    &Options::_debug,    false));
+    Globals::options.add(Config::Option("dialplan", &Options::_dialplan, "XML"));
+    Globals::options.add(Config::Option("context",  &Options::_context,  "default"));
 
-	Globals::options.add(ConfigOption("echo-canceller",       _echo_canceller,       true));
-	Globals::options.add(ConfigOption("auto-gain-control",    _auto_gain_control,    true));
-	Globals::options.add(ConfigOption("out-of-band-dtmfs",    _out_of_band_dtmfs,    true));
-	Globals::options.add(ConfigOption("suppression-delay",    _suppression_delay,    true));
-	Globals::options.add(ConfigOption("pulse-forwarding",     _pulse_forwarding,     false));
-	Globals::options.add(ConfigOption("native-bridge",        _native_bridge,        true));
-	Globals::options.add(ConfigOption("recording",            _recording,            true));
-	Globals::options.add(ConfigOption("has-ctbus",            _has_ctbus,            false));
-	Globals::options.add(ConfigOption("fxs-bina",             _fxs_bina,             true));
-	Globals::options.add(ConfigOption("fxo-send-pre-audio",   _fxo_send_pre_audio,   true));
-	Globals::options.add(ConfigOption("drop-collect-call",    _drop_collect_call,    false));
-	Globals::options.add(ConfigOption("ignore-letter-dtmfs", _ignore_letter_dtmfs,  false));
-	Globals::options.add(ConfigOption("optimize-audio-path",  _optimize_audio_path,  false));
+	Globals::options.add(Config::Option("echo-canceller",      &Options::_echo_canceller,      true));
+	Globals::options.add(Config::Option("auto-gain-control",   &Options::_auto_gain_control,   true));
+	Globals::options.add(Config::Option("out-of-band-dtmfs",   &Options::_out_of_band_dtmfs,   true));
+	Globals::options.add(Config::Option("suppression-delay",   &Options::_suppression_delay,   true));
+	Globals::options.add(Config::Option("pulse-forwarding",    &Options::_pulse_forwarding,    false));
+	Globals::options.add(Config::Option("native-bridge",       &Options::_native_bridge,       true));
+	Globals::options.add(Config::Option("recording",           &Options::_recording,           true));
+	Globals::options.add(Config::Option("has-ctbus",           &Options::_has_ctbus,           false));
+	Globals::options.add(Config::Option("fxs-bina",            &Options::_fxs_bina,            true));
+	Globals::options.add(Config::Option("fxo-send-pre-audio",  &Options::_fxo_send_pre_audio,  true));
+	Globals::options.add(Config::Option("drop-collect-call",   &Options::_drop_collect_call,   false));
+	Globals::options.add(Config::Option("ignore-letter-dtmfs", &Options::_ignore_letter_dtmfs, true));
+	Globals::options.add(Config::Option("optimize-audio-path", &Options::_optimize_audio_path, false));
 
-    Globals::options.add(ConfigOption("auto-fax-adjustment",    _auto_fax_adjustment,    true));
-    Globals::options.add(ConfigOption("fax-adjustment-timeout", _fax_adjustment_timeout, 30u, 3u, 9999u));
+    Globals::options.add(Config::Option("auto-fax-adjustment",    &Options::_auto_fax_adjustment,    true));
+    Globals::options.add(Config::Option("fax-adjustment-timeout", &Options::_fax_adjustment_timeout, 30u, 3u, 9999u));
 
-    Globals::options.add(ConfigOption("r2-strict-behaviour", _r2_strict_behaviour, false));
-    Globals::options.add(ConfigOption("r2-preconnect-wait",  _r2_preconnect_wait,  250u, 25u, 500u));
+    Globals::options.add(Config::Option("r2-strict-behaviour", &Options::_r2_strict_behaviour, false));
+    Globals::options.add(Config::Option("r2-preconnect-wait",  &Options::_r2_preconnect_wait,  250u, 25u, 500u));
 
-    Globals::options.add(ConfigOption("fxs-digit-timeout",   _fxs_digit_timeout,   7u,  1u, 30u));
+    Globals::options.add(Config::Option("fxs-digit-timeout",    &Options::_fxs_digit_timeout,   7u,  1u, 30u));
+    Globals::options.add(Config::Option("transferdigittimeout", &Options::_transferdigittimeout, 3000u, 0u, 90000u));
 
-    Globals::options.add(ConfigOption("transferdigittimeout", _transferdigittimeout, 3000u, 0u, 90000u));
+    Globals::options.add(Config::Option("atxfer",    &Options::_atxfer, ""));
+    Globals::options.add(Config::Option("blindxfer", &Options::_blindxfer, ""));
 
-    Globals::options.add(ConfigOption("flash-to-digits", _flash,  "*1"));
+    Globals::options.add(Config::Option("flash-to-digits", &Options::_flash, "*1"));
 
-    Globals::options.add(ConfigOption("atxfer",    _atxfer, ""));
-    Globals::options.add(ConfigOption("blindxfer", _blindxfer, ""));
-
-    Globals::options.add(ConfigOption("delay-ringback-co",  _ringback_co_delay,  1500u, 0u, 999000u)); 
-    Globals::options.add(ConfigOption("delay-ringback-pbx", _ringback_pbx_delay, 2500u, 0u, 999000u));
+    Globals::options.add(Config::Option("delay-ringback-co",  &Options::_ringback_co_delay,  1500u, 0u, 999000u)); 
+    Globals::options.add(Config::Option("delay-ringback-pbx", &Options::_ringback_pbx_delay, 2500u, 0u, 999000u));
     
-    Globals::options.add(ConfigOption("disconnect-delay", _disconnect_delay, 0u, 0u, 100000u)); 
+    Globals::options.add(Config::Option("disconnect-delay", &Options::_disconnect_delay, 0u, 0u, 100000u)); 
 
-    Globals::options.add(ConfigOption("input-volume",  _input_volume, 0, -10, 10));
-    Globals::options.add(ConfigOption("output-volume", _output_volume, 0, -10, 10));
+    Globals::options.add(Config::Option("input-volume",  &Options::_input_volume, 0, -10, 10));
+    Globals::options.add(Config::Option("output-volume", &Options::_output_volume, 0, -10, 10));
 
+    Globals::options.add(Config::Option("fxs-co-dialtone", 
+        FUNCTION_VALUE(&Options::_fxs_co_dialtone), ""));
 
-    Globals::options.add(ConfigOption("fxs-co-dialtone", ProcessFXSCODialtone(), ""));
-    Globals::options.add(ConfigOption("fxs-global-orig", _fxs_global_orig_base,  "0"));
+    Globals::options.add(Config::Option("log-to-disk",   
+        FUNCTION_VALUE(&Options::_log_disk_option),    "standard", false));
 
-    Globals::options.add(ConfigOption("language", _global_language, ""));
-    Globals::options.add(ConfigOption("mohclass", _global_mohclass, ""));
+    Globals::options.add(Config::Option("callgroup", &Options::_callgroup,   "0"));
 
-    Globals::options.add(ConfigOption("record-prefix", ProcessRecordPrefix(), "/var/spool/freeswitch/monitor/"));
+    Globals::options.add(Config::Option("pickupgroup", &Options::_pickupgroup, "0"));
+    
+    Globals::options.add(Config::Option("log-to-console",
+        FUNCTION_VALUE(&Options::_log_console_option), "standard", false));
 
-    Globals::options.add(ConfigOption("context-fxo",          _context_fxo,       "khomp-DD-CC"));
-    Globals::options.add(ConfigOption("context-fxo-alt",      _context2_fxo,      "khomp-DD"));
-    Globals::options.add(ConfigOption("context-fxs",          _context_fxs,       "khomp-DD-CC"));
-    Globals::options.add(ConfigOption("context-fxs-alt",      _context2_fxs,      "khomp-DD"));
-    Globals::options.add(ConfigOption("context-gsm-call",     _context_gsm_call,  "khomp-DD-CC"));
-    Globals::options.add(ConfigOption("context-gsm-call-alt", _context2_gsm_call, "khomp-DD"));
-    Globals::options.add(ConfigOption("context-gsm-sms",      _context_gsm_sms,   "khomp-sms-DD-CC"));
-    Globals::options.add(ConfigOption("context-digital",      _context_digital,   "khomp-DD-LL"));
-    Globals::options.add(ConfigOption("context-pr",           _context_pr,        "khomp-DD-CC"));
+    Globals::options.add(Config::Option("trace",
+        FUNCTION_VALUE(&Options::_log_trace_option), "", false));
 
-    Globals::options.add(ConfigOption("amaflags",    ProcessAMAFlags(),    "default"));
-    Globals::options.add(ConfigOption("callgroup",   _callgroup,   "0"));
-    Globals::options.add(ConfigOption("pickupgroup", _pickupgroup, "0"));
-    //Globals::options.add(ConfigOption("callgroup",   ProcessCallGroup(),   "0"));
-    //Globals::options.add(ConfigOption("pickupgroup", ProcessPickupGroup(), "0"));
+    Globals::options.add(Config::Option("record-prefix", 
+        FUNCTION_VALUE(&Options::_record_prefix), "/var/spool/freeswitch/monitor/"));
+    
+    Globals::options.add(Config::Option("fxs-global-orig", &Options::_fxs_global_orig_base,  "0"));
 
-    Globals::options.add(ConfigOption("accountcode", _accountcode, ""));
+    Globals::options.add(Config::Option("language", &Options::_global_language, ""));
+    Globals::options.add(Config::Option("mohclass", &Options::_global_mohclass, ""));
 
-    ConfigOption::string_allowed_type kommuter_allowed;
-    kommuter_allowed.insert("auto");
-    kommuter_allowed.insert("manual");
+    Globals::options.add(Config::Option("context-fxo",          &Options::_context_fxo,       "khomp-DD-CC"));
+    Globals::options.add(Config::Option("context-fxo-alt",      &Options::_context2_fxo,      "khomp-DD"));
+    Globals::options.add(Config::Option("context-fxs",          &Options::_context_fxs,       "khomp-DD-CC"));
+    Globals::options.add(Config::Option("context-fxs-alt",      &Options::_context2_fxs,      "khomp-DD"));
+    Globals::options.add(Config::Option("context-gsm-call",     &Options::_context_gsm_call,  "khomp-DD-CC"));
+    Globals::options.add(Config::Option("context-gsm-call-alt", &Options::_context2_gsm_call, "khomp-DD"));
+    Globals::options.add(Config::Option("context-gsm-sms",      &Options::_context_gsm_sms,   "khomp-sms-DD-CC"));
+    Globals::options.add(Config::Option("context-digital",      &Options::_context_digital,   "khomp-DD-LL"));
+    Globals::options.add(Config::Option("context-pr",           &Options::_context_pr,        "khomp-DD-CC"));
 
-    Globals::options.add(ConfigOption("kommuter-activation", _kommuter_activation , "auto", kommuter_allowed));
-    Globals::options.add(ConfigOption("kommuter-timeout",    _kommuter_timeout ,(unsigned int) 10 , (unsigned int) 0 , (unsigned int) 255));
+    Globals::options.add(Config::Option("accountcode", &Options::_accountcode, ""));
 
-    Globals::options.add(ConfigOption("audio-packet-length", _audio_packet_size,
+    Config::StringSet activation_strings;
+    activation_strings.insert("auto");
+    activation_strings.insert("manual");
+
+    Globals::options.add(Config::Option("kommuter-activation", &Options::_kommuter_activation , "auto", activation_strings));
+    Globals::options.add(Config::Option("kommuter-timeout",    &Options::_kommuter_timeout ,(unsigned int) 10 , (unsigned int) 0 , (unsigned int) 255));
+
+    Globals::options.add(Config::Option("audio-packet-length", &Options::_audio_packet_size,
          (unsigned int)KHOMP_READ_PACKET_SIZE, (unsigned int)KHOMP_MIN_READ_PACKET_SIZE, (unsigned int)KHOMP_MAX_READ_PACKET_SIZE, 8u));
 
-    Globals::options.add(ConfigOption("log-to-disk",    ProcessLogOptions(O_GENERIC), "standard", false));
-    Globals::options.add(ConfigOption("log-to-console", ProcessLogOptions(O_CONSOLE), "standard", false));
-
-    Globals::options.add(ConfigOption("trace",          ProcessTraceOptions(), "", false));
-    Globals::options.add(ConfigOption("user-transfer-digits", _user_xfer, ""));
-
+    Globals::options.add(Config::Option("user-transfer-digits", &Options::_user_xfer_digits, ""));
+    
     /* aliases */
     Globals::options.synonym("context-gsm", "context-gsm-call");
     Globals::options.synonym("context-gsm-alt", "context-gsm-call-alt");
@@ -224,27 +163,34 @@ void Opt::initialize(void)
     Globals::options.synonym("log", "log-to-disk");
     Globals::options.synonym("volume", "output-volume");
     Globals::options.synonym("disconnectdelay", "disconnect-delay");
-
 }
 
 void Opt::obtain(void)
 {
-    /* everything should start clean! */
-    cleanConfiguration();        
-
-    /* reset loaded options */
-    Globals::options.reset();
-
-    loadConfiguration("khomp.conf", NULL);
-
-    /* commit, loading defaults where needed */
-    ConfigOptions::messages_type msgs = Globals::options.commit();
-
-    /* config already full loaded at this point, so we can use our own log system... */
-    for (ConfigOptions::messages_type::iterator i = msgs.begin(); i != msgs.end(); i++)
+    try
     {
-        DBG(FUNC,FMT("%s") % (*i).c_str());
+        /* everything should start clean! */
+        cleanConfiguration();        
+
+        /* reset loaded options */
+        Globals::options.reset(&Opt::_options);
+
+        /* should be loaded *BEFORE* start_k3l */
+        loadConfiguration("khomp.conf", NULL);
+
+        /* commit, loading defaults where needed */
+            Config::Options::Messages msgs = Globals::options.commit(&Opt::_options);
+
+        /* config already full loaded at this point, so we can use our own log system... */
+        for (Config::Options::Messages::iterator i = msgs.begin(); i != msgs.end(); i++)
+        {
+            DBG(FUNC,FMT("%s") % (*i).c_str());
+        }
     }
+    catch (std::runtime_error & e) 
+    {    
+        LOG(ERROR, FMT("unable to obtain general options: %s: procedure aborted!") % e.what());
+    }    
 }
 
 void Opt::commit(void)
@@ -283,8 +229,13 @@ void Opt::loadConfiguration(const char *file_name, const char **section, bool sh
 {
     switch_xml_t cfg, xml, settings;
 
-    if (!(xml = switch_xml_open_cfg(file_name, &cfg, NULL))) {
-        LOG(ERROR,FMT("Open of %s failed") % file_name);
+    if (!(xml = switch_xml_open_cfg(file_name, &cfg, NULL)))
+    {
+        if (show_errors)
+        {
+            LOG(ERROR,FMT("Open of %s failed") % file_name);
+        }
+
         return;
     }
 
@@ -312,24 +263,10 @@ void Opt::loadConfiguration(const char *file_name, const char **section, bool sh
     switch_xml_free(xml);
 }
 
-void Opt::printConfiguration(switch_stream_handle_t* stream)
-{
-    for( std::map<std::string, CSpan>::iterator ii=_spans.begin(); ii!=_spans.end(); ++ii )
-    {
-        stream->write_function(stream,
-                               "Span: %s.\nDialplan: %s.\nContext: %s.\nDialstring: %s.\n\n",
-                               (*ii).first.c_str(),
-                               (*ii).second._dialplan.c_str(),
-                               (*ii).second._context.c_str(),
-                               (*ii).second._dialstring.c_str());
-    }
-}
-
 void Opt::cleanConfiguration(void)
 {
     _fxs_orig_base.clear();
     _fxs_hotline.clear();
-    _fxs_co_dialtone.clear();
     _fxs_branch_map.clear();
     _branch_options.clear();
 
@@ -343,72 +280,56 @@ void Opt::cleanConfiguration(void)
     _cadences.insert(CadencesPairType("vm-dialtone", CadenceType(1000,100,100,100)));
 }
 
-void Opt::ProcessFXSCODialtone::operator()(std::string options) // const
-{
-    Strings::vector_type tokens;
-    Strings::tokenize(options, tokens, ",");
-
-    for (Strings::vector_type::iterator i = tokens.begin(); i != tokens.end(); i++)
-        _fxs_co_dialtone.push_back(*i);
-}
-
-void Opt::ProcessRecordPrefix::operator()(std::string path) // const
-{
-    if (mkdir(path.c_str(), 493 /* 0755 */) < 0 && errno != EEXIST)
-    {
-        throw ConfigProcessFailure("the default recording directory could not be created.");
-    }
-    else
-    {
-        _record_prefix = path;
-    }
-}
-
-void Opt::ProcessAMAFlags::operator()(std::string options)
-{
 /*
-    //TODO: Do we need this ?
-    amaflags = ast_cdr_amaflags2int(options.c_str());
+void Options::AmaflagOption::operator()(const Config::StringType & str)
+{
+    //_value = Strings::tolong(str);
+    //if(_value < 0)
+    //    throw Config::Failure(STG(FMT("invalid AMA flags: %s") % str));
+}
 
-    if (amaflags < 0)
-        throw ConfigProcessFailure(STG(FMT("invalid AMA flags: %s") % options));
+void Options::CallGroupOption::operator()(const Config::StringType & str)
+{
+    _groups = str;
+}
+
+void Options::PickupGroupOption::operator()(const Config::StringType & str)
+{
+    _groups = str;
+}
 */
-}
 
-//TODO: Check this
-void Opt::ProcessCallGroup::operator()(std::string options)
+void Options::RecordPrefixOption::operator()(const Config::StringType & str)
 {
-//    _callgroup = options.c_str();
+    if (mkdir(str.c_str(), 493 /* 0755 */) < 0 && errno != EEXIST)
+        throw Config::Failure("the default recording directory could not be created.");
+
+    _value = str; 
 }
 
-//TODO: Check this
-void Opt::ProcessPickupGroup::operator()(std::string options)
-{
-//    _pickupgroup = options.c_str();
-}
-
-void Opt::ProcessLogOptions::operator()(std::string options)
-{
-    switch (_output)
-    {   
-        case O_GENERIC:
-            K::Logger::processLogDisk(NULL, options, false, true);
-            break;
-
-        case O_CONSOLE:
-            K::Logger::processLogConsole(NULL, options, false, true);
-            break;
-
-        default:
-            throw ConfigProcessFailure("attempt to process unknown log file configuration");
-            break;
-    }   
-}
-
-void Opt::ProcessTraceOptions::operator()(std::string options)
+void Options::CentralOfficeDialtone::operator()(const Config::StringType & str) 
 {
     Strings::vector_type tokens;
-    Strings::tokenize(options, tokens, ",");
+    Strings::tokenize(str, tokens, ",");
+
+    for (Strings::vector_type::iterator i = tokens.begin(); i != tokens.end(); i++) 
+        _value.push_back(*i);
+}
+
+void Options::LogDiskOption::operator()(const Config::StringType & str) 
+{
+    K::Logger::processLogDisk(NULL, str, false, true);
+}
+
+void Options::LogConsoleOption::operator()(const Config::StringType & str) 
+{
+    K::Logger::processLogConsole(NULL, str, false, true);
+}
+
+void Options::LogTraceOption::operator()(const Config::StringType & str)
+{
+    Strings::vector_type tokens;
+    Strings::tokenize(str, tokens, ",");
 
     bool         enable_k3l_tracing  = false;
     bool         enable_r2_tracing   = false;
@@ -418,17 +339,12 @@ void Opt::ProcessTraceOptions::operator()(std::string options)
     {
         std::string tok = Strings::trim(*i);
 
-        if (tok == "k3l")
+        /**/ if (tok == "k3l")  enable_k3l_tracing = true;
+        else if (tok == "r2")   enable_r2_tracing = true;
+        else if (tok == "rdsi") enable_rdsi_tracing = true;
+        else
         {
-            enable_k3l_tracing = true;
-        }
-        else if (tok == "r2")
-        {
-            enable_r2_tracing = true;
-        }
-        else if (tok == "rdsi")
-        {
-            enable_rdsi_tracing = true;
+            LOG(ERROR, FMT("invalid string '%s' for option 'trace', ignoring...") % tok)
         }
     }
 
@@ -485,12 +401,12 @@ switch_xml_t Opt::processSimpleXML(switch_xml_t &xml, const std::string& child_n
                     % var
                     % val);
 
-                Globals::options.process(var, val);
+                Globals::options.process(&Opt::_options, var, val);
             }
-            catch (ConfigProcessFailure e)
+            catch (Config::Failure e)
             {
                 LOG(ERROR,FMT("config processing error: %s. [%s=%s]")  
-                    % e.msg.c_str()
+                    % e.what()
                     % var
                     % val);
 
@@ -521,10 +437,10 @@ void Opt::processGroupXML(switch_xml_t &xml)
                 _groups.insert(GroupToDestPairType(var,val));
 
             }
-            catch (ConfigProcessFailure e)
+            catch (Config::Failure e)
             {
                 LOG(ERROR,FMT("config processing error: %s. [%s=%s]")  
-                    % e.msg.c_str()
+                    % e.what()
                     % var
                     % val);
             }
@@ -575,10 +491,10 @@ void Opt::processCadenceXML(switch_xml_t &xml)
                     _cadences.insert(CadencesPairType(var, cadence));
                 } 
             }
-            catch (ConfigProcessFailure e)
+            catch (Config::Failure e)
             {
                 LOG(ERROR,FMT("config processing error: %s. [%s=%s]")  
-                    % e.msg.c_str()
+                    % e.what()
                     % var
                     % val);
 
@@ -637,7 +553,7 @@ void Opt::processFXSBranchesXML(switch_xml_t &xml)
 
                     for (unsigned int device = 0; device < Globals::k3lapi.device_count(); device++)
                     {
-                        K3L_DEVICE_CONFIG & conf = Globals::k3lapi.device_config(device);
+                        const K3L_DEVICE_CONFIG & conf = Globals::k3lapi.device_config(device);
 
                         std::string str_serial(conf.SerialNumber);
 
@@ -659,10 +575,10 @@ void Opt::processFXSBranchesXML(switch_xml_t &xml)
                     }
                 }
             }
-            catch (ConfigProcessFailure e)
+            catch (Config::Failure e)
             {
                 LOG(ERROR,FMT("config processing error: %s. [%s=%s]")  
-                    % e.msg.c_str()
+                    % e.what()
                     % var
                     % val);
             }
@@ -702,10 +618,10 @@ void Opt::processFXSHotlines(switch_xml_t &xml)
                 _fxs_hotline.insert(OrigToDestPairType(var, val));
 
             }
-            catch (ConfigProcessFailure e)
+            catch (Config::Failure e)
             {
                 LOG(ERROR,FMT("config processing error: %s. [%s=%s]")  
-                    % e.msg.c_str()
+                    % e.what()
                     % var
                     % val);        
             }
@@ -758,10 +674,10 @@ void Opt::processFXSOptions(switch_xml_t &xml)
                     }
                 }
             }
-            catch (ConfigProcessFailure e)
+            catch (Config::Failure e)
             {
                 LOG(ERROR,FMT("config processing error: %s. [%s=%s]")  
-                    % e.msg.c_str()
+                    % e.what()
                     % var
                     % val);      
             }
diff --git a/src/mod/endpoints/mod_khomp/src/spec.cpp b/src/mod/endpoints/mod_khomp/src/spec.cpp
index 5af02634ac..85e46997d8 100644
--- a/src/mod/endpoints/mod_khomp/src/spec.cpp
+++ b/src/mod/endpoints/mod_khomp/src/spec.cpp
@@ -66,7 +66,7 @@ static SpecRetType processSpecAtom(std::string & atom, SpecFlagsType & flags, Sp
     {
    		std::string group_name = allocstr.substr(1);
 
-		Opt::GroupToDestMapType::iterator it = Opt::_groups.find(group_name);
+		GroupToDestMapType::iterator it = Opt::_groups.find(group_name);
 
 		if (it == Opt::_groups.end())
 		{
@@ -78,9 +78,9 @@ static SpecRetType processSpecAtom(std::string & atom, SpecFlagsType & flags, Sp
 		return processSpecAtoms(allocstr, flags, fun);
     }
 
-    Regex::Expression e("(((([bB])[ ]*([0-9]+))|(([sS])[ ]*([0-9]+)))[ ]*(([cClL])[ ]*([0-9]+)[ ]*([-][ ]*([0-9]+))?)?)|(([rR])[ ]*([0-9]+)[ ]*([-][ ]*([0-9]+))?)", Regex::E_EXTENDED);
+    //Regex::Expression e("(((([bB])[ ]*([0-9]+))|(([sS])[ ]*([0-9]+)))[ ]*(([cClL])[ ]*([0-9]+)[ ]*([-][ ]*([0-9]+))?)?)|(([rR])[ ]*([0-9]+)[ ]*([-][ ]*([0-9]+))?)", Regex::E_EXTENDED);
 
-	Regex::Match what(allocstr, e);
+	Regex::Match what(allocstr, Globals::regex_allocation);
 
 	if (!what.matched())
 	{
@@ -170,7 +170,7 @@ static SpecRetType processSpecAtom(std::string & atom, SpecFlagsType & flags, Sp
 					for (unsigned int i = branch_id; i <= branch2_id; i++)
 					{
 						std::string call_addr = BoardE1::KhompPvtFXS::padOrig(base_addr, i - branch_id);
-						Opt::BranchToObjectMapType::iterator i = Opt::_fxs_branch_map.find(call_addr);
+						BranchToObjectMapType::iterator i = Opt::_fxs_branch_map.find(call_addr);
 
 						if (i == Opt::_fxs_branch_map.end())
 						{
@@ -188,7 +188,7 @@ static SpecRetType processSpecAtom(std::string & atom, SpecFlagsType & flags, Sp
 					{
 						std::string call_addr = BoardE1::KhompPvtFXS::padOrig(base_addr, i - branch_id);
 
-						Opt::BranchToObjectMapType::iterator i = Opt::_fxs_branch_map.find(call_addr);
+						BranchToObjectMapType::iterator i = Opt::_fxs_branch_map.find(call_addr);
 
 						if (i == Opt::_fxs_branch_map.end())
 						{
@@ -205,7 +205,7 @@ static SpecRetType processSpecAtom(std::string & atom, SpecFlagsType & flags, Sp
 			{
 				DBG(FUNC, D("branch matched: %s") % base_addr);
 
-				Opt::BranchToObjectMapType::iterator i = Opt::_fxs_branch_map.find(base_addr);
+				BranchToObjectMapType::iterator i = Opt::_fxs_branch_map.find(base_addr);
 
 				if (i == Opt::_fxs_branch_map.end())
 				{
@@ -440,7 +440,7 @@ struct funProcessCallChannelString
 		    if (_all_fail)
 			    _all_fail = (tmp ? !tmp->isOK() : true);
         }
-        catch (K3LAPI::invalid_channel & err)
+        catch (K3LAPITraits::invalid_channel & err)
         {
             _all_fail = true;
         }
@@ -599,7 +599,7 @@ struct FunProcessGroupString
 
             if (pvt) pvt->_group_context = _ctx;
         }
-        catch (K3LAPI::invalid_channel & err)
+        catch (K3LAPITraits::invalid_channel & err)
         {
         }
 
@@ -634,8 +634,13 @@ static bool processCallChannelString(std::string & str, Board::KhompPvt *& pvt,
             pvt = proc.pvt(flags);
 			DBG(FUNC, D("pvt = %p") % pvt);
 
-			if (!pvt && cause && !(*cause))
-				*cause = SWITCH_CAUSE_INTERWORKING;
+			if (cause && !(*cause))
+            {
+    			if (!pvt)
+			    	*cause = SWITCH_CAUSE_INTERWORKING;
+                else
+			    	*cause = SWITCH_CAUSE_SUCCESS;
+            }
 
 			ret = true;
             break;
@@ -663,9 +668,14 @@ bool processSMSChannelString(std::string & str, Board::KhompPvt *& pvt, int *cau
         case SPR_CONTINUE:
             pvt = proc.pvt(flags);
             DBG(FUNC, FMT("pvt = %p") % pvt);
-
-            if (!pvt && cause && !(*cause))
-                *cause = SWITCH_CAUSE_INTERWORKING;
+			
+            if (cause && !(*cause))
+            {
+    			if (!pvt)
+			    	*cause = SWITCH_CAUSE_INTERWORKING;
+                else
+			    	*cause = SWITCH_CAUSE_SUCCESS;
+            }
 
             return true;
     }    
@@ -685,7 +695,7 @@ Board::KhompPvt * processDialString (const char *dial_charv, int *cause)
 
     DBG(FUNC, FMT("processing dial string [%d] : '%s'") % dial_args.size() % dial_string);
 
-	if ((dial_args.size() < 1 && dial_args.size() > 3))
+	if ((dial_args.size() < 1 || dial_args.size() > 3))
 	{
 		LOG(ERROR, FMT("invalid dial string '%s': wrong number of separators ('/').") % dial_string);
 		return NULL;
@@ -837,7 +847,7 @@ Board::KhompPvt * processSMSString (const char *sms_charv, int *cause)
 
 void processGroupString()
 {
-    for (Opt::GroupToDestMapType::iterator i = Opt::_groups.begin(); i != Opt::_groups.end(); i++)
+    for (GroupToDestMapType::iterator i = Opt::_groups.begin(); i != Opt::_groups.end(); i++)
     {
         const std::string & name = (*i).first;
         std::string & opts = (*i).second;
diff --git a/src/mod/endpoints/mod_khomp/src/utils.cpp b/src/mod/endpoints/mod_khomp/src/utils.cpp
index cc6eaef082..178ec0b993 100644
--- a/src/mod/endpoints/mod_khomp/src/utils.cpp
+++ b/src/mod/endpoints/mod_khomp/src/utils.cpp
@@ -44,7 +44,6 @@
 #include <utils.h>
 #include "khomp_pvt.h"
 
-
 void Kflags::init()
 {
     _flags[CONNECTED]._name = "CONNECTED";
@@ -461,7 +460,7 @@ bool Kommuter::stop()
     }
 
     /* stop all watches */
-    if (Opt::_kommuter_activation == "auto")
+    if (Opt::_options._kommuter_activation() == "auto")
     {
         for (int kommuter = 0 ; kommuter < _kommuter_count ; kommuter++)
         {
@@ -486,7 +485,7 @@ bool Kommuter::initialize(K3L_EVENT *e)
     /* get total of kommuter devices */
     _kommuter_count = e->AddInfo;
    
-    if(Opt::_kommuter_activation == "manual")
+    if(Opt::_options._kommuter_activation() == "manual")
     {
         if (_kommuter_count > 0)
         {
@@ -499,7 +498,7 @@ bool Kommuter::initialize(K3L_EVENT *e)
     if (_kommuter_count > 0) 
     {    
         bool start_timer = false;
-        int timeout = Opt::_kommuter_timeout;
+        int timeout = Opt::_options._kommuter_timeout();
 
         std::string param = STG(FMT("timeout=%d") % timeout);
 
@@ -605,3 +604,74 @@ void Kommuter::wtdKickTimer(void *)
     }
 }
 
+/************************************ ESLs **********************************/
+ESL::VectorEvents * ESL::_events = NULL;
+
+ESL::ESL(std::string type) : _type(type)
+{
+    if(!_events)
+        _events = new VectorEvents();
+
+//    _events->push_back(_type);
+}
+
+ESL::~ESL()
+{
+    if(!_events)
+        return;
+
+    //Remove one from vector
+    //_events->pop_back();
+    
+    if(_events->size() == 0)
+    {
+        delete _events;
+        _events = NULL;
+    }
+}
+
+bool ESL::registerEvents()
+{
+    bool ok = true;
+
+    DBG(FUNC, "Register ESLs");
+
+    if(!_events)
+        return true;
+
+    for(VectorEvents::const_iterator event = _events->begin(); event != _events->end(); event++)
+    {
+        if (switch_event_reserve_subclass((*(event)).c_str()) != SWITCH_STATUS_SUCCESS)
+        {
+            LOG(ERROR, FMT("Couldn't register subclass=\"%s\"") % *(event));
+            ok = false;
+        }
+        else
+        {
+            DBG(FUNC, FMT("Register subclass=\"%s\"") % *(event));
+        }
+    }
+
+    return ok;
+}
+
+bool ESL::unregisterEvents()
+{
+    DBG(FUNC, "Unregister ESLs");
+    
+    if(!_events)
+        return true;
+
+    for(VectorEvents::const_iterator event = _events->begin(); event != _events->end(); event++)
+    {
+        DBG(FUNC, FMT("Unregister subclass=\"%s\"") % *(event));
+        switch_event_free_subclass((*(event)).c_str());
+    }
+
+    return true;
+}
+
+
+
+/******************************************************************************/
+
diff --git a/src/mod/endpoints/mod_khomp/support/klog-config.cpp b/src/mod/endpoints/mod_khomp/support/klog-config.cpp
index d2d743a126..112b616cb1 100644
--- a/src/mod/endpoints/mod_khomp/support/klog-config.cpp
+++ b/src/mod/endpoints/mod_khomp/support/klog-config.cpp
@@ -60,7 +60,11 @@ Logfile::~Logfile()
     /* nothing for now */
 };
 
+#if COMMONS_AT_LEAST(1,1)
+bool Logfile::select(Section ** ptr, const std::string & str)
+#else
 bool Logfile::select(Section ** ptr, std::string str)
+#endif
 {
     // default section, needed for API compliance.
     if (str == "")
diff --git a/src/mod/endpoints/mod_khomp/support/klog-config.hpp b/src/mod/endpoints/mod_khomp/support/klog-config.hpp
index 6e3e75a092..fbab7058e8 100644
--- a/src/mod/endpoints/mod_khomp/support/klog-config.hpp
+++ b/src/mod/endpoints/mod_khomp/support/klog-config.hpp
@@ -43,6 +43,7 @@
 #include <stdexcept>
 #pragma GCC visibility pop
 
+#include <config_commons.hpp>
 #include <format.hpp>
 
 #include <configurator/configfile.hpp>
@@ -57,7 +58,12 @@ struct Logfile: public Configfile
     Logfile();
     ~Logfile();
 
+#if COMMONS_AT_LEAST(1,1)
+    bool select(Section **, const std::string & str = "");
+#else
     bool select(Section **, std::string str = "");
+#endif
+
     bool serialize(std::ofstream &);
 
     Section & root() { return _logoptions; };
diff --git a/src/mod/endpoints/mod_khomp/install.sh b/src/mod/endpoints/mod_khomp/tools/getk3l.sh
similarity index 93%
rename from src/mod/endpoints/mod_khomp/install.sh
rename to src/mod/endpoints/mod_khomp/tools/getk3l.sh
index 8cc60f2a78..57364cdd7e 100755
--- a/src/mod/endpoints/mod_khomp/install.sh
+++ b/src/mod/endpoints/mod_khomp/tools/getk3l.sh
@@ -53,10 +53,10 @@ then
      clean "Need to be root\n"
 fi  
 
-if [ "w$FREESWITCH_PATH" == "w" ]
-then
-    clean "FreeSWITCH source PATH is needed: \n\tSet \"FREESWITCH_PATH=\"\n"
-fi
+#if [ "w$FREESWITCH_PATH" == "w" ]
+#then
+#    clean "FreeSWITCH source PATH is needed: \n\tSet \"FREESWITCH_PATH=\"\n"
+#fi
 
 if ! which 'kserver' &> /dev/null
 then
@@ -85,9 +85,9 @@ then
     clean "k3l version 2.1 must be installed: \n\tUninstall the old version of k3l and try again\n"
 fi
 
-make || clean "Error on compilation\n"
+#make || clean "Error on compilation\n"
 
-make install || clean "Error on installation\n"
+#make install || clean "Error on installation\n"
 
 echo "Successfully installed!"
 
diff --git a/src/mod/endpoints/mod_skypopen/mod_skypopen.c b/src/mod/endpoints/mod_skypopen/mod_skypopen.c
index 83c409c3f6..65c1b120fd 100644
--- a/src/mod/endpoints/mod_skypopen/mod_skypopen.c
+++ b/src/mod/endpoints/mod_skypopen/mod_skypopen.c
@@ -261,7 +261,7 @@ switch_status_t skypopen_tech_init(private_t *tech_pvt, switch_core_session_t *s
 		ERRORA("skypopen_tech_init: no tech_pvt->session_uuid_str\n", SKYPOPEN_P_LOG);
 		return SWITCH_STATUS_FALSE;
 	}
-	if (skypopen_codec(tech_pvt, SAMPLERATE_SKYPOPEN, 20) != SWITCH_STATUS_SUCCESS) {
+	if (skypopen_codec(tech_pvt, SAMPLERATE_SKYPOPEN, MS_SKYPOPEN) != SWITCH_STATUS_SUCCESS) {
 		ERRORA("skypopen_tech_init: skypopen_codec FAILED\n", SKYPOPEN_P_LOG);
 		return SWITCH_STATUS_FALSE;
 	}
@@ -526,6 +526,10 @@ static switch_status_t channel_on_destroy(switch_core_session_t *session)
 			switch_core_timer_destroy(&tech_pvt->timer_read);
 		}
 
+		if (tech_pvt->timer_read_srv.timer_interface && tech_pvt->timer_read_srv.timer_interface->timer_next) {
+			switch_core_timer_destroy(&tech_pvt->timer_read_srv);
+		}
+
 		if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next) {
 			switch_core_timer_destroy(&tech_pvt->timer_write);
 		}
@@ -822,23 +826,23 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
 	tech_pvt->read_frame.flags = SFF_NONE;
 
 	if (!switch_test_flag(tech_pvt, TFLAG_IO)) {
-		switch_sleep(20000);
+		switch_sleep(MS_SKYPOPEN * 1000);
 		return SWITCH_STATUS_FALSE;
 	}
 	if (!switch_channel_ready(channel)) {
 		ERRORA("channel not ready \n", SKYPOPEN_P_LOG);
-		switch_sleep(20000);
+		switch_sleep(MS_SKYPOPEN * 1000);
 		return SWITCH_STATUS_FALSE;
 	}
 
 	if (switch_test_flag(tech_pvt, TFLAG_PROGRESS)) {
 		//DEBUGA_SKYPE("CHANNEL READ FRAME in TFLAG_PROGRESS goto CNG\n", SKYPOPEN_P_LOG);
-		switch_sleep(20000);
+		switch_sleep(MS_SKYPOPEN * 1000);
 		goto cng;
 	}
 
 	if (!tech_pvt->read_buffer) {
-		int32_t max_len = 640 * 10;
+		int32_t max_len = BYTES_PER_FRAME * 10;
 
 		switch_buffer_create(skypopen_module_pool, &tech_pvt->read_buffer, max_len);
 		switch_assert(tech_pvt->read_buffer);
@@ -861,7 +865,7 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
 			|| tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD || tech_pvt->skype_callflow == SKYPOPEN_STATE_UP)) {
 		switch_mutex_lock(tech_pvt->mutex_audio_srv);
 		if (tech_pvt->read_buffer && switch_buffer_inuse(tech_pvt->read_buffer)) {
-			bytes_read = switch_buffer_read(tech_pvt->read_buffer, tech_pvt->read_frame.data, 640);
+			bytes_read = switch_buffer_read(tech_pvt->read_buffer, tech_pvt->read_frame.data, BYTES_PER_FRAME);
 			tech_pvt->read_frame.datalen = bytes_read;
 		}
 		switch_mutex_unlock(tech_pvt->mutex_audio_srv);
@@ -873,13 +877,13 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
 			if (try < 5)
 				goto read;
 			DEBUGA_SKYPE("skypopen_audio_read Silence\n", SKYPOPEN_P_LOG);
-			memset(tech_pvt->read_frame.data, 255, SAMPLES_PER_FRAME * sizeof(short));
-			tech_pvt->read_frame.datalen = 640;
+			memset(tech_pvt->read_frame.data, 255, BYTES_PER_FRAME);
+			tech_pvt->read_frame.datalen = BYTES_PER_FRAME;
 
 		}
 	} else {
-		memset(tech_pvt->read_frame.data, 255, SAMPLES_PER_FRAME * sizeof(short));
-		tech_pvt->read_frame.datalen = 640;
+		memset(tech_pvt->read_frame.data, 255, BYTES_PER_FRAME);
+		tech_pvt->read_frame.datalen = BYTES_PER_FRAME;
 	}
 
 	switch_mutex_lock(tech_pvt->flag_mutex);
@@ -1002,7 +1006,7 @@ static switch_status_t channel_write_frame(switch_core_session_t *session, switc
 	}
 #endif
 	if (!tech_pvt->write_buffer) {
-		int32_t max_len = 640 * 3;
+		int32_t max_len = BYTES_PER_FRAME * 3;
 
 		switch_buffer_create(skypopen_module_pool, &tech_pvt->write_buffer, max_len);
 		switch_assert(tech_pvt->write_buffer);
@@ -1017,7 +1021,7 @@ static switch_status_t channel_write_frame(switch_core_session_t *session, switc
 	switch_buffer_write(tech_pvt->write_buffer, frame->data, frame->datalen);
 	switch_mutex_unlock(tech_pvt->mutex_audio_cli);
 	if (no_space) {
-		switch_sleep(20000);
+		switch_sleep(MS_SKYPOPEN * 1000);
 	} else {
 		tech_pvt->begin_to_write = 1;
 	}
@@ -1121,6 +1125,9 @@ static switch_status_t channel_receive_message(switch_core_session_t *session, s
 				if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next) {
 					switch_core_timer_sync(&tech_pvt->timer_read);
 				}
+				if (tech_pvt->timer_read_srv.timer_interface && tech_pvt->timer_read_srv.timer_interface->timer_next) {
+					switch_core_timer_sync(&tech_pvt->timer_read_srv);
+				}
 				switch_mutex_unlock(tech_pvt->mutex_audio_srv);
 			}
 
@@ -1146,6 +1153,9 @@ static switch_status_t channel_receive_message(switch_core_session_t *session, s
 			if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next) {
 				switch_core_timer_sync(&tech_pvt->timer_read);
 			}
+			if (tech_pvt->timer_read_srv.timer_interface && tech_pvt->timer_read_srv.timer_interface->timer_next) {
+				switch_core_timer_sync(&tech_pvt->timer_read_srv);
+			}
 			switch_mutex_unlock(tech_pvt->mutex_audio_srv);
 		}
 
@@ -1168,6 +1178,9 @@ static switch_status_t channel_receive_message(switch_core_session_t *session, s
 			if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next) {
 				switch_core_timer_sync(&tech_pvt->timer_read);
 			}
+			if (tech_pvt->timer_read_srv.timer_interface && tech_pvt->timer_read_srv.timer_interface->timer_next) {
+				switch_core_timer_sync(&tech_pvt->timer_read_srv);
+			}
 			switch_mutex_unlock(tech_pvt->mutex_audio_srv);
 		}
 
@@ -2161,14 +2174,21 @@ int start_audio_threads(private_t *tech_pvt)
 	tech_pvt->begin_to_write = 0;
 	tech_pvt->begin_to_read = 0;
 
-	if (switch_core_timer_init(&tech_pvt->timer_read, "soft", 20, 320, skypopen_module_pool) != SWITCH_STATUS_SUCCESS) {
+	if (switch_core_timer_init(&tech_pvt->timer_read, "soft", MS_SKYPOPEN, SAMPLES_PER_FRAME, skypopen_module_pool) != SWITCH_STATUS_SUCCESS) {
 		ERRORA("setup timer failed\n", SKYPOPEN_P_LOG);
 		return SWITCH_STATUS_FALSE;
 	}
 
 	switch_core_timer_sync(&tech_pvt->timer_read);
 
-	if (switch_core_timer_init(&tech_pvt->timer_write, "soft", 20, 320, skypopen_module_pool) != SWITCH_STATUS_SUCCESS) {
+	if (switch_core_timer_init(&tech_pvt->timer_read_srv, "soft", MS_SKYPOPEN, SAMPLES_PER_FRAME, skypopen_module_pool) != SWITCH_STATUS_SUCCESS) {
+		ERRORA("setup timer failed\n", SKYPOPEN_P_LOG);
+		return SWITCH_STATUS_FALSE;
+	}
+
+	switch_core_timer_sync(&tech_pvt->timer_read_srv);
+
+	if (switch_core_timer_init(&tech_pvt->timer_write, "soft", MS_SKYPOPEN, SAMPLES_PER_FRAME, skypopen_module_pool) != SWITCH_STATUS_SUCCESS) {
 		ERRORA("setup timer failed\n", SKYPOPEN_P_LOG);
 		return SWITCH_STATUS_FALSE;
 	}
diff --git a/src/mod/endpoints/mod_skypopen/osscuse/98-osscuse.rules b/src/mod/endpoints/mod_skypopen/osscuse/98-osscuse.rules
new file mode 100644
index 0000000000..c1430fd5c0
--- /dev/null
+++ b/src/mod/endpoints/mod_skypopen/osscuse/98-osscuse.rules
@@ -0,0 +1,7 @@
+# Since these devices are not part of 'sound' subsystem the group is forced
+# to audio by name
+# /dev/cuse can stay  mode 0660 root:root since osspd is run as root
+# and drops privileges to user level when opened by user
+KERNEL=="dsp", GROUP="audio"
+KERNEL=="mixer", GROUP="audio"
+KERNEL=="adsp", GROUP="audio"
diff --git a/src/mod/endpoints/mod_skypopen/osscuse/LICENSE b/src/mod/endpoints/mod_skypopen/osscuse/LICENSE
new file mode 100644
index 0000000000..d511905c16
--- /dev/null
+++ b/src/mod/endpoints/mod_skypopen/osscuse/LICENSE
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/src/mod/endpoints/mod_skypopen/osscuse/Makefile b/src/mod/endpoints/mod_skypopen/osscuse/Makefile
new file mode 100644
index 0000000000..a42d37a8a3
--- /dev/null
+++ b/src/mod/endpoints/mod_skypopen/osscuse/Makefile
@@ -0,0 +1,69 @@
+# These can be overridden if needed
+# DESTDIR is completely respected
+CC := gcc
+AR := ar
+CFLAGS := -Wall $(CFLAGS)
+XLDFLAGS := $(LDFLAGS)
+LDFLAGS := -L. -lossp $(LDFLAGS)
+prefix := /usr/local
+DESTDIR :=
+UDEVDIR := /etc/udev/rules.d
+
+ifeq "$(origin OSSPD_CFLAGS)" "undefined"
+OSSPD_CFLAGS := $(shell pkg-config --cflags fuse)
+endif
+
+ifeq "$(origin OSSPD_LDFLAGS)" "undefined"
+OSSPD_LDFLAGS := $(shell pkg-config --libs fuse)
+endif
+
+ifeq "$(origin OSSP_PADSP_CFLAGS)" "undefined"
+OSSP_PADSP_CFLAGS := $(shell pkg-config --cflags libpulse)
+endif
+
+ifeq "$(origin OSSP_PADSP_LDFLAGS)" "undefined"
+OSSP_PADSP_LDFLAGS := $(shell pkg-config --libs libpulse)
+endif
+
+ifeq "$(origin OSSP_ALSAP_CFLAGS)" "undefined"
+OSSP_ALSAP_CFLAGS := $(shell pkg-config --libs alsa)
+endif
+
+ifeq "$(origin OSSP_ALSAP_LDFLAGS)" "undefined"
+OSSP_ALSAP_LDFLAGS := $(shell pkg-config --libs alsa)
+endif
+
+headers := ossp.h ossp-util.h ossp-slave.h
+
+#all: osspd ossp-padsp ossp-alsap
+all: osspd ossp-alsap
+
+install:
+	mkdir -p $(DESTDIR)$(prefix)/sbin
+	install -m755 osspd ossp-padsp ossp-alsap $(DESTDIR)$(prefix)/sbin
+	mkdir -p $(DESTDIR)$(UDEVDIR)
+	install -m644 98-osscuse.rules $(DESTDIR)$(UDEVDIR)
+
+libossp.a: ossp.c ossp.h ossp-util.c ossp-util.h ossp-slave.c ossp-slave.h
+	$(CC) $(CFLAGS) -c -o ossp.o ossp.c
+	$(CC) $(CFLAGS) -c -o ossp-util.o ossp-util.c
+	$(CC) $(CFLAGS) -c -o ossp-slave.o ossp-slave.c
+	$(AR) rc $@ ossp.o ossp-util.o ossp-slave.o
+
+osspd: osspd.c libossp.a $(headers)
+	$(CC) $(CFLAGS) $(OSSPD_CFLAGS) -o $@ $< $(OSSPD_LDFLAGS) $(LDFLAGS)
+
+ossp-padsp: ossp-padsp.c libossp.a $(headers)
+	$(CC) $(CFLAGS) $(OSSP_PADSP_CFLAGS) -o $@ $< $(OSSP_PADSP_LDFLAGS) $(LDFLAGS)
+
+ossp-alsap: ossp-alsap.c libossp.a $(headers)
+	$(CC) $(CFLAGS) $(OSSP_ALSAP_CFLAGS) -o $@ $< $(OSSP_ALSAP_LDFLAGS) $(LDFLAGS)
+
+osstest: osstest.c
+	$(CC) $(CFLAGS) -o $@ $< $(XLDFLAGS)
+
+test: osstest
+	@./osstest
+
+clean:
+	rm -f *.o *.a osspd ossp-padsp ossp-alsap osstest
diff --git a/src/mod/endpoints/mod_skypopen/osscuse/README b/src/mod/endpoints/mod_skypopen/osscuse/README
new file mode 100644
index 0000000000..6b716c76e4
--- /dev/null
+++ b/src/mod/endpoints/mod_skypopen/osscuse/README
@@ -0,0 +1,119 @@
+
+ OSS Proxy - emulate OSS device using CUSE
+
+ Copyright (C) 2008-2009  SUSE Linux Products GmbH
+ Copyright (C) 2008-2009  Tejun Heo <tj@kernel.org>
+
+1. What is it?
+--------------
+
+Well, first, OSS refers to Open Sound System.  If it still doesn't
+ring a bell, think /dev/dsp, /dev/adsp and /dev/mixer.
+
+Currently, Linux supports two audio programming interface - ALSA and
+OSS.  The latter one is deprecated and has been that way for a long
+time but there still are applications which still use them including
+UML (usermode Linux) host sound support.
+
+ALSA contains OSS emulation but sadly the emulation is behind
+multiplexing layer (which is in userland) which means that if your
+sound card doesn't support multiple audio streams, only either one of
+ALSA or OSS interface would be usable at any given moment.
+
+There have been also attempts to emulate OSS in userland using dynamic
+library preloading - aoss and more recently padsp.  This works for
+many applications but it's just not easy to emulate everything using
+the technique.  Things like polling, signals, forking, privilege
+changes make it very difficult to emulate things reliably.
+
+OSS Proxy uses CUSE (extension of FUSE allowing character devices to
+be implemented in userspace) to implement OSS interface - /dev/dsp,
+/dev/adsp and /dev/mixer.  From the POV of the applications, these
+devices are proper character devices and behave exactly the same way
+so it can be made quite versatile.
+
+
+2. Hmmm... So, how does the whole thing work?
+---------------------------------------------
+
+The OSS Proxy daemon - osspd - should be started first.  Note that
+osspd will fail to start if sound device number regions are already
+occupied.  You'll need to turn off OSS or its emulation[1].
+
+On startup, osspd creates /dev/dsp, /dev/adsp and /dev/mixer using
+CUSE.  When an application access one of the devices, all IOs are
+redirected to osspd via CUSE.  Upon receiving a new DSP open request,
+osspd creates a slave process which drops the root privilege and
+assumes the opening process's credentials.  After handshaking, osspd
+forwards all relevant IOs to the slave which is responsible for
+actually playing the sound.
+
+Currently there's only one slave implemented - ossp-padsp, which as
+the name suggests forwards (again) the sound to pulseaudio.  To sum
+up, the whole pipe looks like the following.
+
+ App <-> /dev/dsp <-> CUSE <-> osspd <-> ossp-padsp <-> pulseaudio
+
+Which is a lot of forwarding, but on modern machines, it won't be too
+noticeable.
+
+
+3. What works?
+--------------
+
+Well, MIDI part isn't implemented and I doubt it will be in any near
+future but except that everything should work.  Playing, recording,
+5.1ch, A-V syncing, all should work.  If not, it's a bug, so please
+report.
+
+The mixer behaves a bit differently tho.  In the original OSS,
+/dev/mixer is the hardware mixer, so adjusting volumes there affects
+all audio streams.  When using ossp, each process group gets its own
+mixer and the mixer always contains only two knobs - PCM and IGAIN.
+Combined with per-stream volume control of pulseaudio, this scheme
+works quite well for applications with embedded volume control
+although it makes standalone OSS mixer programs virtually useless[2].
+
+
+4. How do I use it?
+-------------------
+
+First you need CUSE support in kernel which might land on 2.6.28 with
+sufficient luck[3] and then you also need libfuse which supports
+CUSE[4].  Once you have both, it should be easy.  First build it by
+running `make'.  You can set OSSPD_CFLAGS, OSSPD_LDFLAGS,
+OSSP_PADSP_CFLAGS and OSSP_PADSP_LDFLAGS if you have stuff at
+non-default locations.
+
+After build completes, there will be two executables - `osspd' and
+`ossp-padsp'.  Just copy them to where other system executables live.
+Specific location doesn't matter as long as both files end up in the
+same directory.
+
+Execute `osspd'.  It will create the device files and you're all set.
+`osspd' uses syslog with LOG_DAEMON facility, so if something doesn't
+work take a look at what osspd complains about.
+
+
+[1] As of this writing, turning on any sound support makes the
+    soundcore module claim OSS device regions.  Patch to make it claim
+    OSS device regions only when OSS support or emulation is enabled
+    is scheduled for 2.6.28.  Even with the patch, soundcore will
+    claim OSS device regions if OSS support or ALSA OSS emulation is
+    enabled.  Make sure they're turned off.
+
+[2] If you have a strong reason to use standalone OSS mixer program,
+    you can play some shell tricks to put it into the same process
+    group as the target audio application.  e.g. To use aumix with
+    mpg123 - `(mpg123 asdf.mp3 > /dev/null 2>&1 & aumix)', but
+    seriously, just use PA or ALSA one.
+
+[3] For the time being, here's the git tree with all the necessary
+    changes.  This tree is base on top of 2.6.27-rc3.
+
+    http://git.kernel.org/?p=linux/kernel/git/tj/misc.git;a=shortlog;h=cuse
+    git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git cuse
+
+[4] And libfuse with the modifications can be found at...
+
+    http://userweb.kernel.org/~tj/ossp/fuse-cuse.tar.gz
diff --git a/src/mod/endpoints/mod_skypopen/osscuse/ossp-alsap.c b/src/mod/endpoints/mod_skypopen/osscuse/ossp-alsap.c
new file mode 100644
index 0000000000..607e05ca84
--- /dev/null
+++ b/src/mod/endpoints/mod_skypopen/osscuse/ossp-alsap.c
@@ -0,0 +1,613 @@
+/*
+ * ossp-alsap - ossp DSP slave which forwards to alsa
+ *
+ * Copyright (C)      2009 Maarten Lankhorst <m.b.lankhorst@gmail.com>
+ *
+ * This file is released under the GPLv2.
+ *
+ * Why an alsa plugin as well? Just to show how much
+ * the alsa userspace api sucks ;-)
+ */
+
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <libgen.h>
+#include <limits.h>
+#include <poll.h>
+#include <pthread.h>
+#include <pwd.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <alsa/asoundlib.h>
+#include <sys/soundcard.h>
+
+#include "ossp-slave.h"
+
+enum {
+	AFMT_FLOAT		= 0x00004000,
+	AFMT_S32_LE		= 0x00001000,
+	AFMT_S32_BE		= 0x00002000,
+};
+
+static size_t page_size;
+
+/* alsa structures */
+static snd_pcm_t *pcm[2];
+static snd_pcm_hw_params_t *hw_params;
+static snd_pcm_sw_params_t *sw_params;
+static int block;
+
+static unsigned int byte_counter[2];
+static snd_pcm_uframes_t mmap_pos[2];
+static int stream_corked[2];
+static int stream_notify;
+
+static struct format {
+	snd_pcm_format_t format;
+	snd_pcm_sframes_t rate;
+	int channels;
+} hw_format = { SND_PCM_FORMAT_U8, 8000, 1 };
+
+#if 0
+/* future mmap stuff */
+static size_t mmap_raw_size, mmap_size;
+static int mmap_fd[2] = { -1, -1 };
+static void *mmap_map[2];
+static uint64_t mmap_idx[2];		/* mmap pointer */
+static uint64_t mmap_last_idx[2];	/* last idx for get_ptr */
+static struct ring_buf mmap_stg[2];	/* staging ring buffer */
+static size_t mmap_lead[2];		/* lead bytes */
+static int mmap_sync[2];		/* sync with backend stream */
+#endif
+
+static snd_pcm_format_t fmt_oss_to_alsa(int fmt)
+{
+	switch (fmt) {
+	case AFMT_U8:			return SND_PCM_FORMAT_U8;
+	case AFMT_A_LAW:		return SND_PCM_FORMAT_A_LAW;
+	case AFMT_MU_LAW:		return SND_PCM_FORMAT_MU_LAW;
+	case AFMT_S16_LE:		return SND_PCM_FORMAT_S16_LE;
+	case AFMT_S16_BE:		return SND_PCM_FORMAT_S16_BE;
+	case AFMT_FLOAT:		return SND_PCM_FORMAT_FLOAT;
+	case AFMT_S32_LE:		return SND_PCM_FORMAT_S32_LE;
+	case AFMT_S32_BE:		return SND_PCM_FORMAT_S32_BE;
+	default:			return SND_PCM_FORMAT_U8;
+	}
+}
+
+static int fmt_alsa_to_oss(snd_pcm_format_t fmt)
+{
+	switch (fmt) {
+	case SND_PCM_FORMAT_U8:		return AFMT_U8;
+	case SND_PCM_FORMAT_A_LAW:	return AFMT_A_LAW;
+	case SND_PCM_FORMAT_MU_LAW:	return AFMT_MU_LAW;
+	case SND_PCM_FORMAT_S16_LE:	return AFMT_S16_LE;
+	case SND_PCM_FORMAT_S16_BE:	return AFMT_S16_BE;
+	case SND_PCM_FORMAT_FLOAT:	return AFMT_FLOAT;
+	case SND_PCM_FORMAT_S32_LE:	return AFMT_S32_LE;
+	case SND_PCM_FORMAT_S32_BE:	return AFMT_S32_BE;
+	default:			return AFMT_U8;
+	}
+}
+
+static void flush_streams(int drain)
+{
+	/* FIXME: snd_pcm_drain appears to be able to deadlock,
+	 * always drop or check state? */
+	if (drain) {
+		if (pcm[PLAY])
+			snd_pcm_drain(pcm[PLAY]);
+		if (pcm[REC])
+			snd_pcm_drain(pcm[REC]);
+	} else {
+		if (pcm[PLAY])
+			snd_pcm_drop(pcm[PLAY]);
+		if (pcm[REC])
+			snd_pcm_drop(pcm[REC]);
+	}
+
+	/* XXX: Really needed? */
+#if 0
+	if (pcm[PLAY]) {
+		snd_pcm_close(pcm[PLAY]);
+		snd_pcm_open(&pcm[PLAY], "default",
+			     SND_PCM_STREAM_PLAYBACK, block);
+	}
+	if (pcm[REC]) {
+		snd_pcm_close(pcm[REC]);
+		snd_pcm_open(&pcm[REC], "default",
+			     SND_PCM_STREAM_CAPTURE, block);
+	}
+#endif
+}
+
+static void kill_streams(void)
+{
+	flush_streams(0);
+}
+
+static int trigger_streams(int play, int rec)
+{
+	int ret = 0;
+
+	if (pcm[PLAY] && play >= 0) {
+		ret = snd_pcm_sw_params_set_start_threshold(pcm[PLAY], sw_params,
+							   play ? 1 : -1);
+		if (ret >= 0)
+			snd_pcm_sw_params(pcm[PLAY], sw_params);
+	}
+	if (ret >= 0 && pcm[REC] && rec >= 0) {
+		ret = snd_pcm_sw_params_set_start_threshold(pcm[REC], sw_params,
+							    rec ? 1 : -1);
+		if (ret >= 0)
+			snd_pcm_sw_params(pcm[REC], sw_params);
+	}
+
+	return ret;
+}
+
+static ssize_t alsap_mixer(enum ossp_opcode opcode,
+			   void *carg, void *din, size_t din_sz,
+			   void *rarg, void *dout, size_t *dout_szp, int tfd)
+{
+return -EBUSY;
+}
+
+static int set_hw_params(snd_pcm_t *pcm)
+{
+	int ret;
+	unsigned rate;
+
+	ret = snd_pcm_hw_params_any(pcm, hw_params);
+	if (ret >= 0)
+		ret = snd_pcm_hw_params_set_access(pcm, hw_params,
+						   SND_PCM_ACCESS_RW_INTERLEAVED);
+	rate = hw_format.rate;
+	if (ret >= 0)
+		ret = snd_pcm_hw_params_set_rate_minmax(pcm, hw_params,
+							&rate, NULL,
+							&rate, NULL);
+	if (ret >= 0)
+		ret = snd_pcm_hw_params_set_format(pcm, hw_params, hw_format.format);
+	if (ret >= 0)
+		ret = snd_pcm_hw_params_set_channels(pcm, hw_params,
+						     hw_format.channels);
+	if (ret >= 0)
+		ret = snd_pcm_hw_params(pcm, hw_params);
+	if (ret >= 0)
+		ret = snd_pcm_sw_params_current(pcm, sw_params);
+	if (ret >= 0)
+		ret = snd_pcm_sw_params(pcm, sw_params);
+	return ret;
+}
+
+static ssize_t alsap_open(enum ossp_opcode opcode,
+			  void *carg, void *din, size_t din_sz,
+			  void *rarg, void *dout, size_t *dout_szp, int tfd)
+{
+	struct ossp_dsp_open_arg *arg = carg;
+	int ret;
+	block = arg->flags & O_NONBLOCK ? SND_PCM_NONBLOCK : 0;
+	int access;
+//	block |= SND_PCM_ASYNC;
+	/* Woop dee dooo.. I love handling things in SIGIO (PAIN!!)
+	 * Probably needed for MMAP
+	 */
+
+	if (!hw_params)
+		ret = snd_pcm_hw_params_malloc(&hw_params);
+	if (ret < 0)
+		return ret;
+
+	if (!sw_params)
+		ret = snd_pcm_sw_params_malloc(&sw_params);
+	if (ret < 0)
+		return ret;
+
+	if (pcm[PLAY])
+		snd_pcm_close(pcm[PLAY]);
+	if (pcm[REC])
+		snd_pcm_close(pcm[REC]);
+	pcm[REC] = pcm[PLAY] = NULL;
+
+	access = arg->flags & O_ACCMODE;
+	if (access == O_WRONLY || access == O_RDWR) {
+		ret = snd_pcm_open(&pcm[PLAY], "default",
+				   SND_PCM_STREAM_PLAYBACK, block);
+		if (ret >= 0)
+			ret = set_hw_params(pcm[PLAY]);
+	}
+
+	if (ret >= 0 && (access == O_RDONLY || access == O_RDWR)) {
+		ret = snd_pcm_open(&pcm[REC], "default",
+				   SND_PCM_STREAM_CAPTURE, block);
+		if (ret >= 0)
+			ret = set_hw_params(pcm[REC]);
+	}
+
+	if (ret < 0) {
+		if (pcm[PLAY])
+			snd_pcm_close(pcm[PLAY]);
+		if (pcm[REC])
+			snd_pcm_close(pcm[REC]);
+		pcm[REC] = pcm[PLAY] = NULL;
+		return ret;
+	}
+	return 0;
+}
+
+#define GIOVANNI
+#ifdef GIOVANNI
+
+#define GIOVA_SLEEP 40000
+#define GIOVA_BLK 3840
+static ssize_t alsap_write(enum ossp_opcode opcode,
+			   void *carg, void *din, size_t din_sz,
+			   void *rarg, void *dout, size_t *dout_szp, int tfd)
+{
+	usleep((GIOVA_SLEEP/GIOVA_BLK)* din_sz);
+	return	din_sz;
+}
+static ssize_t alsap_read(enum ossp_opcode opcode,
+			  void *carg, void *din, size_t din_sz,
+			  void *rarg, void *dout, size_t *dout_szp, int tfd)
+{
+	usleep((GIOVA_SLEEP/GIOVA_BLK)* *dout_szp);
+	return	*dout_szp;
+}
+#else// GIOVANNI
+static ssize_t alsap_write(enum ossp_opcode opcode,
+			   void *carg, void *din, size_t din_sz,
+			   void *rarg, void *dout, size_t *dout_szp, int tfd)
+{
+//	struct ossp_dsp_rw_arg *arg = carg;
+	int ret, insize;
+
+	insize = snd_pcm_bytes_to_frames(pcm[PLAY], din_sz);
+
+	if (snd_pcm_state(pcm[PLAY]) == SND_PCM_STATE_SETUP)
+		snd_pcm_prepare(pcm[PLAY]);
+
+//	snd_pcm_start(pcm[PLAY]);
+	ret = snd_pcm_writei(pcm[PLAY], din, insize);
+	if (ret < 0)
+		ret = snd_pcm_recover(pcm[PLAY], ret, 1);
+
+	if (ret >= 0)
+		return snd_pcm_frames_to_bytes(pcm[PLAY], ret);
+	else
+		return ret;
+}
+
+static ssize_t alsap_read(enum ossp_opcode opcode,
+			  void *carg, void *din, size_t din_sz,
+			  void *rarg, void *dout, size_t *dout_szp, int tfd)
+{
+//	struct ossp_dsp_rw_arg *arg = carg;
+	int ret, outsize;
+
+	outsize = snd_pcm_bytes_to_frames(pcm[REC], *dout_szp);
+
+	if (snd_pcm_state(pcm[REC]) == SND_PCM_STATE_SETUP)
+		snd_pcm_prepare(pcm[REC]);
+
+	ret = snd_pcm_readi(pcm[REC], dout, outsize);
+	if (ret < 0)
+		ret = snd_pcm_recover(pcm[REC], ret, 1);
+	if (ret >= 0)
+		*dout_szp = ret = snd_pcm_frames_to_bytes(pcm[REC], ret);
+	else
+		*dout_szp = 0;
+
+	return ret;
+}
+#endif// GIOVANNI
+
+static ssize_t alsap_poll(enum ossp_opcode opcode,
+			  void *carg, void *din, size_t din_sz,
+			  void *rarg, void *dout, size_t *dout_szp, int tfd)
+{
+	unsigned revents = 0;
+
+	stream_notify |= *(int *)carg;
+
+	if (pcm[PLAY])
+		revents |= POLLOUT;
+	if (pcm[REC])
+		revents |= POLLIN;
+
+	*(unsigned *)rarg = revents;
+	return 0;
+}
+
+
+static ssize_t alsap_flush(enum ossp_opcode opcode,
+			   void *carg, void *din, size_t din_sz,
+			   void *rarg, void *dout, size_t *dout_szp, int tfd)
+{
+	flush_streams(opcode == OSSP_DSP_SYNC);
+	return 0;
+}
+
+static ssize_t alsap_post(enum ossp_opcode opcode,
+			  void *carg, void *din, size_t din_sz,
+			  void *rarg, void *dout, size_t *dout_szp, int tfd)
+{
+	int ret;
+
+	ret = trigger_streams(1, 1);
+	if (ret >= 0 && pcm[PLAY])
+		ret = snd_pcm_start(pcm[PLAY]);
+	if (pcm[REC])
+		ret = snd_pcm_start(pcm[REC]);
+	return ret;
+}
+
+static ssize_t alsap_get_param(enum ossp_opcode opcode,
+			       void *carg, void *din, size_t din_sz,
+			       void *rarg, void *dout, size_t *dout_szp,
+			       int tfd)
+{
+	int v = 0;
+
+	switch (opcode) {
+	case OSSP_DSP_GET_RATE:
+		return hw_format.rate;
+
+	case OSSP_DSP_GET_CHANNELS:
+		return hw_format.channels;
+
+	case OSSP_DSP_GET_FORMAT: {
+		v = fmt_alsa_to_oss(hw_format.format);
+		break;
+	}
+
+	case OSSP_DSP_GET_BLKSIZE: {
+		snd_pcm_uframes_t psize;
+		snd_pcm_hw_params_get_period_size(hw_params, &psize, NULL);
+		v = psize;
+		break;
+	}
+
+	case OSSP_DSP_GET_FORMATS:
+		v = AFMT_U8 | AFMT_A_LAW | AFMT_MU_LAW | AFMT_S16_LE |
+			AFMT_S16_BE | AFMT_FLOAT | AFMT_S32_LE | AFMT_S32_BE;
+		break;
+
+	case OSSP_DSP_GET_TRIGGER:
+		if (!stream_corked[PLAY])
+			v |= PCM_ENABLE_OUTPUT;
+		if (!stream_corked[REC])
+			v |= PCM_ENABLE_INPUT;
+		break;
+
+	default:
+		assert(0);
+	}
+
+	*(int *)rarg = v;
+
+	return 0;
+}
+
+static ssize_t alsap_set_param(enum ossp_opcode opcode,
+			       void *carg, void *din, size_t din_sz,
+			       void *rarg, void *dout, size_t *dout_szp,
+			       int tfd)
+{
+	int v = *(int *)carg;
+	int ret = 0;
+
+	/* kill the streams before changing parameters */
+	kill_streams();
+
+	switch (opcode) {
+	case OSSP_DSP_SET_RATE: {
+		hw_format.rate = v;
+		break;
+	}
+
+	case OSSP_DSP_SET_CHANNELS: {
+		hw_format.channels = v;
+		break;
+	}
+
+	case OSSP_DSP_SET_FORMAT: {
+		snd_pcm_format_t format = fmt_oss_to_alsa(v);
+		hw_format.format = format;
+		break;
+	}
+
+	case OSSP_DSP_SET_SUBDIVISION:
+		if (!v)
+			v = 1;
+#if 0
+		if (!v) {
+			v = user_subdivision ?: 1;
+			break;
+		}
+		user_frag_size = 0;
+		user_subdivision = v;
+		break;
+
+	case OSSP_DSP_SET_FRAGMENT:
+		user_subdivision = 0;
+		user_frag_size = 1 << (v & 0xffff);
+		user_max_frags = (v >> 16) & 0xffff;
+		if (user_frag_size < 4)
+			user_frag_size = 4;
+		if (user_max_frags < 2)
+			user_max_frags = 2;
+#else
+	case OSSP_DSP_SET_FRAGMENT:
+#endif
+		break;
+	default:
+		assert(0);
+	}
+
+	if (pcm[PLAY])
+		ret = set_hw_params(pcm[PLAY]);
+	if (ret >= 0 && pcm[REC])
+		ret = set_hw_params(pcm[REC]);
+
+	if (rarg)
+		*(int *)rarg = v;
+	return 0;
+}
+
+static ssize_t alsap_set_trigger(enum ossp_opcode opcode,
+				 void *carg, void *din, size_t din_sz,
+				 void *rarg, void *dout, size_t *dout_szp,
+				 int fd)
+{
+	int enable = *(int *)carg;
+
+	stream_corked[PLAY] = !!(enable & PCM_ENABLE_OUTPUT);
+	stream_corked[REC] = !!(enable & PCM_ENABLE_INPUT);
+
+	return trigger_streams(enable & PCM_ENABLE_OUTPUT,
+			       enable & PCM_ENABLE_INPUT);
+}
+
+static ssize_t alsap_get_space(enum ossp_opcode opcode,
+			       void *carg, void *din, size_t din_sz,
+			       void *rarg, void *dout, size_t *dout_szp, int tfd)
+{
+	int dir = (opcode == OSSP_DSP_GET_OSPACE) ? PLAY : REC;
+	int underrun = 0;
+	struct audio_buf_info info = { };
+	unsigned long bufsize;
+	snd_pcm_uframes_t avail, fragsize;
+	snd_pcm_state_t state;
+
+	if (!pcm[dir])
+		return -EINVAL;
+
+	state = snd_pcm_state(pcm[dir]);
+	if (state == SND_PCM_STATE_XRUN) {
+		snd_pcm_recover(pcm[dir], -EPIPE, 0);
+		underrun = 1;
+	} else if (state == SND_PCM_STATE_SUSPENDED) {
+		snd_pcm_recover(pcm[dir], -ESTRPIPE, 0);
+		underrun = 1;
+	}
+
+	snd_pcm_hw_params_current(pcm[dir], hw_params);
+	snd_pcm_hw_params_get_period_size(hw_params, &fragsize, NULL);
+	snd_pcm_hw_params_get_buffer_size(hw_params, &bufsize);
+	info.fragsize = snd_pcm_frames_to_bytes(pcm[dir], fragsize);
+	info.fragstotal = bufsize / fragsize;
+	if (!underrun) {
+		avail = snd_pcm_avail_update(pcm[dir]);
+		info.fragments = avail / fragsize;
+	} else
+		info.fragments = info.fragstotal;
+
+	info.bytes = info.fragsize * info.fragments;
+
+	*(struct audio_buf_info *)rarg = info;
+	return 0;
+}
+
+static ssize_t alsap_get_ptr(enum ossp_opcode opcode,
+			     void *carg, void *din, size_t din_sz,
+			     void *rarg, void *dout, size_t *dout_szp, int tfd)
+{
+	int dir = (opcode == OSSP_DSP_GET_OPTR) ? PLAY : REC;
+	struct count_info info = { };
+
+	if (!pcm[dir])
+		return -EIO;
+
+	snd_pcm_hw_params_current(pcm[dir], hw_params);
+	info.bytes = byte_counter[dir];
+	snd_pcm_hw_params_get_periods(hw_params, (unsigned int *)&info.blocks, NULL);
+	info.ptr = mmap_pos[dir];
+
+	*(struct count_info *)rarg = info;
+	return 0;
+}
+
+static ssize_t alsap_get_odelay(enum ossp_opcode opcode,
+				void *carg, void *din, size_t din_sz,
+				void *rarg, void *dout, size_t *dout_szp,
+				int fd)
+{
+	snd_pcm_sframes_t delay;
+
+	if (!pcm[PLAY])
+		return -EIO;
+
+	if (snd_pcm_delay(pcm[PLAY], &delay) < 0)
+		return -EIO;
+
+	*(int *)rarg = snd_pcm_frames_to_bytes(pcm[PLAY], delay);
+	return 0;
+}
+
+static ossp_action_fn_t action_fn_tbl[OSSP_NR_OPCODES] = {
+	[OSSP_MIXER]		= alsap_mixer,
+	[OSSP_DSP_OPEN]		= alsap_open,
+	[OSSP_DSP_READ]		= alsap_read,
+	[OSSP_DSP_WRITE]	= alsap_write,
+	[OSSP_DSP_POLL]		= alsap_poll,
+#if 0
+	[OSSP_DSP_MMAP]		= alsap_mmap,
+	[OSSP_DSP_MUNMAP]	= alsap_munmap,
+#endif
+	[OSSP_DSP_RESET]	= alsap_flush,
+	[OSSP_DSP_SYNC]		= alsap_flush,
+	[OSSP_DSP_POST]		= alsap_post,
+	[OSSP_DSP_GET_RATE]	= alsap_get_param,
+	[OSSP_DSP_GET_CHANNELS]	= alsap_get_param,
+	[OSSP_DSP_GET_FORMAT]	= alsap_get_param,
+	[OSSP_DSP_GET_BLKSIZE]	= alsap_get_param,
+	[OSSP_DSP_GET_FORMATS]	= alsap_get_param,
+	[OSSP_DSP_SET_RATE]	= alsap_set_param,
+	[OSSP_DSP_SET_CHANNELS]	= alsap_set_param,
+	[OSSP_DSP_SET_FORMAT]	= alsap_set_param,
+	[OSSP_DSP_SET_SUBDIVISION] = alsap_set_param,
+	[OSSP_DSP_SET_FRAGMENT]	= alsap_set_param,
+	[OSSP_DSP_GET_TRIGGER]	= alsap_get_param,
+	[OSSP_DSP_SET_TRIGGER]	= alsap_set_trigger,
+	[OSSP_DSP_GET_OSPACE]	= alsap_get_space,
+	[OSSP_DSP_GET_ISPACE]	= alsap_get_space,
+	[OSSP_DSP_GET_OPTR]	= alsap_get_ptr,
+	[OSSP_DSP_GET_IPTR]	= alsap_get_ptr,
+	[OSSP_DSP_GET_ODELAY]	= alsap_get_odelay,
+};
+
+static int action_pre(void)
+{
+	return 0;
+}
+
+static void action_post(void)
+{
+}
+
+int main(int argc, char **argv)
+{
+	int rc;
+
+	ossp_slave_init(argc, argv);
+
+	page_size = sysconf(_SC_PAGE_SIZE);
+
+	/* Okay, now we're open for business */
+	rc = 0;
+	do {
+		rc = ossp_slave_process_command(ossp_cmd_fd, action_fn_tbl,
+						action_pre, action_post);
+	} while (rc > 0);
+
+	return rc ? 1 : 0;
+}
diff --git a/src/mod/endpoints/mod_skypopen/osscuse/ossp-slave.c b/src/mod/endpoints/mod_skypopen/osscuse/ossp-slave.c
new file mode 100644
index 0000000000..4c5cb2d129
--- /dev/null
+++ b/src/mod/endpoints/mod_skypopen/osscuse/ossp-slave.c
@@ -0,0 +1,250 @@
+/*
+ * ossp-slave - OSS Proxy: Common codes for slaves
+ *
+ * Copyright (C) 2008-2010  SUSE Linux Products GmbH
+ * Copyright (C) 2008-2010  Tejun Heo <tj@kernel.org>
+ *
+ * This file is released under the GPLv2.
+ */
+
+#define _GNU_SOURCE
+
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <pwd.h>
+#include <signal.h>
+
+#include "ossp-slave.h"
+
+static const char *usage =
+"usage: ossp-SLAVE [options]\n"
+"\n"
+"proxies commands from osspd to pulseaudio\n"
+"\n"
+"options:\n"
+"    -u UID            uid to use\n"
+"    -g GID            gid to use\n"
+"    -c CMD_FD         fd to receive commands from osspd\n"
+"    -n NOTIFY_FD      fd to send async notifications to osspd\n"
+"    -m MMAP_FD        fd to use for mmap\n"
+"    -o MMAP_OFFSET    mmap offset\n"
+"    -s MMAP_SIZE      mmap size\n"
+"    -l LOG_LEVEL      set log level\n"
+"    -t                enable log timestamps\n";
+
+char ossp_user_name[OSSP_USER_NAME_LEN];
+int ossp_cmd_fd = -1, ossp_notify_fd = -1;
+void *ossp_mmap_addr[2];
+
+void ossp_slave_init(int argc, char **argv)
+{
+	int have_uid = 0, have_gid = 0;
+	uid_t uid;
+	gid_t gid;
+	int mmap_fd = -1;
+	off_t mmap_off = 0;
+	size_t mmap_size = 0;
+	int opt;
+	struct passwd *pw, pw_buf;
+	struct sigaction sa;
+	char pw_sbuf[sysconf(_SC_GETPW_R_SIZE_MAX)];
+
+	while ((opt = getopt(argc, argv, "u:g:c:n:m:o:s:l:t")) != -1) {
+		switch (opt) {
+		case 'u':
+			have_uid = 1;
+			uid = strtol(optarg, NULL, 0);
+			break;
+		case 'g':
+			have_gid = 1;
+			gid = strtol(optarg, NULL, 0);
+			break;
+		case 'c':
+			ossp_cmd_fd = strtol(optarg, NULL, 0);
+			break;
+		case 'n':
+			ossp_notify_fd = strtol(optarg, NULL, 0);
+			break;
+		case 'm':
+			mmap_fd = strtol(optarg, NULL, 0);
+			break;
+		case 'o':
+			mmap_off = strtoull(optarg, NULL, 0);
+			break;
+		case 's':
+			mmap_size = strtoul(optarg, NULL, 0);
+			break;
+		case 'l':
+			ossp_log_level = strtol(optarg, NULL, 0);
+			break;
+		case 't':
+			ossp_log_timestamp = 1;
+			break;
+		}
+	}
+
+	if (!have_uid || !have_gid || ossp_cmd_fd < 0 || ossp_notify_fd < 0) {
+		fprintf(stderr, usage);
+		_exit(1);
+	}
+
+	snprintf(ossp_user_name, sizeof(ossp_user_name), "uid%d", uid);
+	if (getpwuid_r(uid, &pw_buf, pw_sbuf, sizeof(pw_sbuf), &pw) == 0)
+		snprintf(ossp_user_name, sizeof(ossp_user_name), "%s",
+			 pw->pw_name);
+
+	snprintf(ossp_log_name, sizeof(ossp_log_name), "ossp-padsp[%s:%d]",
+		 ossp_user_name, getpid());
+
+	if (mmap_fd >= 0) {
+		void *p;
+
+		if (!mmap_off || !mmap_size) {
+			fprintf(stderr, usage);
+			_exit(1);
+		}
+
+		p = mmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_SHARED,
+			 mmap_fd, mmap_off);
+		if (p == MAP_FAILED)
+			fatal_e(-errno, "mmap failed");
+
+		ossp_mmap_addr[PLAY] = p;
+		ossp_mmap_addr[REC] = p + mmap_size / 2;
+		close(mmap_fd);
+	}
+
+	/* mmap done, drop privileges */
+	if (setresgid(gid, gid, gid) || setresuid(uid, uid, uid))
+		fatal_e(-errno, "failed to drop privileges");
+
+	/* block SIGPIPE */
+	memset(&sa, 0, sizeof(sa));
+	sa.sa_handler = SIG_IGN;
+	if (sigaction(SIGPIPE, &sa, NULL))
+		fatal_e(-errno, "failed to ignore SIGPIPE");
+}
+
+int ossp_slave_process_command(int cmd_fd,
+			       ossp_action_fn_t const *action_fn_tbl,
+			       int (*action_pre_fn)(void),
+			       void (*action_post_fn)(void))
+{
+	static struct sized_buf carg_sbuf = { }, rarg_sbuf = { };
+	static struct sized_buf din_sbuf = { }, dout_sbuf = { };
+	struct ossp_cmd cmd;
+	int fd = -1;
+	char cmsg_buf[CMSG_SPACE(sizeof(fd))];
+	struct iovec iov = { &cmd, sizeof(cmd) };
+	struct msghdr msg = { .msg_iov = &iov, .msg_iovlen = 1,
+			      .msg_control = cmsg_buf,
+			      .msg_controllen = sizeof(cmsg_buf) };
+	struct cmsghdr *cmsg;
+	size_t carg_size, din_size, rarg_size, dout_size;
+	char *carg = NULL, *din = NULL, *rarg = NULL, *dout = NULL;
+	struct ossp_reply reply = { .magic = OSSP_REPLY_MAGIC };
+	ssize_t ret;
+
+	ret = recvmsg(cmd_fd, &msg, 0);
+	if (ret == 0)
+		return 0;
+	if (ret < 0) {
+		ret = -errno;
+		err_e(ret, "failed to read command channel");
+		return ret;
+	}
+
+	if (ret != sizeof(cmd)) {
+		err("command struct size mismatch (%zu, should be %zu)",
+		    ret, sizeof(cmd));
+		return -EINVAL;
+	}
+
+	if (cmd.magic != OSSP_CMD_MAGIC) {
+		err("illegal command magic 0x%x", cmd.magic);
+		return -EINVAL;
+	}
+
+	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg;
+	     cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+		if (cmsg->cmsg_level == SOL_SOCKET &&
+		    cmsg->cmsg_type == SCM_RIGHTS)
+			fd = *(int *)CMSG_DATA(cmsg);
+		else {
+			err("unknown cmsg %d:%d received (opcode %d)",
+			    cmsg->cmsg_level, cmsg->cmsg_type, cmd.opcode);
+			return -EINVAL;
+		}
+	}
+
+	if (cmd.opcode >= OSSP_NR_OPCODES) {
+		err("unknown opcode %d", cmd.opcode);
+		return -EINVAL;
+	}
+
+	carg_size = ossp_arg_sizes[cmd.opcode].carg_size;
+	din_size = cmd.din_size;
+	rarg_size = ossp_arg_sizes[cmd.opcode].rarg_size;
+	dout_size = cmd.dout_size;
+
+	if ((fd >= 0) != ossp_arg_sizes[cmd.opcode].has_fd) {
+		err("fd=%d unexpected for opcode %d", fd, cmd.opcode);
+		return -EINVAL;
+	}
+
+	if (ensure_sbuf_size(&carg_sbuf, carg_size) ||
+	    ensure_sbuf_size(&din_sbuf, din_size) ||
+	    ensure_sbuf_size(&rarg_sbuf, rarg_size) ||
+	    ensure_sbuf_size(&dout_sbuf, dout_size)) {
+		err("failed to allocate command buffers");
+		return -ENOMEM;
+	}
+
+	if (carg_size) {
+		carg = carg_sbuf.buf;
+		ret = read_fill(cmd_fd, carg, carg_size);
+		if (ret < 0)
+			return ret;
+	}
+	if (din_size) {
+		din = din_sbuf.buf;
+		ret = read_fill(cmd_fd, din, din_size);
+		if (ret < 0)
+			return ret;
+	}
+	if (rarg_size)
+		rarg = rarg_sbuf.buf;
+	if (dout_size)
+		dout = dout_sbuf.buf;
+
+	ret = -EINVAL;
+	if (action_fn_tbl[cmd.opcode]) {
+		ret = action_pre_fn();
+		if (ret == 0) {
+			ret = action_fn_tbl[cmd.opcode](cmd.opcode, carg,
+							din, din_size, rarg,
+							dout, &dout_size, fd);
+			action_post_fn();
+		}
+	}
+
+	reply.result = ret;
+	if (ret >= 0)
+		reply.dout_size = dout_size;
+	else {
+		rarg_size = 0;
+		dout_size = 0;
+	}
+
+	if (write_fill(cmd_fd, &reply, sizeof(reply)) < 0 ||
+	    write_fill(cmd_fd, rarg, rarg_size) < 0 ||
+	    write_fill(cmd_fd, dout, dout_size) < 0)
+		return -EIO;
+
+	return 1;
+}
diff --git a/src/mod/endpoints/mod_skypopen/osscuse/ossp-slave.h b/src/mod/endpoints/mod_skypopen/osscuse/ossp-slave.h
new file mode 100644
index 0000000000..10c22cdb02
--- /dev/null
+++ b/src/mod/endpoints/mod_skypopen/osscuse/ossp-slave.h
@@ -0,0 +1,28 @@
+/*
+ * ossp-slave - OSS Proxy: Common codes for slaves
+ *
+ * Copyright (C) 2008-2010  SUSE Linux Products GmbH
+ * Copyright (C) 2008-2010  Tejun Heo <tj@kernel.org>
+ *
+ * This file is released under the GPLv2.
+ */
+
+#ifndef _OSSP_SLAVE_H
+#define _OSSP_SLAVE_H
+
+#include "ossp.h"
+#include "ossp-util.h"
+
+#define OSSP_USER_NAME_LEN	128
+
+extern char ossp_user_name[OSSP_USER_NAME_LEN];
+extern int ossp_cmd_fd, ossp_notify_fd;
+extern void *ossp_mmap_addr[2];
+
+void ossp_slave_init(int argc, char **argv);
+int ossp_slave_process_command(int cmd_fd,
+			       ossp_action_fn_t const *action_fn_tbl,
+			       int (*action_pre_fn)(void),
+			       void (*action_post_fn)(void));
+
+#endif /* _OSSP_SLAVE_H */
diff --git a/src/mod/endpoints/mod_skypopen/osscuse/ossp-util.c b/src/mod/endpoints/mod_skypopen/osscuse/ossp-util.c
new file mode 100644
index 0000000000..325cefd5fd
--- /dev/null
+++ b/src/mod/endpoints/mod_skypopen/osscuse/ossp-util.c
@@ -0,0 +1,369 @@
+/*
+ * ossp-util - OSS Proxy: Common utilities
+ *
+ * Copyright (C) 2008-2010  SUSE Linux Products GmbH
+ * Copyright (C) 2008-2010  Tejun Heo <tj@kernel.org>
+ *
+ * This file is released under the GPLv2.
+ */
+
+#include <ctype.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <syslog.h>
+#include <unistd.h>
+#include "ossp-util.h"
+
+#define BIT(nr)			(1UL << (nr))
+#define BIT_MASK(nr)		(1UL << ((nr) % BITS_PER_LONG))
+#define BIT_WORD(nr)		((nr) / BITS_PER_LONG)
+#define BITS_TO_LONGS(nr)	DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))
+#define BITOP_WORD(nr)		((nr) / BITS_PER_LONG)
+
+char ossp_log_name[OSSP_LOG_NAME_LEN];
+int ossp_log_level = OSSP_LOG_DFL;
+int ossp_log_timestamp;
+
+static const char *severity_strs[] = {
+	[OSSP_LOG_CRIT]		= "CRIT",
+	[OSSP_LOG_ERR]		= " ERR",
+	[OSSP_LOG_WARN]		= "WARN",
+	[OSSP_LOG_INFO]		= NULL,
+	[OSSP_LOG_DBG0]		= "DBG0",
+	[OSSP_LOG_DBG1]		= "DBG1",
+};
+
+static int severity_map[] = {
+	[OSSP_LOG_CRIT]		= LOG_ERR,
+	[OSSP_LOG_ERR]		= LOG_ERR,
+	[OSSP_LOG_WARN]		= LOG_WARNING,
+	[OSSP_LOG_INFO]		= LOG_INFO,
+	[OSSP_LOG_DBG0]		= LOG_DEBUG,
+	[OSSP_LOG_DBG1]		= LOG_DEBUG,
+};
+
+void log_msg(int severity, const char *fmt, ...)
+{
+	static int syslog_opened = 0;
+	char buf[1024];
+	size_t len = sizeof(buf), off = 0;
+	va_list ap;
+
+	if (severity > abs(ossp_log_level))
+		return;
+
+	if (ossp_log_level < 0 && !syslog_opened)
+		openlog(ossp_log_name, 0, LOG_DAEMON);
+
+	assert(severity >= 0 && severity < ARRAY_SIZE(severity_strs));
+
+	if (ossp_log_timestamp) {
+		static uint64_t start;
+		uint64_t now;
+		struct timeval tv;
+		gettimeofday(&tv, NULL);
+		now = tv.tv_sec * 1000 + tv.tv_usec / 1000;
+		if (!start)
+			start = now;
+
+		off += snprintf(buf + off, len - off, "<%08"PRIu64"> ",
+				now - start);
+	}
+
+	if (ossp_log_level > 0) {
+		char sev_buf[16] = "";
+		if (severity_strs[severity])
+			snprintf(sev_buf, sizeof(sev_buf), " %s",
+				 severity_strs[severity]);
+		off += snprintf(buf + off, len - off, "%s%s: ",
+				ossp_log_name, sev_buf);
+	} else if (severity_strs[severity])
+		off += snprintf(buf + off, len - off, "%s ",
+				severity_strs[severity]);
+
+	va_start(ap, fmt);
+	off += vsnprintf(buf + off, len - off, fmt, ap);
+	va_end(ap);
+
+	off += snprintf(buf + off, len - off, "\n");
+
+	if (ossp_log_level > 0)
+		fputs(buf, stderr);
+	else
+		syslog(severity_map[severity], "%s", buf);
+}
+
+int read_fill(int fd, void *buf, size_t size)
+{
+	while (size) {
+		ssize_t ret;
+		int rc;
+
+		ret = read(fd, buf, size);
+		if (ret <= 0) {
+			if (ret == 0)
+				rc = -EIO;
+			else
+				rc = -errno;
+			err_e(rc, "failed to read_fill %zu bytes from fd %d",
+			      size, fd);
+			return rc;
+		}
+		buf += ret;
+		size -= ret;
+	}
+	return 0;
+}
+
+int write_fill(int fd, const void *buf, size_t size)
+{
+	while (size) {
+		ssize_t ret;
+		int rc;
+
+		ret = write(fd, buf, size);
+		if (ret <= 0) {
+			if (ret == 0)
+				rc = -EIO;
+			else
+				rc = -errno;
+			err_e(rc, "failed to write_fill %zu bytes to fd %d",
+			      size, fd);
+			return rc;
+		}
+		buf += ret;
+		size -= ret;
+	}
+	return 0;
+}
+
+void ring_fill(struct ring_buf *ring, const void *buf, size_t size)
+{
+	size_t tail;
+
+	assert(ring_space(ring) >= size);
+
+	tail = (ring->head + ring->size - ring->bytes) % ring->size;
+
+	if (ring->head >= tail) {
+		size_t todo = min(size, ring->size - ring->head);
+
+		memcpy(ring->buf + ring->head, buf, todo);
+		ring->head = (ring->head + todo) % ring->size;
+		ring->bytes += todo;
+		buf += todo;
+		size -= todo;
+	}
+
+	assert(ring->size - ring->head >= size);
+	memcpy(ring->buf + ring->head, buf, size);
+	ring->head += size;
+	ring->bytes += size;
+}
+
+void *ring_data(struct ring_buf *ring, size_t *sizep)
+{
+	size_t tail;
+
+	if (!ring->bytes)
+		return NULL;
+
+	tail = (ring->head + ring->size - ring->bytes) % ring->size;
+
+	*sizep = min(ring->bytes, ring->size - tail);
+	return ring->buf + tail;
+}
+
+int ring_resize(struct ring_buf *ring, size_t new_size)
+{
+	struct ring_buf new_ring = { .size = new_size };
+	void *p;
+	size_t size;
+
+	if (ring_bytes(ring) > new_size)
+		return -ENOSPC;
+
+	new_ring.buf = calloc(1, new_size);
+	if (new_size && !new_ring.buf)
+		return -ENOMEM;
+
+	while ((p = ring_data(ring, &size))) {
+		ring_fill(&new_ring, p, size);
+		ring_consume(ring, size);
+	}
+
+	free(ring->buf);
+	*ring = new_ring;
+	return 0;
+}
+
+int ensure_sbuf_size(struct sized_buf *sbuf, size_t size)
+{
+	char *new_buf;
+
+	if (sbuf->size >= size)
+		return 0;
+
+	new_buf = realloc(sbuf->buf, size);
+	if (size && !new_buf)
+		return -ENOMEM;
+
+	sbuf->buf = new_buf;
+	sbuf->size = size;
+	return 0;
+}
+
+static unsigned long __ffs(unsigned long word)
+{
+	int num = 0;
+
+	if (BITS_PER_LONG == 64) {
+		if ((word & 0xffffffff) == 0) {
+			num += 32;
+			word >>= 32;
+		}
+	}
+
+	if ((word & 0xffff) == 0) {
+		num += 16;
+		word >>= 16;
+	}
+	if ((word & 0xff) == 0) {
+		num += 8;
+		word >>= 8;
+	}
+	if ((word & 0xf) == 0) {
+		num += 4;
+		word >>= 4;
+	}
+	if ((word & 0x3) == 0) {
+		num += 2;
+		word >>= 2;
+	}
+	if ((word & 0x1) == 0)
+		num += 1;
+	return num;
+}
+
+#define ffz(x)  __ffs(~(x))
+
+unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size,
+				 unsigned long offset)
+{
+	const unsigned long *p = addr + BITOP_WORD(offset);
+	unsigned long result = offset & ~(BITS_PER_LONG-1);
+	unsigned long tmp;
+
+	if (offset >= size)
+		return size;
+	size -= result;
+	offset %= BITS_PER_LONG;
+	if (offset) {
+		tmp = *(p++);
+		tmp |= ~0UL >> (BITS_PER_LONG - offset);
+		if (size < BITS_PER_LONG)
+			goto found_first;
+		if (~tmp)
+			goto found_middle;
+		size -= BITS_PER_LONG;
+		result += BITS_PER_LONG;
+	}
+	while (size & ~(BITS_PER_LONG-1)) {
+		if (~(tmp = *(p++)))
+			goto found_middle;
+		result += BITS_PER_LONG;
+		size -= BITS_PER_LONG;
+	}
+	if (!size)
+		return result;
+	tmp = *p;
+
+found_first:
+	tmp |= ~0UL << size;
+	if (tmp == ~0UL)	/* Are any bits zero? */
+		return result + size;	/* Nope. */
+found_middle:
+	return result + ffz(tmp);
+}
+
+void __set_bit(int nr, volatile unsigned long *addr)
+{
+	unsigned long mask = BIT_MASK(nr);
+	unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);
+
+	*p  |= mask;
+}
+
+void __clear_bit(int nr, volatile unsigned long *addr)
+{
+	unsigned long mask = BIT_MASK(nr);
+	unsigned long *p = ((unsigned long *)addr) + BIT_WORD(nr);
+
+	*p &= ~mask;
+}
+
+int get_proc_self_info(pid_t pid, pid_t *ppid_r,
+		       char *cmd_buf, size_t cmd_buf_sz)
+
+{
+	char path[64], buf[4096];
+	int fd = -1;
+	char *cmd_start, *cmd_end, *ppid_start, *end;
+	ssize_t ret;
+	pid_t ppid;
+	int i, rc;
+
+	snprintf(path, sizeof(path), "/proc/%ld/stat", (long)pid);
+	fd = open(path, O_RDONLY);
+	if (fd < 0) {
+		rc = -errno;
+		goto out;
+	}
+
+	ret = read(fd, buf, sizeof(buf));
+	if (ret < 0)
+		goto out;
+	if (ret == sizeof(buf)) {
+		rc = -EOVERFLOW;
+		goto out;
+	}
+	buf[ret] = '\0';
+
+	rc = -EINVAL;
+	cmd_start = strchr(buf, '(');
+	cmd_end = strrchr(buf, ')');
+	if (!cmd_start || !cmd_end)
+		goto out;
+	cmd_start++;
+
+	ppid_start = cmd_end;
+	for (i = 0; i < 3; i++) {
+		ppid_start = strchr(ppid_start, ' ');
+		if (!ppid_start)
+			goto out;
+		ppid_start++;
+	}
+
+	ppid = strtoul(ppid_start, &end, 10);
+	if (end == ppid_start || *end != ' ')
+		goto out;
+
+	if (ppid_r)
+		*ppid_r = ppid;
+	if (cmd_buf) {
+		size_t len = min_t(size_t, cmd_end - cmd_start, cmd_buf_sz - 1);
+		memcpy(cmd_buf, cmd_start, len);
+		cmd_buf[len] = '\0';
+	}
+
+	rc = 0;
+ out:
+	close(fd);
+
+	return rc;
+}
diff --git a/src/mod/endpoints/mod_skypopen/osscuse/ossp-util.h b/src/mod/endpoints/mod_skypopen/osscuse/ossp-util.h
new file mode 100644
index 0000000000..f48d02257a
--- /dev/null
+++ b/src/mod/endpoints/mod_skypopen/osscuse/ossp-util.h
@@ -0,0 +1,609 @@
+/*
+ * ossp-util - OSS Proxy: Common utilities
+ *
+ * Copyright (C) 2008-2010  SUSE Linux Products GmbH
+ * Copyright (C) 2008-2010  Tejun Heo <tj@kernel.org>
+ *
+ * This file is released under the GPLv2.
+ */
+
+#ifndef _OSSP_UTIL_H
+#define _OSSP_UTIL_H
+
+#include <assert.h>
+#include <stddef.h>
+#include <string.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <unistd.h>
+#include "ossp.h"
+
+#define OSSP_LOG_NAME_LEN	128
+
+enum {
+	OSSP_LOG_CRIT	= 1,
+	OSSP_LOG_ERR,
+	OSSP_LOG_WARN,
+	OSSP_LOG_INFO,
+	OSSP_LOG_DFL	= OSSP_LOG_INFO, /* default log level */
+	OSSP_LOG_DBG0,
+	OSSP_LOG_DBG1,
+	OSSP_LOG_MAX	= OSSP_LOG_DBG1,
+};
+
+extern char ossp_log_name[OSSP_LOG_NAME_LEN];
+extern int ossp_log_level;
+extern int ossp_log_timestamp;
+
+#define BITS_PER_BYTE		8
+#define BITS_PER_LONG		(BITS_PER_BYTE * sizeof(long))
+#define DIV_ROUND_UP(n,d)	(((n) + (d) - 1) / (d))
+#define BITS_TO_LONGS(nr)	DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))
+
+/* ARRAY_SIZE and min/max macros stolen from linux/kernel.h */
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+
+#define min(x, y) ({				\
+	typeof(x) _min1 = (x);			\
+	typeof(y) _min2 = (y);			\
+	(void) (&_min1 == &_min2);		\
+	_min1 < _min2 ? _min1 : _min2; })
+
+#define max(x, y) ({				\
+	typeof(x) _max1 = (x);			\
+	typeof(y) _max2 = (y);			\
+	(void) (&_max1 == &_max2);		\
+	_max1 > _max2 ? _max1 : _max2; })
+
+#define min_t(type, x, y) ({			\
+	type __min1 = (x);			\
+	type __min2 = (y);			\
+	__min1 < __min2 ? __min1: __min2; })
+
+#define max_t(type, x, y) ({			\
+	type __max1 = (x);			\
+	type __max2 = (y);			\
+	__max1 > __max2 ? __max1: __max2; })
+
+void log_msg(int severity, const char *fmt, ...)
+	__attribute__ ((format (printf, 2, 3)));
+
+#define fatal(fmt, args...) do {					\
+	log_msg(OSSP_LOG_CRIT, fmt , ##args);				\
+	_exit(1);							\
+} while (0)
+#define err(fmt, args...)		log_msg(OSSP_LOG_ERR, fmt , ##args)
+#define warn(fmt, args...)		log_msg(OSSP_LOG_WARN, fmt , ##args)
+#define info(fmt, args...)		log_msg(OSSP_LOG_INFO, fmt , ##args)
+#define dbg0(fmt, args...)		log_msg(OSSP_LOG_DBG0, fmt , ##args)
+#define dbg1(fmt, args...)		log_msg(OSSP_LOG_DBG1, fmt , ##args)
+
+#define fatal_e(e, fmt, args...)	\
+	fatal(fmt" (%s)" , ##args, strerror(-(e)))
+#define err_e(e, fmt, args...)	\
+	err(fmt" (%s)" , ##args, strerror(-(e)))
+#define warn_e(e, fmt, args...)	\
+	warn(fmt" (%s)" , ##args, strerror(-(e)))
+#define info_e(e, fmt, args...)	\
+	info(fmt" (%s)" , ##args, strerror(-(e)))
+#define dbg0_e(e, fmt, args...)	\
+	dbg0(fmt" (%s)" , ##args, strerror(-(e)))
+#define dbg1_e(e, fmt, args...)	\
+	dbg1(fmt" (%s)" , ##args, strerror(-(e)))
+
+struct ring_buf {
+	char		*buf;
+	size_t		size;
+	size_t		head;
+	size_t		bytes;
+};
+
+static inline size_t ring_size(struct ring_buf *ring)
+{
+	return ring->size;
+}
+
+static inline size_t ring_bytes(struct ring_buf *ring)
+{
+	return ring->bytes;
+}
+
+static inline size_t ring_space(struct ring_buf *ring)
+{
+	return ring->size - ring->bytes;
+}
+
+static inline void ring_consume(struct ring_buf *ring, size_t size)
+{
+	assert(ring->bytes >= size);
+	ring->bytes -= size;
+}
+
+static inline void ring_manual_init(struct ring_buf *ring, void *buf,
+				    size_t size, size_t head, size_t bytes)
+{
+	ring->buf = buf;
+	ring->size = size;
+	ring->head = head;
+	ring->bytes = bytes;
+}
+
+void ring_fill(struct ring_buf *ring, const void *buf, size_t size);
+void *ring_data(struct ring_buf *ring, size_t *sizep);
+int ring_resize(struct ring_buf *ring, size_t new_size);
+
+struct sized_buf {
+	char		*buf;
+	size_t		size;
+};
+
+int ensure_sbuf_size(struct sized_buf *sbuf, size_t size);
+
+int read_fill(int fd, void *buf, size_t size);
+int write_fill(int fd, const void *buf, size_t size);
+
+/*
+ * Bitops lifted from linux asm-generic implementation.
+ */
+unsigned long find_next_zero_bit(const unsigned long *addr, unsigned
+				 long size, unsigned long offset);
+#define find_first_zero_bit(addr, size) find_next_zero_bit((addr), (size), 0)
+extern void __set_bit(int nr, volatile unsigned long *addr);
+extern void __clear_bit(int nr, volatile unsigned long *addr);
+
+typedef ssize_t (*ossp_action_fn_t)(enum ossp_opcode opcode,
+				    void *carg, void *din, size_t din_sz,
+				    void *rarg, void *dout, size_t *dout_szp,
+				    int fd);
+
+int get_proc_self_info(pid_t tid, pid_t *pgrp,
+		       char *cmd_buf, size_t cmd_buf_sz);
+
+/*
+ * Doubly linked list handling code shamelessly stolen from the Linux
+ * kernel 2.6.26 include/linux/list.h.
+ */
+
+/**
+ * container_of - cast a member of a structure out to the containing structure
+ * @ptr:	the pointer to the member.
+ * @type:	the type of the container struct this is embedded in.
+ * @member:	the name of the member within the struct.
+ *
+ */
+#define container_of(ptr, type, member) ({			\
+	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
+	(type *)( (char *)__mptr - offsetof(type,member) );})
+
+#define LIST_POISON1  ((void *) 0x00100100)
+#define LIST_POISON2  ((void *) 0x00200200)
+
+/*
+ * Simple doubly linked list implementation.
+ *
+ * Some of the internal functions ("__xxx") are useful when
+ * manipulating whole lists rather than single entries, as
+ * sometimes we already know the next/prev entries and we can
+ * generate better code by using them directly rather than
+ * using the generic single-entry routines.
+ */
+
+struct list_head {
+	struct list_head *next, *prev;
+};
+
+#define LIST_HEAD_INIT(name) { &(name), &(name) }
+
+#define LIST_HEAD(name) \
+	struct list_head name = LIST_HEAD_INIT(name)
+
+static inline void INIT_LIST_HEAD(struct list_head *list)
+{
+	list->next = list;
+	list->prev = list;
+}
+
+/*
+ * Insert a new entry between two known consecutive entries.
+ *
+ * This is only for internal list manipulation where we know
+ * the prev/next entries already!
+ */
+static inline void __list_add(struct list_head *new,
+			      struct list_head *prev,
+			      struct list_head *next)
+{
+	next->prev = new;
+	new->next = next;
+	new->prev = prev;
+	prev->next = new;
+}
+
+/**
+ * list_add - add a new entry
+ * @new: new entry to be added
+ * @head: list head to add it after
+ *
+ * Insert a new entry after the specified head.
+ * This is good for implementing stacks.
+ */
+static inline void list_add(struct list_head *new, struct list_head *head)
+{
+	__list_add(new, head, head->next);
+}
+
+/**
+ * list_add_tail - add a new entry
+ * @new: new entry to be added
+ * @head: list head to add it before
+ *
+ * Insert a new entry before the specified head.
+ * This is useful for implementing queues.
+ */
+static inline void list_add_tail(struct list_head *new, struct list_head *head)
+{
+	__list_add(new, head->prev, head);
+}
+
+/*
+ * Delete a list entry by making the prev/next entries
+ * point to each other.
+ *
+ * This is only for internal list manipulation where we know
+ * the prev/next entries already!
+ */
+static inline void __list_del(struct list_head * prev, struct list_head * next)
+{
+	next->prev = prev;
+	prev->next = next;
+}
+
+/**
+ * list_del - deletes entry from list.
+ * @entry: the element to delete from the list.
+ * Note: list_empty() on entry does not return true after this, the entry is
+ * in an undefined state.
+ */
+static inline void list_del(struct list_head *entry)
+{
+	__list_del(entry->prev, entry->next);
+	entry->next = LIST_POISON1;
+	entry->prev = LIST_POISON2;
+}
+
+/**
+ * list_replace - replace old entry by new one
+ * @old : the element to be replaced
+ * @new : the new element to insert
+ *
+ * If @old was empty, it will be overwritten.
+ */
+static inline void list_replace(struct list_head *old,
+				struct list_head *new)
+{
+	new->next = old->next;
+	new->next->prev = new;
+	new->prev = old->prev;
+	new->prev->next = new;
+}
+
+static inline void list_replace_init(struct list_head *old,
+					struct list_head *new)
+{
+	list_replace(old, new);
+	INIT_LIST_HEAD(old);
+}
+
+/**
+ * list_del_init - deletes entry from list and reinitialize it.
+ * @entry: the element to delete from the list.
+ */
+static inline void list_del_init(struct list_head *entry)
+{
+	__list_del(entry->prev, entry->next);
+	INIT_LIST_HEAD(entry);
+}
+
+/**
+ * list_move - delete from one list and add as another's head
+ * @list: the entry to move
+ * @head: the head that will precede our entry
+ */
+static inline void list_move(struct list_head *list, struct list_head *head)
+{
+	__list_del(list->prev, list->next);
+	list_add(list, head);
+}
+
+/**
+ * list_move_tail - delete from one list and add as another's tail
+ * @list: the entry to move
+ * @head: the head that will follow our entry
+ */
+static inline void list_move_tail(struct list_head *list,
+				  struct list_head *head)
+{
+	__list_del(list->prev, list->next);
+	list_add_tail(list, head);
+}
+
+/**
+ * list_is_last - tests whether @list is the last entry in list @head
+ * @list: the entry to test
+ * @head: the head of the list
+ */
+static inline int list_is_last(const struct list_head *list,
+				const struct list_head *head)
+{
+	return list->next == head;
+}
+
+/**
+ * list_empty - tests whether a list is empty
+ * @head: the list to test.
+ */
+static inline int list_empty(const struct list_head *head)
+{
+	return head->next == head;
+}
+
+/**
+ * list_empty_careful - tests whether a list is empty and not being modified
+ * @head: the list to test
+ *
+ * Description:
+ * tests whether a list is empty _and_ checks that no other CPU might be
+ * in the process of modifying either member (next or prev)
+ *
+ * NOTE: using list_empty_careful() without synchronization
+ * can only be safe if the only activity that can happen
+ * to the list entry is list_del_init(). Eg. it cannot be used
+ * if another CPU could re-list_add() it.
+ */
+static inline int list_empty_careful(const struct list_head *head)
+{
+	struct list_head *next = head->next;
+	return (next == head) && (next == head->prev);
+}
+
+/**
+ * list_is_singular - tests whether a list has just one entry.
+ * @head: the list to test.
+ */
+static inline int list_is_singular(const struct list_head *head)
+{
+	return !list_empty(head) && (head->next == head->prev);
+}
+
+static inline void __list_splice(const struct list_head *list,
+				 struct list_head *head)
+{
+	struct list_head *first = list->next;
+	struct list_head *last = list->prev;
+	struct list_head *at = head->next;
+
+	first->prev = head;
+	head->next = first;
+
+	last->next = at;
+	at->prev = last;
+}
+
+/**
+ * list_splice - join two lists
+ * @list: the new list to add.
+ * @head: the place to add it in the first list.
+ */
+static inline void list_splice(const struct list_head *list,
+				struct list_head *head)
+{
+	if (!list_empty(list))
+		__list_splice(list, head);
+}
+
+/**
+ * list_splice_init - join two lists and reinitialise the emptied list.
+ * @list: the new list to add.
+ * @head: the place to add it in the first list.
+ *
+ * The list at @list is reinitialised
+ */
+static inline void list_splice_init(struct list_head *list,
+				    struct list_head *head)
+{
+	if (!list_empty(list)) {
+		__list_splice(list, head);
+		INIT_LIST_HEAD(list);
+	}
+}
+
+/**
+ * list_entry - get the struct for this entry
+ * @ptr:	the &struct list_head pointer.
+ * @type:	the type of the struct this is embedded in.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_entry(ptr, type, member) \
+	container_of(ptr, type, member)
+
+/**
+ * list_first_entry - get the first element from a list
+ * @ptr:	the list head to take the element from.
+ * @type:	the type of the struct this is embedded in.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Note, that list is expected to be not empty.
+ */
+#define list_first_entry(ptr, type, member) \
+	list_entry((ptr)->next, type, member)
+
+/**
+ * list_for_each	-	iterate over a list
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @head:	the head for your list.
+ */
+#define list_for_each(pos, head) \
+	for (pos = (head)->next; pos != (head); pos = pos->next)
+
+/**
+ * list_for_each_prev	-	iterate over a list backwards
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @head:	the head for your list.
+ */
+#define list_for_each_prev(pos, head) \
+	for (pos = (head)->prev; pos != (head); pos = pos->prev)
+
+/**
+ * list_for_each_safe - iterate over a list safe against removal of list entry
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @n:		another &struct list_head to use as temporary storage
+ * @head:	the head for your list.
+ */
+#define list_for_each_safe(pos, n, head) \
+	for (pos = (head)->next, n = pos->next; pos != (head); \
+		pos = n, n = pos->next)
+
+/**
+ * list_for_each_prev_safe - iterate over a list backwards safe against removal of list entry
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @n:		another &struct list_head to use as temporary storage
+ * @head:	the head for your list.
+ */
+#define list_for_each_prev_safe(pos, n, head) \
+	for (pos = (head)->prev, n = pos->prev; \
+	     pos != (head); pos = n, n = pos->prev)
+
+/**
+ * list_for_each_entry	-	iterate over list of given type
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_for_each_entry(pos, head, member)				\
+	for (pos = list_entry((head)->next, typeof(*pos), member);	\
+	     &pos->member != (head);				 	\
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
+
+/**
+ * list_for_each_entry_reverse - iterate backwards over list of given type.
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_for_each_entry_reverse(pos, head, member)			\
+	for (pos = list_entry((head)->prev, typeof(*pos), member);	\
+	     &pos->member != (head);					\
+	     pos = list_entry(pos->member.prev, typeof(*pos), member))
+
+/**
+ * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue()
+ * @pos:	the type * to use as a start point
+ * @head:	the head of the list
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Prepares a pos entry for use as a start point in list_for_each_entry_continue().
+ */
+#define list_prepare_entry(pos, head, member) \
+	((pos) ? : list_entry(head, typeof(*pos), member))
+
+/**
+ * list_for_each_entry_continue - continue iteration over list of given type
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Continue to iterate over list of given type, continuing after
+ * the current position.
+ */
+#define list_for_each_entry_continue(pos, head, member) 		\
+	for (pos = list_entry(pos->member.next, typeof(*pos), member);	\
+	     &pos->member != (head);					\
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
+
+/**
+ * list_for_each_entry_continue_reverse - iterate backwards from the given point
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Start to iterate over list of given type backwards, continuing after
+ * the current position.
+ */
+#define list_for_each_entry_continue_reverse(pos, head, member)		\
+	for (pos = list_entry(pos->member.prev, typeof(*pos), member);	\
+	     &pos->member != (head);					\
+	     pos = list_entry(pos->member.prev, typeof(*pos), member))
+
+/**
+ * list_for_each_entry_from - iterate over list of given type from the current point
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Iterate over list of given type, continuing from current position.
+ */
+#define list_for_each_entry_from(pos, head, member) 			\
+	for (; &pos->member != (head);					\
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
+
+/**
+ * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
+ * @pos:	the type * to use as a loop cursor.
+ * @n:		another type * to use as temporary storage
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_for_each_entry_safe(pos, n, head, member)			\
+	for (pos = list_entry((head)->next, typeof(*pos), member),	\
+		n = list_entry(pos->member.next, typeof(*pos), member);	\
+	     &pos->member != (head); 					\
+	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
+
+/**
+ * list_for_each_entry_safe_continue
+ * @pos:	the type * to use as a loop cursor.
+ * @n:		another type * to use as temporary storage
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Iterate over list of given type, continuing after current point,
+ * safe against removal of list entry.
+ */
+#define list_for_each_entry_safe_continue(pos, n, head, member) 		\
+	for (pos = list_entry(pos->member.next, typeof(*pos), member), 		\
+		n = list_entry(pos->member.next, typeof(*pos), member);		\
+	     &pos->member != (head);						\
+	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
+
+/**
+ * list_for_each_entry_safe_from
+ * @pos:	the type * to use as a loop cursor.
+ * @n:		another type * to use as temporary storage
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Iterate over list of given type from current point, safe against
+ * removal of list entry.
+ */
+#define list_for_each_entry_safe_from(pos, n, head, member) 			\
+	for (n = list_entry(pos->member.next, typeof(*pos), member);		\
+	     &pos->member != (head);						\
+	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
+
+/**
+ * list_for_each_entry_safe_reverse
+ * @pos:	the type * to use as a loop cursor.
+ * @n:		another type * to use as temporary storage
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Iterate backwards over list of given type, safe against removal
+ * of list entry.
+ */
+#define list_for_each_entry_safe_reverse(pos, n, head, member)		\
+	for (pos = list_entry((head)->prev, typeof(*pos), member),	\
+		n = list_entry(pos->member.prev, typeof(*pos), member);	\
+	     &pos->member != (head); 					\
+	     pos = n, n = list_entry(n->member.prev, typeof(*n), member))
+
+#endif /*_OSSP_UTIL_H*/
diff --git a/src/mod/endpoints/mod_skypopen/osscuse/ossp.c b/src/mod/endpoints/mod_skypopen/osscuse/ossp.c
new file mode 100644
index 0000000000..96f98fa37a
--- /dev/null
+++ b/src/mod/endpoints/mod_skypopen/osscuse/ossp.c
@@ -0,0 +1,83 @@
+/*
+ * ossp - OSS Proxy: emulate OSS device using CUSE
+ *
+ * Copyright (C) 2008-2010  SUSE Linux Products GmbH
+ * Copyright (C) 2008-2010  Tejun Heo <tj@kernel.org>
+ *
+ * This file is released under the GPLv2.
+ */
+
+#include "ossp.h"
+
+const struct ossp_arg_size ossp_arg_sizes[OSSP_NR_OPCODES] = {
+	[OSSP_MIXER]		= { sizeof(struct ossp_mixer_arg),
+				    sizeof(struct ossp_mixer_arg), 0 },
+
+	[OSSP_DSP_OPEN]		= { sizeof(struct ossp_dsp_open_arg), 0, 0 },
+	[OSSP_DSP_READ]		= { sizeof(struct ossp_dsp_rw_arg), 0, 0 },
+	[OSSP_DSP_WRITE]	= { sizeof(struct ossp_dsp_rw_arg), 0, 0 },
+	[OSSP_DSP_POLL]		= { sizeof(int), sizeof(unsigned), 0 },
+	[OSSP_DSP_MMAP]		= { sizeof(struct ossp_dsp_mmap_arg), 0, 0 },
+	[OSSP_DSP_MUNMAP]	= { sizeof(int), 0, 0 },
+
+	[OSSP_DSP_RESET]	= { 0, 0, 0 },
+	[OSSP_DSP_SYNC]		= { 0, 0, 0 },
+	[OSSP_DSP_POST]		= { 0, 0, 0 },
+	[OSSP_DSP_GET_RATE]	= { 0, sizeof(int), 0 },
+	[OSSP_DSP_GET_CHANNELS]	= { 0, sizeof(int), 0 },
+	[OSSP_DSP_GET_FORMAT]	= { 0, sizeof(int), 0 },
+	[OSSP_DSP_GET_BLKSIZE]	= { 0, sizeof(int), 0 },
+	[OSSP_DSP_GET_FORMATS]	= { 0, sizeof(int), 0 },
+	[OSSP_DSP_SET_RATE]	= { sizeof(int), sizeof(int), 0 },
+	[OSSP_DSP_SET_CHANNELS]	= { sizeof(int), sizeof(int), 0 },
+	[OSSP_DSP_SET_FORMAT]	= { sizeof(int), sizeof(int), 0 },
+	[OSSP_DSP_SET_SUBDIVISION] = { sizeof(int), sizeof(int), 0 },
+	[OSSP_DSP_SET_FRAGMENT]	= { sizeof(int), 0, 0 },
+	[OSSP_DSP_GET_TRIGGER]	= { 0, sizeof(int), 0 },
+	[OSSP_DSP_SET_TRIGGER]	= { sizeof(int), 0, 0 },
+	[OSSP_DSP_GET_OSPACE]	= { 0, sizeof(struct audio_buf_info), 0 },
+	[OSSP_DSP_GET_ISPACE]	= { 0, sizeof(struct audio_buf_info), 0 },
+	[OSSP_DSP_GET_OPTR]	= { 0, sizeof(struct count_info), 0 },
+	[OSSP_DSP_GET_IPTR]	= { 0, sizeof(struct count_info), 0 },
+	[OSSP_DSP_GET_ODELAY]	= { 0, sizeof(int), 0 },
+};
+
+const char *ossp_cmd_str[OSSP_NR_OPCODES] = {
+	[OSSP_MIXER]		= "MIXER",
+
+	[OSSP_DSP_OPEN]		= "OPEN",
+	[OSSP_DSP_READ]		= "READ",
+	[OSSP_DSP_WRITE]	= "WRITE",
+	[OSSP_DSP_POLL]		= "POLL",
+	[OSSP_DSP_MMAP]		= "MMAP",
+	[OSSP_DSP_MUNMAP]	= "MUNMAP",
+
+	[OSSP_DSP_RESET]	= "RESET",
+	[OSSP_DSP_SYNC]		= "SYNC",
+	[OSSP_DSP_POST]		= "POST",
+
+	[OSSP_DSP_GET_RATE]	= "GET_RATE",
+	[OSSP_DSP_GET_CHANNELS]	= "GET_CHANNELS",
+	[OSSP_DSP_GET_FORMAT]	= "GET_FORMAT",
+	[OSSP_DSP_GET_BLKSIZE]	= "GET_BLKSIZE",
+	[OSSP_DSP_GET_FORMATS]	= "GET_FORMATS",
+	[OSSP_DSP_SET_RATE]	= "SET_RATE",
+	[OSSP_DSP_SET_CHANNELS]	= "SET_CHANNELS",
+	[OSSP_DSP_SET_FORMAT]	= "SET_FORMAT",
+	[OSSP_DSP_SET_SUBDIVISION] = "SET_BUSDIVISION",
+
+	[OSSP_DSP_SET_FRAGMENT]	= "SET_FRAGMENT",
+	[OSSP_DSP_GET_TRIGGER]	= "GET_TRIGGER",
+	[OSSP_DSP_SET_TRIGGER]	= "SET_TRIGGER",
+	[OSSP_DSP_GET_OSPACE]	= "GET_OSPACE",
+	[OSSP_DSP_GET_ISPACE]	= "GET_ISPACE",
+	[OSSP_DSP_GET_OPTR]	= "GET_OPTR",
+	[OSSP_DSP_GET_IPTR]	= "GET_IPTR",
+	[OSSP_DSP_GET_ODELAY]	= "GET_ODELAY",
+};
+
+const char *ossp_notify_str[OSSP_NR_NOTIFY_OPCODES] = {
+	[OSSP_NOTIFY_POLL]	= "POLL",
+	[OSSP_NOTIFY_OBITUARY]	= "OBITUARY",
+	[OSSP_NOTIFY_VOLCHG]	= "VOLCHG",
+};
diff --git a/src/mod/endpoints/mod_skypopen/osscuse/ossp.h b/src/mod/endpoints/mod_skypopen/osscuse/ossp.h
new file mode 100644
index 0000000000..9d03e63adf
--- /dev/null
+++ b/src/mod/endpoints/mod_skypopen/osscuse/ossp.h
@@ -0,0 +1,117 @@
+/*
+ * ossp - OSS Proxy: emulate OSS device using CUSE
+ *
+ * Copyright (C) 2008-2010  SUSE Linux Products GmbH
+ * Copyright (C) 2008-2010  Tejun Heo <tj@kernel.org>
+ *
+ * This file is released under the GPLv2.
+ */
+
+#ifndef _OSSP_H
+#define _OSSP_H
+
+#include <sys/types.h>
+#include <inttypes.h>
+#include <sys/soundcard.h>
+
+#define OSSP_VERSION		"1.3.2"
+#define OSSP_CMD_MAGIC		0xdeadbeef
+#define OSSP_REPLY_MAGIC	0xbeefdead
+#define OSSP_NOTIFY_MAGIC	0xbebebebe
+
+#define PLAY			0
+#define REC			1
+#define LEFT			0
+#define RIGHT			1
+
+enum ossp_opcode {
+	OSSP_MIXER,
+
+	OSSP_DSP_OPEN,
+	OSSP_DSP_READ,
+	OSSP_DSP_WRITE,
+	OSSP_DSP_POLL,
+	OSSP_DSP_MMAP,
+	OSSP_DSP_MUNMAP,
+
+	OSSP_DSP_RESET,
+	OSSP_DSP_SYNC,
+	OSSP_DSP_POST,
+
+	OSSP_DSP_GET_RATE,
+	OSSP_DSP_GET_CHANNELS,
+	OSSP_DSP_GET_FORMAT,
+	OSSP_DSP_GET_BLKSIZE,
+	OSSP_DSP_GET_FORMATS,
+	OSSP_DSP_SET_RATE,
+	OSSP_DSP_SET_CHANNELS,
+	OSSP_DSP_SET_FORMAT,
+	OSSP_DSP_SET_SUBDIVISION,
+
+	OSSP_DSP_SET_FRAGMENT,
+	OSSP_DSP_GET_TRIGGER,
+	OSSP_DSP_SET_TRIGGER,
+	OSSP_DSP_GET_OSPACE,
+	OSSP_DSP_GET_ISPACE,
+	OSSP_DSP_GET_OPTR,
+	OSSP_DSP_GET_IPTR,
+	OSSP_DSP_GET_ODELAY,
+
+	OSSP_NR_OPCODES,
+};
+
+enum ossp_notify_opcode {
+	OSSP_NOTIFY_POLL,
+	OSSP_NOTIFY_OBITUARY,
+	OSSP_NOTIFY_VOLCHG,
+
+	OSSP_NR_NOTIFY_OPCODES,
+};
+
+struct ossp_mixer_arg {
+	int			vol[2][2];
+};
+
+struct ossp_dsp_open_arg {
+	int			flags;
+	pid_t			opener_pid;
+};
+
+struct ossp_dsp_rw_arg {
+	unsigned		nonblock:1;
+};
+
+struct ossp_dsp_mmap_arg {
+	int			dir;
+	size_t			size;
+};
+
+struct ossp_cmd {
+	unsigned		magic;
+	enum ossp_opcode	opcode;
+	size_t			din_size;
+	size_t			dout_size;
+};
+
+struct ossp_reply {
+	unsigned		magic;
+	int			result;
+	size_t			dout_size;	/* <= cmd.data_in_size */
+};
+
+struct ossp_notify {
+	unsigned		magic;
+	enum ossp_notify_opcode opcode;
+};
+
+struct ossp_arg_size {
+	ssize_t			carg_size;
+	ssize_t			rarg_size;
+	unsigned		has_fd:1;
+};
+
+extern const struct ossp_arg_size ossp_arg_sizes[OSSP_NR_OPCODES];
+extern const char *ossp_cmd_str[OSSP_NR_OPCODES];
+extern const char *ossp_notify_str[OSSP_NR_NOTIFY_OPCODES];
+
+#endif /* _OSSP_H */
diff --git a/src/mod/endpoints/mod_skypopen/osscuse/osspd.c b/src/mod/endpoints/mod_skypopen/osscuse/osspd.c
new file mode 100644
index 0000000000..dc9f36a09b
--- /dev/null
+++ b/src/mod/endpoints/mod_skypopen/osscuse/osspd.c
@@ -0,0 +1,2374 @@
+/*
+ * osspd - OSS Proxy Daemon: emulate OSS device using CUSE
+ *
+ * Copyright (C) 2008-2010  SUSE Linux Products GmbH
+ * Copyright (C) 2008-2010  Tejun Heo <tj@kernel.org>
+ *
+ * This file is released under the GPLv2.
+ */
+#undef GIOVANNI
+
+#define FUSE_USE_VERSION 28
+#define _GNU_SOURCE
+
+#include <assert.h>
+#include <cuse_lowlevel.h>
+#include <fcntl.h>
+#include <fuse_opt.h>
+#include <libgen.h>
+#include <limits.h>
+#include <pthread.h>
+#include <pwd.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/epoll.h>
+#include <sys/socket.h>
+#include <sys/soundcard.h>
+#include <sys/time.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#include "ossp.h"
+#include "ossp-util.h"
+
+/*
+ * MMAP support needs to be updated to the new fuse MMAP API.  Disable
+ * it for the time being.
+ */
+#warning mmap support disabled for now
+/* #define OSSP_MMAP */
+
+#define DFL_MIXER_NAME		"mixer"
+#define DFL_DSP_NAME		"dsp"
+#define DFL_ADSP_NAME		"adsp"
+#define STRFMT			"S[%u/%d]"
+#define STRID(os)		os->id, os->pid
+
+#define dbg1_os(os, fmt, args...)	dbg1(STRFMT" "fmt, STRID(os) , ##args)
+#define dbg0_os(os, fmt, args...)	dbg0(STRFMT" "fmt, STRID(os) , ##args)
+#define warn_os(os, fmt, args...)	warn(STRFMT" "fmt, STRID(os) , ##args)
+#define err_os(os, fmt, args...)	err(STRFMT" "fmt, STRID(os) , ##args)
+#define warn_ose(os, err, fmt, args...)	\
+	warn_e(err, STRFMT" "fmt, STRID(os) , ##args)
+#define err_ose(os, err, fmt, args...)	\
+	err_e(err, STRFMT" "fmt, STRID(os) , ##args)
+
+enum {
+	SNDRV_OSS_VERSION	= ((3<<16)|(8<<8)|(1<<4)|(0)),	/* 3.8.1a */
+	DFL_MIXER_MAJOR		= 14,
+	DFL_MIXER_MINOR		= 0,
+	DFL_DSP_MAJOR		= 14,
+	DFL_DSP_MINOR		= 3,
+	DFL_ADSP_MAJOR		= 14,
+	DFL_ADSP_MINOR		= 12,
+	DFL_MAX_STREAMS		= 128,
+	MIXER_PUT_DELAY		= 600,			/* 10 mins */
+	/* DSPS_MMAP_SIZE / 2 must be multiple of SHMLBA */
+	DSPS_MMAP_SIZE		= 2 * (512 << 10),	/* 512k for each dir */
+};
+
+struct ossp_uid_cnt {
+	struct list_head	link;
+	uid_t			uid;
+	unsigned		nr_os;
+};
+
+struct ossp_mixer {
+	pid_t			pgrp;
+	struct list_head	link;
+	struct list_head	delayed_put_link;
+	unsigned		refcnt;
+	/* the following two fields are protected by mixer_mutex */
+	int			vol[2][2];
+	int			modify_counter;
+	time_t			put_expires;
+};
+
+struct ossp_mixer_cmd {
+	struct ossp_mixer	*mixer;
+	struct ossp_mixer_arg	set;
+	int			out_dir;
+	int			rvol;
+};
+
+#define for_each_vol(i, j)						\
+	for (i = 0, j = 0; i < 2; j += i << 1, j++, i = j >> 1, j &= 1)
+
+struct ossp_stream {
+	unsigned		id;	/* stream ID */
+	struct list_head	link;
+	struct list_head	pgrp_link;
+	struct list_head	notify_link;
+	unsigned		refcnt;
+	pthread_mutex_t		cmd_mutex;
+	pthread_mutex_t		mmap_mutex;
+	struct fuse_pollhandle	*ph;
+
+	/* stream owner info */
+	pid_t			pid;
+	pid_t			pgrp;
+	uid_t			uid;
+	gid_t			gid;
+
+	/* slave info */
+	pid_t			slave_pid;
+	int			cmd_fd;
+	int			notify_tx;
+	int			notify_rx;
+
+	/* the following dead flag is set asynchronously, keep it separate. */
+	int			dead;
+
+	/* stream mixer state, protected by mixer_mutex */
+	int			mixer_pending;
+	int			vol[2][2];
+	int			vol_set[2][2];
+
+	off_t			mmap_off;
+	size_t			mmap_size;
+
+	struct ossp_uid_cnt	*ucnt;
+	struct fuse_session	*se;	/* associated fuse session */
+	struct ossp_mixer	*mixer;
+};
+
+struct ossp_dsp_stream {
+	struct ossp_stream	os;
+	unsigned		rw;
+	unsigned		mmapped;
+	int			nonblock;
+};
+
+#define os_to_dsps(_os)		container_of(_os, struct ossp_dsp_stream, os)
+
+static unsigned max_streams;
+static unsigned umax_streams;
+static unsigned hashtbl_size;
+static char dsp_slave_path[PATH_MAX];
+
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t mixer_mutex = PTHREAD_MUTEX_INITIALIZER;
+static unsigned long *os_id_bitmap;
+static unsigned nr_mixers;
+static struct list_head *mixer_tbl;	/* indexed by PGRP */
+static struct list_head *os_tbl;	/* indexed by ID */
+static struct list_head *os_pgrp_tbl;	/* indexed by PGRP */
+static struct list_head *os_notify_tbl;	/* indexed by notify fd */
+static LIST_HEAD(uid_cnt_list);
+static int notify_epfd;			/* epoll used to monitor notify fds */
+static pthread_t notify_poller_thread;
+static pthread_t slave_reaper_thread;
+static pthread_t mixer_delayed_put_thread;
+static pthread_t cuse_mixer_thread;
+static pthread_t cuse_adsp_thread;
+static pthread_cond_t notify_poller_kill_wait = PTHREAD_COND_INITIALIZER;
+static pthread_cond_t slave_reaper_wait = PTHREAD_COND_INITIALIZER;
+static LIST_HEAD(slave_corpse_list);
+static LIST_HEAD(mixer_delayed_put_head); /* delayed reference */
+static pthread_cond_t mixer_delayed_put_cond = PTHREAD_COND_INITIALIZER;
+
+static int init_wait_fd = -1;
+static int exit_on_idle;
+static struct fuse_session *mixer_se;
+static struct fuse_session *dsp_se;
+static struct fuse_session *adsp_se;
+
+static void put_os(struct ossp_stream *os);
+
+
+/***************************************************************************
+ * Accessors
+ */
+
+static struct list_head *mixer_tbl_head(pid_t pid)
+{
+	return &mixer_tbl[pid % hashtbl_size];
+}
+
+static struct list_head *os_tbl_head(uint64_t id)
+{
+	return &os_tbl[id % hashtbl_size];
+}
+
+static struct list_head *os_pgrp_tbl_head(pid_t pgrp)
+{
+	return &os_pgrp_tbl[pgrp % hashtbl_size];
+}
+
+static struct list_head *os_notify_tbl_head(int notify_rx)
+{
+	return &os_notify_tbl[notify_rx % hashtbl_size];
+}
+
+static struct ossp_mixer *find_mixer_locked(pid_t pgrp)
+{
+	struct ossp_mixer *mixer;
+
+	list_for_each_entry(mixer, mixer_tbl_head(pgrp), link)
+		if (mixer->pgrp == pgrp)
+			return mixer;
+	return NULL;
+}
+
+static struct ossp_mixer *find_mixer(pid_t pgrp)
+{
+	struct ossp_mixer *mixer;
+
+	pthread_mutex_lock(&mutex);
+	mixer = find_mixer_locked(pgrp);
+	pthread_mutex_unlock(&mutex);
+	return mixer;
+}
+
+static struct ossp_stream *find_os(unsigned id)
+{
+	struct ossp_stream *os, *found = NULL;
+
+	pthread_mutex_lock(&mutex);
+	list_for_each_entry(os, os_tbl_head(id), link)
+		if (os->id == id) {
+			found = os;
+			break;
+		}
+	pthread_mutex_unlock(&mutex);
+	return found;
+}
+
+static struct ossp_stream *find_os_by_notify_rx(int notify_rx)
+{
+	struct ossp_stream *os, *found = NULL;
+
+	pthread_mutex_lock(&mutex);
+	list_for_each_entry(os, os_notify_tbl_head(notify_rx), notify_link)
+		if (os->notify_rx == notify_rx) {
+			found = os;
+			break;
+		}
+	pthread_mutex_unlock(&mutex);
+	return found;
+}
+
+
+/***************************************************************************
+ * Command and ioctl helpers
+ */
+
+static ssize_t exec_cmd_intern(struct ossp_stream *os, enum ossp_opcode opcode,
+	const void *carg, size_t carg_size, const void *din, size_t din_size,
+	void *rarg, size_t rarg_size, void *dout, size_t *dout_sizep, int fd)
+{
+	size_t dout_size = dout_sizep ? *dout_sizep : 0;
+	struct ossp_cmd cmd = { .magic = OSSP_CMD_MAGIC, .opcode = opcode,
+				 .din_size = din_size,
+				 .dout_size = dout_size };
+	struct iovec iov = { &cmd, sizeof(cmd) };
+	struct msghdr msg = { .msg_iov = &iov, .msg_iovlen = 1 };
+	struct ossp_reply reply = { };
+	char cmsg_buf[CMSG_SPACE(sizeof(fd))];
+	char reason[512];
+	int rc;
+
+	if (os->dead)
+		return -EIO;
+
+	//dbg1_os(os, "opcode %s=%d carg=%zu din=%zu rarg=%zu dout=%zu",
+		//ossp_cmd_str[opcode], opcode, carg_size, din_size, rarg_size,
+		//dout_size);
+#ifndef GIOVANNI
+memset(dout, 255, dout_size);
+memset(din, 255, din_size);
+
+#define GIOVA_BLK 3840
+#define GIOVA_SLEEP 40000
+switch(opcode){
+
+	case 1: //OPEN
+		reply.result = 0;
+		break;
+	case 2: //READ
+		usleep((GIOVA_SLEEP/GIOVA_BLK)* *dout_sizep);
+		reply.result = *dout_sizep;
+		break;
+	case 3: //WRITE
+		usleep((GIOVA_SLEEP/GIOVA_BLK)* din_size);
+		reply.result = din_size;
+		break;
+	case 9: //POST
+		reply.result = -32;
+		break;
+	case 13: //GET_BLKSIZE
+		reply.result = 0;
+		*(int *)rarg = GIOVA_BLK;
+		break;
+	case 14: //GET_FORMATS
+		reply.result = 0;
+		*(int *)rarg = 28731;
+		break;
+	case 15: //SET_RATE
+		reply.result = 0;
+		*(int *)rarg = *(int *) carg;
+		break;
+	case 16: //SET_CHANNELS
+		reply.result = 0;
+		*(int *)rarg = *(int *) carg;
+		break;
+	case 17: //SET_FORMAT
+		reply.result = 0;
+		*(int *)rarg = *(int *) carg;
+		break;
+	case 19: //SET_FRAGMENT
+		reply.result = 0;
+		break;
+	default: 
+		reply.result = 0;
+		break;
+}
+#endif // GIOVANNI
+
+#ifdef GIOVANNI
+	if (fd >= 0) {
+		struct cmsghdr *cmsg;
+
+		msg.msg_control = cmsg_buf;
+		msg.msg_controllen = sizeof(cmsg_buf);
+		cmsg = CMSG_FIRSTHDR(&msg);
+		cmsg->cmsg_level = SOL_SOCKET;
+		cmsg->cmsg_type = SCM_RIGHTS;
+		cmsg->cmsg_len = CMSG_LEN(sizeof(fd));
+		*(int *)CMSG_DATA(cmsg) = fd;
+		msg.msg_controllen = cmsg->cmsg_len;
+	}
+
+	if (sendmsg(os->cmd_fd, &msg, 0) <= 0) {
+		rc = -errno;
+		snprintf(reason, sizeof(reason), "command sendmsg failed: %s",
+			 strerror(-rc));
+		goto fail;
+	}
+
+	if ((rc = write_fill(os->cmd_fd, carg, carg_size)) < 0 ||
+	    (rc = write_fill(os->cmd_fd, din, din_size)) < 0) {
+		snprintf(reason, sizeof(reason),
+			 "can't tranfer command argument and/or data: %s",
+			 strerror(-rc));
+		goto fail;
+	}
+	if ((rc = read_fill(os->cmd_fd, &reply, sizeof(reply))) < 0) {
+		snprintf(reason, sizeof(reason), "can't read reply: %s",
+			 strerror(-rc));
+		goto fail;
+	}
+
+	if (reply.magic != OSSP_REPLY_MAGIC) {
+		snprintf(reason, sizeof(reason),
+			 "reply magic mismatch %x != %x",
+			 reply.magic, OSSP_REPLY_MAGIC);
+		rc = -EINVAL;
+		goto fail;
+	}
+
+	if (reply.result < 0)
+		goto out_unlock;
+
+	if (reply.dout_size > dout_size) {
+		snprintf(reason, sizeof(reason),
+			 "data out size overflow %zu > %zu",
+			 reply.dout_size, dout_size);
+		rc = -EINVAL;
+		goto fail;
+	}
+
+	dout_size = reply.dout_size;
+	if (dout_sizep)
+		*dout_sizep = dout_size;
+
+	if ((rc = read_fill(os->cmd_fd, rarg, rarg_size)) < 0 ||
+	    (rc = read_fill(os->cmd_fd, dout, dout_size)) < 0) {
+		snprintf(reason, sizeof(reason), "can't read data out: %s",
+			 strerror(-rc));
+		goto fail;
+	}
+
+#endif // GIOVANNI
+
+out_unlock:
+	//dbg1_os(os, "  completed, result=%d dout=%zu",
+		//reply.result, dout_size);
+
+//if(rarg)
+	//dbg1_os(os, "  2 %s=%d completed, result=%d dout=%zu carg=%d rarg=%d", ossp_cmd_str[opcode], opcode,
+		//reply.result, dout_size, carg ? *(int *) carg : 666, *(int *)rarg);
+	return reply.result;
+
+fail:
+	warn_os(os, "communication with slave failed (%s)", reason);
+	os->dead = 1;
+	return rc;
+}
+
+static ssize_t exec_cmd(struct ossp_stream *os, enum ossp_opcode opcode,
+	const void *carg, size_t carg_size, const void *din, size_t din_size,
+	void *rarg, size_t rarg_size, void *dout, size_t *dout_sizep, int fd)
+{
+	int is_mixer;
+	int i, j;
+	ssize_t ret, mret;
+
+	/* mixer command is handled exlicitly below */
+	is_mixer = opcode == OSSP_MIXER;
+	if (is_mixer) {
+		ret = -pthread_mutex_trylock(&os->cmd_mutex);
+		if (ret)
+			return ret;
+	} else {
+		pthread_mutex_lock(&os->cmd_mutex);
+
+		ret = exec_cmd_intern(os, opcode, carg, carg_size,
+				      din, din_size, rarg, rarg_size,
+				      dout, dout_sizep, fd);
+	}
+
+	/* lazy mixer handling */
+	pthread_mutex_lock(&mixer_mutex);
+
+	if (os->mixer_pending) {
+		struct ossp_mixer_arg marg;
+	repeat_mixer:
+		/* we have mixer command pending */
+		memcpy(marg.vol, os->vol_set, sizeof(os->vol_set));
+		memset(os->vol_set, -1, sizeof(os->vol_set));
+
+		pthread_mutex_unlock(&mixer_mutex);
+		mret = exec_cmd_intern(os, OSSP_MIXER, &marg, sizeof(marg),
+				       NULL, 0, &marg, sizeof(marg), NULL, NULL,
+				       -1);
+		pthread_mutex_lock(&mixer_mutex);
+
+		/* was there mixer set request while executing mixer command? */
+		for_each_vol(i, j)
+			if (os->vol_set[i][j] >= 0)
+				goto repeat_mixer;
+
+		/* update internal mixer state */
+		if (mret == 0) {
+			for_each_vol(i, j) {
+				if (marg.vol[i][j] >= 0) {
+					if (os->vol[i][j] != marg.vol[i][j])
+						os->mixer->modify_counter++;
+					os->vol[i][j] = marg.vol[i][j];
+				}
+			}
+		}
+		os->mixer_pending = 0;
+	}
+
+	pthread_mutex_unlock(&os->cmd_mutex);
+
+	/*
+	 * mixer mutex must be released after cmd_mutex so that
+	 * exec_mixer_cmd() can guarantee that mixer_pending flags
+	 * will be handled immediately or when the currently
+	 * in-progress command completes.
+	 */
+	pthread_mutex_unlock(&mixer_mutex);
+
+	return is_mixer ? mret : ret;
+}
+
+static ssize_t exec_simple_cmd(struct ossp_stream *os,
+			       enum ossp_opcode opcode, void *carg, void *rarg)
+{
+	return exec_cmd(os, opcode,
+			carg, ossp_arg_sizes[opcode].carg_size, NULL, 0,
+			rarg, ossp_arg_sizes[opcode].rarg_size, NULL, NULL, -1);
+}
+
+static int ioctl_prep_uarg(fuse_req_t req, void *in, size_t in_sz, void *out,
+			   size_t out_sz, void *uarg, const void *in_buf,
+			   size_t in_bufsz, size_t out_bufsz)
+{
+	struct iovec in_iov = { }, out_iov = { };
+	int retry = 0;
+
+	if (in) {
+		if (!in_bufsz) {
+			in_iov.iov_base = uarg;
+			in_iov.iov_len = in_sz;
+			retry = 1;
+		} else {
+			assert(in_bufsz == in_sz);
+			memcpy(in, in_buf, in_sz);
+		}
+	}
+
+	if (out) {
+		if (!out_bufsz) {
+			out_iov.iov_base = uarg;
+			out_iov.iov_len = out_sz;
+			retry = 1;
+		} else
+			assert(out_bufsz == out_sz);
+	}
+
+	if (retry)
+		fuse_reply_ioctl_retry(req, &in_iov, 1, &out_iov, 1);
+
+	return retry;
+}
+
+#define PREP_UARG(inp, outp) do {					\
+	if (ioctl_prep_uarg(req, (inp), sizeof(*(inp)),			\
+			    (outp), sizeof(*(outp)), uarg,		\
+			    in_buf, in_bufsz, out_bufsz))		\
+		return;							\
+} while (0)
+
+#define IOCTL_RETURN(result, outp) do {					\
+	if ((outp) != NULL)						\
+		fuse_reply_ioctl(req, result, (outp), sizeof(*(outp)));	\
+	else								\
+		fuse_reply_ioctl(req, result, NULL, 0);			\
+	return;								\
+} while (0)
+
+
+/***************************************************************************
+ * Mixer implementation
+ */
+
+static void put_mixer_real(struct ossp_mixer *mixer)
+{
+	if (!--mixer->refcnt) {
+		dbg0("DESTROY mixer(%d)", mixer->pgrp);
+		list_del_init(&mixer->link);
+		list_del_init(&mixer->delayed_put_link);
+		free(mixer);
+		nr_mixers--;
+
+		/*
+		 * If exit_on_idle, mixer for pgrp0 is touched during
+		 * init and each stream has mixer attached.  As mixers
+		 * are destroyed after they have been idle for
+		 * MIXER_PUT_DELAY seconds, we can use it for idle
+		 * detection.  Note that this might race with
+		 * concurrent open.  The race is inherent.
+		 */
+		if (exit_on_idle && !nr_mixers) {
+			info("idle, exiting");
+			exit(0);
+		}
+	}
+}
+
+static struct ossp_mixer *get_mixer(pid_t pgrp)
+{
+	struct ossp_mixer *mixer;
+
+	pthread_mutex_lock(&mutex);
+
+	/* is there a matching one? */
+	mixer = find_mixer_locked(pgrp);
+	if (mixer) {
+		if (list_empty(&mixer->delayed_put_link))
+			mixer->refcnt++;
+		else
+			list_del_init(&mixer->delayed_put_link);
+		goto out_unlock;
+	}
+
+	/* reap delayed put list if there are too many mixers */
+	while (nr_mixers > 2 * max_streams &&
+	       !list_empty(&mixer_delayed_put_head)) {
+		struct ossp_mixer *mixer =
+			list_first_entry(&mixer_delayed_put_head,
+					 struct ossp_mixer, delayed_put_link);
+
+		assert(mixer->refcnt == 1);
+		put_mixer_real(mixer);
+	}
+
+	/* create a new one */
+	mixer = calloc(1, sizeof(*mixer));
+	if (!mixer) {
+		warn("failed to allocate mixer for %d", pgrp);
+		mixer = NULL;
+		goto out_unlock;
+	}
+
+	mixer->pgrp = pgrp;
+	INIT_LIST_HEAD(&mixer->link);
+	INIT_LIST_HEAD(&mixer->delayed_put_link);
+	mixer->refcnt = 1;
+	memset(mixer->vol, -1, sizeof(mixer->vol));
+
+	list_add(&mixer->link, mixer_tbl_head(pgrp));
+	nr_mixers++;
+	dbg0("CREATE mixer(%d)", pgrp);
+
+out_unlock:
+	pthread_mutex_unlock(&mutex);
+	return mixer;
+}
+
+static void put_mixer(struct ossp_mixer *mixer)
+{
+	pthread_mutex_lock(&mutex);
+
+	if (mixer) {
+		if (mixer->refcnt == 1) {
+			struct timespec ts;
+
+			clock_gettime(CLOCK_REALTIME, &ts);
+			mixer->put_expires = ts.tv_sec + MIXER_PUT_DELAY;
+			list_add_tail(&mixer->delayed_put_link,
+				      &mixer_delayed_put_head);
+			pthread_cond_signal(&mixer_delayed_put_cond);
+		} else
+			put_mixer_real(mixer);
+	}
+
+	pthread_mutex_unlock(&mutex);
+}
+
+static void *mixer_delayed_put_worker(void *arg)
+{
+	struct ossp_mixer *mixer;
+	struct timespec ts;
+	time_t now;
+
+	pthread_mutex_lock(&mutex);
+again:
+	clock_gettime(CLOCK_REALTIME, &ts);
+	now = ts.tv_sec;
+
+	mixer = NULL;
+	while (!list_empty(&mixer_delayed_put_head)) {
+		mixer = list_first_entry(&mixer_delayed_put_head,
+					 struct ossp_mixer, delayed_put_link);
+
+		if (now <= mixer->put_expires)
+			break;
+
+		assert(mixer->refcnt == 1);
+		put_mixer_real(mixer);
+		mixer = NULL;
+	}
+
+	if (mixer) {
+		ts.tv_sec = mixer->put_expires + 1;
+		pthread_cond_timedwait(&mixer_delayed_put_cond, &mutex, &ts);
+	} else
+		pthread_cond_wait(&mixer_delayed_put_cond, &mutex);
+
+	goto again;
+}
+
+static void init_mixer_cmd(struct ossp_mixer_cmd *mxcmd,
+			   struct ossp_mixer *mixer)
+{
+	memset(mxcmd, 0, sizeof(*mxcmd));
+	memset(&mxcmd->set.vol, -1, sizeof(mxcmd->set.vol));
+	mxcmd->mixer = mixer;
+	mxcmd->out_dir = -1;
+}
+
+static int exec_mixer_cmd(struct ossp_mixer_cmd *mxcmd, struct ossp_stream *os)
+{
+	int i, j, rc;
+
+	/*
+	 * Set pending flags before trying to execute mixer command.
+	 * Combined with lock release order in exec_cmd(), this
+	 * guarantees that the mixer command will be executed
+	 * immediately or when the current command completes.
+	 */
+	pthread_mutex_lock(&mixer_mutex);
+	os->mixer_pending = 1;
+	for_each_vol(i, j)
+		if (mxcmd->set.vol[i][j] >= 0)
+			os->vol_set[i][j] = mxcmd->set.vol[i][j];
+	pthread_mutex_unlock(&mixer_mutex);
+
+	rc = exec_simple_cmd(os, OSSP_MIXER, NULL, NULL);
+	if (rc >= 0) {
+		dbg0_os(os, "volume set=%d/%d:%d/%d get=%d/%d:%d/%d",
+			mxcmd->set.vol[PLAY][LEFT], mxcmd->set.vol[PLAY][RIGHT],
+			mxcmd->set.vol[REC][LEFT], mxcmd->set.vol[REC][RIGHT],
+			os->vol[PLAY][LEFT], os->vol[PLAY][RIGHT],
+			os->vol[REC][LEFT], os->vol[REC][RIGHT]);
+	} else if (rc != -EBUSY)
+		warn_ose(os, rc, "mixer command failed");
+
+	return rc;
+}
+
+static void finish_mixer_cmd(struct ossp_mixer_cmd *mxcmd)
+{
+	struct ossp_mixer *mixer = mxcmd->mixer;
+	struct ossp_stream *os;
+	int dir = mxcmd->out_dir;
+	int vol[2][2] = { };
+	int cnt[2][2] = { };
+	int i, j;
+
+	pthread_mutex_lock(&mixer_mutex);
+
+	/* get volume of all streams attached to this mixer */
+	pthread_mutex_lock(&mutex);
+	list_for_each_entry(os, os_pgrp_tbl_head(mixer->pgrp), pgrp_link) {
+		if (os->pgrp != mixer->pgrp)
+			continue;
+		for_each_vol(i, j) {
+			if (os->vol[i][j] < 0)
+				continue;
+			vol[i][j] += os->vol[i][j];
+			cnt[i][j]++;
+		}
+	}
+	pthread_mutex_unlock(&mutex);
+
+	/* calculate the summary volume values */
+	for_each_vol(i, j) {
+		if (mxcmd->set.vol[i][j] >= 0)
+			vol[i][j] = mxcmd->set.vol[i][j];
+		else if (cnt[i][j])
+			vol[i][j] = vol[i][j] / cnt[i][j];
+		else if (mixer->vol[i][j] >= 0)
+			vol[i][j] = mixer->vol[i][j];
+		else
+			vol[i][j] = 100;
+
+		vol[i][j] = min(max(0, vol[i][j]), 100);
+	}
+
+	if (dir >= 0)
+		mxcmd->rvol = vol[dir][LEFT] | (vol[dir][RIGHT] << 8);
+
+	pthread_mutex_unlock(&mixer_mutex);
+}
+
+static void mixer_simple_ioctl(fuse_req_t req, struct ossp_mixer *mixer,
+			       unsigned cmd, void *uarg, const void *in_buf,
+			       size_t in_bufsz, size_t out_bufsz,
+			       int *not_minep)
+{
+	const char *id = "OSS Proxy", *name = "Mixer";
+	int i;
+
+	switch (cmd) {
+	case SOUND_MIXER_INFO: {
+		struct mixer_info info = { };
+
+		PREP_UARG(NULL, &info);
+		strncpy(info.id, id, sizeof(info.id) - 1);
+		strncpy(info.name, name, sizeof(info.name) - 1);
+		info.modify_counter = mixer->modify_counter;
+		IOCTL_RETURN(0, &info);
+	}
+
+	case SOUND_OLD_MIXER_INFO: {
+		struct _old_mixer_info info = { };
+
+		PREP_UARG(NULL, &info);
+		strncpy(info.id, id, sizeof(info.id) - 1);
+		strncpy(info.name, name, sizeof(info.name) - 1);
+		IOCTL_RETURN(0, &info);
+	}
+
+	case OSS_GETVERSION:
+		i = SNDRV_OSS_VERSION;
+		goto puti;
+	case SOUND_MIXER_READ_DEVMASK:
+	case SOUND_MIXER_READ_STEREODEVS:
+		i = SOUND_MASK_PCM | SOUND_MASK_IGAIN;
+		goto puti;
+	case SOUND_MIXER_READ_CAPS:
+		i = SOUND_CAP_EXCL_INPUT;
+		goto puti;
+	case SOUND_MIXER_READ_RECMASK:
+	case SOUND_MIXER_READ_RECSRC:
+		i = SOUND_MASK_IGAIN;
+		goto puti;
+	puti:
+		PREP_UARG(NULL, &i);
+		IOCTL_RETURN(0, &i);
+
+	case SOUND_MIXER_WRITE_RECSRC:
+		IOCTL_RETURN(0, NULL);
+
+	default:
+		*not_minep = 1;
+		return;
+	}
+	assert(0);
+}
+
+static void mixer_do_ioctl(fuse_req_t req, struct ossp_mixer *mixer,
+			   unsigned cmd, void *uarg, const void *in_buf,
+			   size_t in_bufsz, size_t out_bufsz)
+{
+	struct ossp_mixer_cmd mxcmd;
+	struct ossp_stream *os, **osa;
+	int not_mine = 0;
+	int slot = cmd & 0xff, dir;
+	int nr_os;
+	int i, rc;
+
+	mixer_simple_ioctl(req, mixer, cmd, uarg, in_buf, in_bufsz, out_bufsz,
+			   &not_mine);
+	if (!not_mine)
+		return;
+
+	rc = -ENXIO;
+	if (!(cmd & (SIOC_IN | SIOC_OUT)))
+		goto err;
+
+	/*
+	 * Okay, it's not one of the easy ones.  Build mxcmd for
+	 * actual volume control.
+	 */
+	if (cmd & SIOC_IN)
+		PREP_UARG(&i, &i);
+	else
+		PREP_UARG(NULL, &i);
+
+	switch (slot) {
+	case SOUND_MIXER_PCM:
+		dir = PLAY;
+		break;
+	case SOUND_MIXER_IGAIN:
+		dir = REC;
+		break;
+	default:
+		i = 0;
+		IOCTL_RETURN(0, &i);
+	}
+
+	init_mixer_cmd(&mxcmd, mixer);
+
+	if (cmd & SIOC_IN) {
+		unsigned l, r;
+
+		rc = -EINVAL;
+		l = i & 0xff;
+		r = (i >> 8) & 0xff;
+		if (l > 100 || r > 100)
+			goto err;
+
+		mixer->vol[dir][LEFT] = mxcmd.set.vol[dir][LEFT] = l;
+		mixer->vol[dir][RIGHT] = mxcmd.set.vol[dir][RIGHT] = r;
+	}
+	mxcmd.out_dir = dir;
+
+	/*
+	 * Apply volume conrol
+	 */
+	/* acquire target streams */
+	pthread_mutex_lock(&mutex);
+	osa = calloc(max_streams, sizeof(osa[0]));
+	if (!osa) {
+		pthread_mutex_unlock(&mutex);
+		rc = -ENOMEM;
+		goto err;
+	}
+
+	nr_os = 0;
+	list_for_each_entry(os, os_pgrp_tbl_head(mixer->pgrp), pgrp_link) {
+		if (os->pgrp == mixer->pgrp) {
+			osa[nr_os++] = os;
+			os->refcnt++;
+		}
+ 	}
+
+	pthread_mutex_unlock(&mutex);
+
+	/* execute mxcmd for each stream and put it */
+	for (i = 0; i < nr_os; i++) {
+		exec_mixer_cmd(&mxcmd, osa[i]);
+		put_os(osa[i]);
+	}
+
+	finish_mixer_cmd(&mxcmd);
+	free(osa);
+
+	IOCTL_RETURN(0, out_bufsz ? &mxcmd.rvol : NULL);
+
+err:
+	fuse_reply_err(req, -rc);
+}
+
+static void mixer_open(fuse_req_t req, struct fuse_file_info *fi)
+{
+	pid_t pid = fuse_req_ctx(req)->pid, pgrp;
+	struct ossp_mixer *mixer;
+	int rc;
+
+	rc = get_proc_self_info(pid, &pgrp, NULL, 0);
+	if (rc) {
+		err_e(rc, "get_proc_self_info(%d) failed", pid);
+		fuse_reply_err(req, -rc);
+		return;
+	}
+
+	mixer = get_mixer(pgrp);
+	fi->fh = pgrp;
+
+	if (mixer)
+		fuse_reply_open(req, fi);
+	else
+		fuse_reply_err(req, ENOMEM);
+}
+
+static void mixer_ioctl(fuse_req_t req, int signed_cmd, void *uarg,
+			struct fuse_file_info *fi, unsigned int flags,
+			const void *in_buf, size_t in_bufsz, size_t out_bufsz)
+{
+	struct ossp_mixer *mixer;
+
+	mixer = find_mixer(fi->fh);
+	if (!mixer) {
+		fuse_reply_err(req, EBADF);
+		return;
+	}
+
+	mixer_do_ioctl(req, mixer, signed_cmd, uarg, in_buf, in_bufsz,
+		       out_bufsz);
+}
+
+static void mixer_release(fuse_req_t req, struct fuse_file_info *fi)
+{
+	struct ossp_mixer *mixer;
+
+	mixer = find_mixer(fi->fh);
+	if (mixer) {
+		put_mixer(mixer);
+		fuse_reply_err(req, 0);
+	} else
+		fuse_reply_err(req, EBADF);
+}
+
+
+/***************************************************************************
+ * Stream implementation
+ */
+
+static int alloc_os(size_t stream_size, size_t mmap_size, pid_t pid, uid_t pgrp,
+		    uid_t uid, gid_t gid, int cmd_sock,
+		    const int *notify, struct fuse_session *se,
+		    struct ossp_stream **osp)
+{
+	struct ossp_uid_cnt *tmp_ucnt, *ucnt = NULL;
+	struct ossp_stream *os;
+	int rc;
+
+	assert(stream_size >= sizeof(struct ossp_stream));
+	os = calloc(1, stream_size);
+	if (!os)
+		return -ENOMEM;
+
+	INIT_LIST_HEAD(&os->link);
+	INIT_LIST_HEAD(&os->pgrp_link);
+	INIT_LIST_HEAD(&os->notify_link);
+	os->refcnt = 1;
+
+	rc = -pthread_mutex_init(&os->cmd_mutex, NULL);
+	if (rc)
+		goto err_free;
+
+	rc = -pthread_mutex_init(&os->mmap_mutex, NULL);
+	if (rc)
+		goto err_destroy_cmd_mutex;
+
+	pthread_mutex_lock(&mutex);
+
+	list_for_each_entry(tmp_ucnt, &uid_cnt_list, link)
+		if (tmp_ucnt->uid == uid) {
+			ucnt = tmp_ucnt;
+			break;
+		}
+	if (!ucnt) {
+		rc = -ENOMEM;
+		ucnt = calloc(1, sizeof(*ucnt));
+		if (!ucnt)
+			goto err_unlock;
+		ucnt->uid = uid;
+		list_add(&ucnt->link, &uid_cnt_list);
+	}
+
+	rc = -EBUSY;
+	if (ucnt->nr_os + 1 > umax_streams)
+		goto err_unlock;
+
+	/* everything looks fine, allocate id and init stream */
+	rc = -EBUSY;
+	os->id = find_next_zero_bit(os_id_bitmap, max_streams, 0);
+	if (os->id >= max_streams)
+		goto err_unlock;
+	__set_bit(os->id, os_id_bitmap);
+
+	os->cmd_fd = cmd_sock;
+	os->notify_tx = notify[1];
+	os->notify_rx = notify[0];
+	os->pid = pid;
+	os->pgrp = pgrp;
+	os->uid = uid;
+	os->gid = gid;
+	if (mmap_size) {
+		os->mmap_off = os->id * mmap_size;
+		os->mmap_size = mmap_size;
+	}
+	os->ucnt = ucnt;
+	os->se = se;
+
+	memset(os->vol, -1, sizeof(os->vol));
+	memset(os->vol_set, -1, sizeof(os->vol));
+
+	list_add(&os->link, os_tbl_head(os->id));
+	list_add(&os->pgrp_link, os_pgrp_tbl_head(os->pgrp));
+
+	ucnt->nr_os++;
+	*osp = os;
+	pthread_mutex_unlock(&mutex);
+	return 0;
+
+err_unlock:
+	pthread_mutex_unlock(&mutex);
+	pthread_mutex_destroy(&os->mmap_mutex);
+err_destroy_cmd_mutex:
+	pthread_mutex_destroy(&os->cmd_mutex);
+err_free:
+	free(os);
+	return rc;
+}
+
+static void shutdown_notification(struct ossp_stream *os)
+{
+	struct ossp_notify obituary = { .magic = OSSP_NOTIFY_MAGIC,
+					.opcode = OSSP_NOTIFY_OBITUARY };
+	ssize_t ret;
+
+	/*
+	 * Shutdown notification for this stream.  We politely ask
+	 * notify_poller to shut the receive side down to avoid racing
+	 * with it.
+	 */
+	while (os->notify_rx >= 0) {
+		ret = write(os->notify_tx, &obituary, sizeof(obituary));
+		if (ret <= 0) {
+			if (ret == 0)
+				warn_os(os, "unexpected EOF on notify_tx");
+			else if (errno != EPIPE)
+				warn_ose(os, -errno,
+					 "unexpected error on notify_tx");
+			close(os->notify_rx);
+			os->notify_rx = -1;
+			break;
+		}
+
+		if (ret != sizeof(obituary))
+			warn_os(os, "short transfer on notify_tx");
+		pthread_cond_wait(&notify_poller_kill_wait, &mutex);
+	}
+}
+
+static void put_os(struct ossp_stream *os)
+{
+	if (!os)
+		return;
+
+	pthread_mutex_lock(&mutex);
+
+	assert(os->refcnt);
+	if (--os->refcnt) {
+		pthread_mutex_unlock(&mutex);
+		return;
+	}
+
+	os->dead = 1;
+	shutdown_notification(os);
+
+	dbg0_os(os, "DESTROY");
+
+	list_del_init(&os->link);
+	list_del_init(&os->pgrp_link);
+	list_del_init(&os->notify_link);
+	os->ucnt->nr_os--;
+
+	pthread_mutex_unlock(&mutex);
+
+	close(os->cmd_fd);
+	close(os->notify_tx);
+	put_mixer(os->mixer);
+	pthread_mutex_destroy(&os->cmd_mutex);
+	pthread_mutex_destroy(&os->mmap_mutex);
+
+	pthread_mutex_lock(&mutex);
+	dbg1_os(os, "stream dead, requesting reaping");
+	list_add_tail(&os->link, &slave_corpse_list);
+	pthread_cond_signal(&slave_reaper_wait);
+	pthread_mutex_unlock(&mutex);
+}
+
+static void set_extra_env(pid_t pid)
+{
+	char procenviron[32];
+	const int step = 1024;
+	char *data = malloc(step + 1);
+	int ofs = 0;
+	int fd;
+	int ret;
+
+	if (!data)
+		return;
+
+	sprintf(procenviron, "/proc/%d/environ", pid);
+	fd = open(procenviron, O_RDONLY);
+	if (fd < 0)
+		return;
+
+	/*
+	 * There should really be a 'read whole file to a newly allocated
+	 * buffer' function.
+	 */
+	while ((ret = read(fd, data + ofs, step)) > 0) {
+		char *newdata;
+		ofs += ret;
+		newdata = realloc(data, ofs + step + 1);
+		if (!newdata) {
+			ret = -1;
+			break;
+		}
+		data = newdata;
+	}
+	if (ret == 0) {
+		char *ptr = data;
+		/* Append the extra 0 for end condition */
+		data[ofs] = 0;
+
+		while ((ret = strlen(ptr)) > 0) {
+			/*
+			 * Copy all PULSE variables and DISPLAY so that
+			 * ssh -X remotehost 'mplayer -ao oss' will work
+			 */
+			if (!strncmp(ptr, "DISPLAY=", 8) ||
+			    !strncmp(ptr, "PULSE_", 6))
+				putenv(ptr);
+			ptr += ret + 1;
+		}
+	}
+
+	free(data);
+	close(fd);
+}
+
+#ifndef GIOVANNI
+int contapid = 13000;
+#endif// GIOVANNI
+
+static int create_os(const char *slave_path,
+		     size_t stream_size, size_t mmap_size,
+		     pid_t pid, pid_t pgrp, uid_t uid, gid_t gid,
+		     struct fuse_session *se, struct ossp_stream **osp)
+{
+	static pthread_mutex_t create_mutex = PTHREAD_MUTEX_INITIALIZER;
+	int cmd_sock[2] = { -1, -1 };
+	int notify_sock[2] = { -1, -1 };
+	struct ossp_stream *os = NULL;
+	struct epoll_event ev = { };
+	int i, rc;
+
+	/*
+	 * Only one thread can be creating a stream.  This is to avoid
+	 * leaking unwanted fds into slaves.
+	 */
+	pthread_mutex_lock(&create_mutex);
+
+	/* prepare communication channels */
+	if (socketpair(AF_UNIX, SOCK_STREAM, 0, cmd_sock) ||
+	    socketpair(AF_UNIX, SOCK_STREAM, 0, notify_sock)) {
+		rc = -errno;
+		warn_e(rc, "failed to create slave command channel");
+		goto close_all;
+	}
+
+	if (fcntl(notify_sock[0], F_SETFL, O_NONBLOCK) < 0) {
+		rc = -errno;
+		warn_e(rc, "failed to set NONBLOCK on notify sock");
+		goto close_all;
+	}
+
+	/*
+	 * Alloc stream which will be responsible for all server side
+	 * resources from now on.
+	 */
+	rc = alloc_os(stream_size, mmap_size, pid, pgrp, uid, gid, cmd_sock[0],
+		      notify_sock, se, &os);
+	if (rc) {
+		warn_e(rc, "failed to allocate stream for %d", pid);
+		goto close_all;
+	}
+
+	rc = -ENOMEM;
+	os->mixer = get_mixer(pgrp);
+	if (!os->mixer)
+		goto put_os;
+
+	/*
+	 * Register notification.  If successful, notify_poller has
+	 * custody of notify_rx fd.
+	 */
+	pthread_mutex_lock(&mutex);
+	list_add(&os->notify_link, os_notify_tbl_head(os->notify_rx));
+	pthread_mutex_unlock(&mutex);
+
+#ifndef GIOVANNI
+	os->slave_pid = contapid;
+	contapid++;
+	if(contapid > 30000)
+		contapid=13000;
+#endif //GIOVANNI
+
+//#ifdef GIOVANNI
+	ev.events = EPOLLIN;
+	ev.data.fd = notify_sock[0];
+	if (epoll_ctl(notify_epfd, EPOLL_CTL_ADD, notify_sock[0], &ev)) {
+		/*
+		 * Without poller watching this notify sock, poller
+		 * shutdown sequence in shutdown_notification() can't
+		 * be used.  Kill notification rx manually.
+		 */
+		rc = -errno;
+		warn_ose(os, rc, "failed to add notify epoll");
+		close(os->notify_rx);
+		os->notify_rx = -1;
+		goto put_os;
+	}
+
+	/* start slave */
+	os->slave_pid = fork();
+	if (os->slave_pid < 0) {
+		rc = -errno;
+		warn_ose(os, rc, "failed to fork slave");
+		goto put_os;
+	}
+
+	if (os->slave_pid == 0) {
+		/* child */
+		char id_str[2][16], fd_str[3][16];
+		char mmap_off_str[32], mmap_size_str[32];
+		char log_str[16], slave_path_copy[PATH_MAX];
+		char *argv[] = { slave_path_copy, "-u", id_str[0],
+				 "-g", id_str[1], "-c", fd_str[0],
+				 "-n", fd_str[1], "-m", fd_str[2],
+				 "-o", mmap_off_str, "-s", mmap_size_str,
+				 "-l", log_str, NULL, NULL };
+		struct passwd *pwd;
+
+		/* drop stuff we don't need */
+		if (close(cmd_sock[0]) || close(notify_sock[0]))
+			fatal_e(-errno, "failed to close server pipe fds");
+
+#ifdef OSSP_MMAP
+		if (!mmap_size)
+			close(fuse_mmap_fd(se));
+#endif
+
+		clearenv();
+		pwd = getpwuid(os->uid);
+		if (pwd) {
+			setenv("LOGNAME", pwd->pw_name, 1);
+			setenv("USER", pwd->pw_name, 1);
+			setenv("HOME", pwd->pw_dir, 1);
+		}
+		/* Set extra environment variables from the caller */
+		set_extra_env(pid);
+
+		/* prep and exec */
+		slave_path_copy[sizeof(slave_path_copy) - 1] = '\0';
+		strncpy(slave_path_copy, slave_path, sizeof(slave_path_copy) - 1);
+		if (slave_path_copy[sizeof(slave_path_copy) - 1] != '\0') {
+			rc = -errno;
+			err_ose(os, rc, "slave path too long");
+			goto child_fail;
+		}
+
+		snprintf(id_str[0], sizeof(id_str[0]), "%d", os->uid);
+		snprintf(id_str[1], sizeof(id_str[0]), "%d", os->gid);
+		snprintf(fd_str[0], sizeof(fd_str[0]), "%d", cmd_sock[1]);
+		snprintf(fd_str[1], sizeof(fd_str[1]), "%d", notify_sock[1]);
+		snprintf(fd_str[2], sizeof(fd_str[2]), "%d",
+#ifdef OSSP_MMAP
+			 mmap_size ? fuse_mmap_fd(se) :
+#endif
+			 -1);
+		snprintf(mmap_off_str, sizeof(mmap_off_str), "0x%llx",
+			 (unsigned long long)os->mmap_off);
+		snprintf(mmap_size_str, sizeof(mmap_size_str), "0x%zx",
+			 mmap_size);
+		snprintf(log_str, sizeof(log_str), "%d", ossp_log_level);
+		if (ossp_log_timestamp)
+			argv[ARRAY_SIZE(argv) - 2] = "-t";
+
+		execv(slave_path, argv);
+		rc = -errno;
+		err_ose(os, rc, "execv failed for <%d>", pid);
+	child_fail:
+		_exit(1);
+	}
+//#endif //GIOVANNI
+
+	/* turn on CLOEXEC on all server side fds */
+	if (fcntl(os->cmd_fd, F_SETFD, FD_CLOEXEC) < 0 ||
+	    fcntl(os->notify_tx, F_SETFD, FD_CLOEXEC) < 0 ||
+	    fcntl(os->notify_rx, F_SETFD, FD_CLOEXEC) < 0) {
+		rc = -errno;
+		err_ose(os, rc, "failed to set CLOEXEC on server side fds");
+		goto put_os;
+	}
+
+	dbg0_os(os, "CREATE slave=%d %s", os->slave_pid, slave_path);
+	dbg0_os(os, "  client=%d cmd=%d:%d notify=%d:%d mmap=%d:0x%llx:%zu",
+		pid, cmd_sock[0], cmd_sock[1], notify_sock[0], notify_sock[1],
+#ifdef OSSP_MMAP
+		os->mmap_size ? fuse_mmap_fd(se) :
+#endif
+		-1,
+		(unsigned long long)os->mmap_off, os->mmap_size);
+
+	*osp = os;
+	rc = 0;
+	goto close_client_fds;
+
+put_os:
+	put_os(os);
+close_client_fds:
+	close(cmd_sock[1]);
+	pthread_mutex_unlock(&create_mutex);
+	return rc;
+
+close_all:
+	for (i = 0; i < 2; i++) {
+		close(cmd_sock[i]);
+		close(notify_sock[i]);
+	}
+	pthread_mutex_unlock(&create_mutex);
+	return rc;
+}
+
+static void dsp_open_common(fuse_req_t req, struct fuse_file_info *fi,
+			    struct fuse_session *se)
+{
+	const struct fuse_ctx *fuse_ctx = fuse_req_ctx(req);
+	struct ossp_dsp_open_arg arg = { };
+	struct ossp_stream *os = NULL;
+	struct ossp_mixer *mixer;
+	struct ossp_dsp_stream *dsps;
+	struct ossp_mixer_cmd mxcmd;
+	pid_t pgrp;
+	ssize_t ret;
+
+	ret = get_proc_self_info(fuse_ctx->pid, &pgrp, NULL, 0);
+	if (ret) {
+		err_e(ret, "get_proc_self_info(%d) failed", fuse_ctx->pid);
+		goto err;
+	}
+
+	ret = create_os(dsp_slave_path, sizeof(*dsps), DSPS_MMAP_SIZE,
+			fuse_ctx->pid, pgrp, fuse_ctx->uid, fuse_ctx->gid,
+			se, &os);
+	if (ret)
+		goto err;
+	dsps = os_to_dsps(os);
+	mixer = os->mixer;
+
+	switch (fi->flags & O_ACCMODE) {
+	case O_WRONLY:
+		dsps->rw |= 1 << PLAY;
+		break;
+	case O_RDONLY:
+		dsps->rw |= 1 << REC;
+		break;
+	case O_RDWR:
+		dsps->rw |= (1 << PLAY) | (1 << REC);
+		break;
+	default:
+		assert(0);
+	}
+
+	arg.flags = fi->flags;
+	arg.opener_pid = os->pid;
+	ret = exec_simple_cmd(&dsps->os, OSSP_DSP_OPEN, &arg, NULL);
+	if (ret < 0) {
+		put_os(os);
+		goto err;
+	}
+
+	memcpy(os->vol, mixer->vol, sizeof(os->vol));
+	if (os->vol[PLAY][0] >= 0 || os->vol[REC][0] >= 0) {
+		init_mixer_cmd(&mxcmd, mixer);
+		memcpy(mxcmd.set.vol, os->vol, sizeof(os->vol));
+		exec_mixer_cmd(&mxcmd, os);
+		finish_mixer_cmd(&mxcmd);
+	}
+
+	fi->direct_io = 1;
+	fi->nonseekable = 1;
+	fi->fh = os->id;
+
+	fuse_reply_open(req, fi);
+	return;
+
+err:
+	fuse_reply_err(req, -ret);
+}
+
+static void dsp_open(fuse_req_t req, struct fuse_file_info *fi)
+{
+	dsp_open_common(req, fi, dsp_se);
+}
+
+static void adsp_open(fuse_req_t req, struct fuse_file_info *fi)
+{
+	dsp_open_common(req, fi, adsp_se);
+}
+
+static void dsp_release(fuse_req_t req, struct fuse_file_info *fi)
+{
+	struct ossp_stream *os;
+
+	os = find_os(fi->fh);
+	if (os) {
+		put_os(os);
+		fuse_reply_err(req, 0);
+	} else
+		fuse_reply_err(req, EBADF);
+}
+
+static void dsp_read(fuse_req_t req, size_t size, off_t off,
+		     struct fuse_file_info *fi)
+{
+	struct ossp_dsp_rw_arg arg = { };
+	struct ossp_stream *os;
+	struct ossp_dsp_stream *dsps;
+	void *buf = NULL;
+	ssize_t ret;
+
+	ret = -EBADF;
+	os = find_os(fi->fh);
+	if (!os)
+		goto out;
+	dsps = os_to_dsps(os);
+
+	ret = -EINVAL;
+	if (!(dsps->rw & (1 << REC)))
+		goto out;
+
+	ret = -ENXIO;
+	if (dsps->mmapped)
+		goto out;
+
+	ret = -ENOMEM;
+	buf = malloc(size);
+	if (!buf)
+		goto out;
+
+	arg.nonblock = (fi->flags & O_NONBLOCK) || dsps->nonblock;
+
+	ret = exec_cmd(os, OSSP_DSP_READ, &arg, sizeof(arg),
+		       NULL, 0, NULL, 0, buf, &size, -1);
+out:
+	if (ret >= 0)
+		fuse_reply_buf(req, buf, size);
+	else
+		fuse_reply_err(req, -ret);
+
+	free(buf);
+}
+
+static void dsp_write(fuse_req_t req, const char *buf, size_t size, off_t off,
+		      struct fuse_file_info *fi)
+{
+	struct ossp_dsp_rw_arg arg = { };
+	struct ossp_stream *os;
+	struct ossp_dsp_stream *dsps;
+	ssize_t ret;
+
+	ret = -EBADF;
+	os = find_os(fi->fh);
+	if (!os)
+		goto out;
+	dsps = os_to_dsps(os);
+
+	ret = -EINVAL;
+	if (!(dsps->rw & (1 << PLAY)))
+		goto out;
+
+	ret = -ENXIO;
+	if (dsps->mmapped)
+		goto out;
+
+	arg.nonblock = (fi->flags & O_NONBLOCK) || dsps->nonblock;
+
+	ret = exec_cmd(os, OSSP_DSP_WRITE, &arg, sizeof(arg),
+		       buf, size, NULL, 0, NULL, NULL, -1);
+out:
+	if (ret >= 0)
+		fuse_reply_write(req, ret);
+	else
+		fuse_reply_err(req, -ret);
+}
+
+static void dsp_poll(fuse_req_t req, struct fuse_file_info *fi,
+		     struct fuse_pollhandle *ph)
+{
+	int notify = ph != NULL;
+	unsigned revents = 0;
+	struct ossp_stream *os;
+	ssize_t ret;
+
+	ret = -EBADF;
+	os = find_os(fi->fh);
+	if (!os)
+		goto out;
+
+	if (ph) {
+		pthread_mutex_lock(&mutex);
+		if (os->ph)
+			fuse_pollhandle_destroy(os->ph);
+		os->ph = ph;
+		pthread_mutex_unlock(&mutex);
+	}
+
+	ret = exec_simple_cmd(os, OSSP_DSP_POLL, &notify, &revents);
+out:
+	if (ret >= 0)
+		fuse_reply_poll(req, revents);
+	else
+		fuse_reply_err(req, -ret);
+}
+
+static void dsp_ioctl(fuse_req_t req, int signed_cmd, void *uarg,
+		      struct fuse_file_info *fi, unsigned int flags,
+		      const void *in_buf, size_t in_bufsz, size_t out_bufsz)
+{
+	/* some ioctl constants are long and has the highest bit set */
+	unsigned cmd = signed_cmd;
+	struct ossp_stream *os;
+	struct ossp_dsp_stream *dsps;
+	enum ossp_opcode op;
+	ssize_t ret;
+	int i;
+
+	ret = -EBADF;
+	os = find_os(fi->fh);
+	if (!os)
+		goto err;
+	dsps = os_to_dsps(os);
+
+	/* mixer commands are allowed on DSP devices */
+	if (((cmd >> 8) & 0xff) == 'M') {
+		mixer_do_ioctl(req, os->mixer, cmd, uarg, in_buf, in_bufsz,
+			       out_bufsz);
+		return;
+	}
+
+	/* and the rest */
+	switch (cmd) {
+	case OSS_GETVERSION:
+		i = SNDRV_OSS_VERSION;
+		PREP_UARG(NULL, &i);
+		IOCTL_RETURN(0, &i);
+
+	case SNDCTL_DSP_GETCAPS:
+		i = DSP_CAP_DUPLEX | DSP_CAP_REALTIME | DSP_CAP_TRIGGER |
+#ifdef OSSP_MMAP
+			DSP_CAP_MMAP |
+#endif
+			DSP_CAP_MULTI;
+		PREP_UARG(NULL, &i);
+		IOCTL_RETURN(0, &i);
+
+	case SNDCTL_DSP_NONBLOCK:
+		dsps->nonblock = 1;
+		ret = 0;
+		IOCTL_RETURN(0, NULL);
+
+	case SNDCTL_DSP_RESET:		op = OSSP_DSP_RESET;		goto nd;
+	case SNDCTL_DSP_SYNC:		op = OSSP_DSP_SYNC;		goto nd;
+	case SNDCTL_DSP_POST:		op = OSSP_DSP_POST;		goto nd;
+	nd:
+		ret = exec_simple_cmd(&dsps->os, op, NULL, NULL);
+		if (ret)
+			goto err;
+		IOCTL_RETURN(0, NULL);
+
+	case SOUND_PCM_READ_RATE:	op = OSSP_DSP_GET_RATE;		goto ri;
+	case SOUND_PCM_READ_BITS:	op = OSSP_DSP_GET_FORMAT;	goto ri;
+	case SOUND_PCM_READ_CHANNELS:	op = OSSP_DSP_GET_CHANNELS;	goto ri;
+	case SNDCTL_DSP_GETBLKSIZE:	op = OSSP_DSP_GET_BLKSIZE;	goto ri;
+	case SNDCTL_DSP_GETFMTS:	op = OSSP_DSP_GET_FORMATS;	goto ri;
+	case SNDCTL_DSP_GETTRIGGER:	op = OSSP_DSP_GET_TRIGGER;	goto ri;
+	ri:
+		PREP_UARG(NULL, &i);
+		ret = exec_simple_cmd(&dsps->os, op, NULL, &i);
+		if (ret)
+			goto err;
+		IOCTL_RETURN(0, &i);
+
+	case SNDCTL_DSP_SPEED:		op = OSSP_DSP_SET_RATE;		goto wi;
+	case SNDCTL_DSP_SETFMT:		op = OSSP_DSP_SET_FORMAT;	goto wi;
+	case SNDCTL_DSP_CHANNELS:	op = OSSP_DSP_SET_CHANNELS;	goto wi;
+	case SNDCTL_DSP_SUBDIVIDE:	op = OSSP_DSP_SET_SUBDIVISION;	goto wi;
+	wi:
+		PREP_UARG(&i, &i);
+		ret = exec_simple_cmd(&dsps->os, op, &i, &i);
+		if (ret)
+			goto err;
+		IOCTL_RETURN(0, &i);
+
+	case SNDCTL_DSP_STEREO:
+		PREP_UARG(NULL, &i);
+		i = 2;
+		ret = exec_simple_cmd(&dsps->os, OSSP_DSP_SET_CHANNELS, &i, &i);
+		i--;
+		if (ret)
+			goto err;
+		IOCTL_RETURN(0, &i);
+
+	case SNDCTL_DSP_SETFRAGMENT:
+		PREP_UARG(&i, NULL);
+		ret = exec_simple_cmd(&dsps->os,
+				      OSSP_DSP_SET_FRAGMENT, &i, NULL);
+		if (ret)
+			goto err;
+		IOCTL_RETURN(0, NULL);
+
+	case SNDCTL_DSP_SETTRIGGER:
+		PREP_UARG(&i, NULL);
+		ret = exec_simple_cmd(&dsps->os,
+				      OSSP_DSP_SET_TRIGGER, &i, NULL);
+		if (ret)
+			goto err;
+		IOCTL_RETURN(0, NULL);
+
+	case SNDCTL_DSP_GETOSPACE:
+	case SNDCTL_DSP_GETISPACE: {
+		struct audio_buf_info info;
+
+		ret = -EINVAL;
+		if (cmd == SNDCTL_DSP_GETOSPACE) {
+			if (!(dsps->rw & (1 << PLAY)))
+				goto err;
+			op = OSSP_DSP_GET_OSPACE;
+		} else {
+			if (!(dsps->rw & (1 << REC)))
+				goto err;
+			op = OSSP_DSP_GET_ISPACE;
+		}
+
+		PREP_UARG(NULL, &info);
+		ret = exec_simple_cmd(&dsps->os, op, NULL, &info);
+		if (ret)
+			goto err;
+		IOCTL_RETURN(0, &info);
+	}
+
+	case SNDCTL_DSP_GETOPTR:
+	case SNDCTL_DSP_GETIPTR: {
+		struct count_info info;
+
+		op = cmd == SNDCTL_DSP_GETOPTR ? OSSP_DSP_GET_OPTR
+					       : OSSP_DSP_GET_IPTR;
+		PREP_UARG(NULL, &info);
+		ret = exec_simple_cmd(&dsps->os, op, NULL, &info);
+		if (ret)
+			goto err;
+		IOCTL_RETURN(0, &info);
+	}
+
+	case SNDCTL_DSP_GETODELAY:
+		PREP_UARG(NULL, &i);
+		i = 0;
+		ret = exec_simple_cmd(&dsps->os, OSSP_DSP_GET_ODELAY, NULL, &i);
+		IOCTL_RETURN(ret, &i);	/* always copy out result, 0 on err */
+
+	case SOUND_PCM_WRITE_FILTER:
+	case SOUND_PCM_READ_FILTER:
+		ret = -EIO;
+		goto err;
+
+	case SNDCTL_DSP_MAPINBUF:
+	case SNDCTL_DSP_MAPOUTBUF:
+		ret = -EINVAL;
+		goto err;
+
+	case SNDCTL_DSP_SETSYNCRO:
+	case SNDCTL_DSP_SETDUPLEX:
+	case SNDCTL_DSP_PROFILE:
+		IOCTL_RETURN(0, NULL);
+
+	default:
+		warn_os(os, "unknown ioctl 0x%x", cmd);
+		ret = -EINVAL;
+		goto err;
+	}
+	assert(0);	/* control shouldn't reach here */
+err:
+	fuse_reply_err(req, -ret);
+}
+
+#ifdef OSSP_MMAP
+static int dsp_mmap_dir(int prot)
+{
+	if (!(prot & PROT_WRITE))
+		return REC;
+	return PLAY;
+}
+
+static void dsp_mmap(fuse_req_t req, void *addr, size_t len, int prot,
+		     int flags, off_t offset, struct fuse_file_info *fi,
+		     uint64_t mh)
+{
+	int dir = dsp_mmap_dir(prot);
+	struct ossp_dsp_mmap_arg arg = { };
+	struct ossp_stream *os;
+	struct ossp_dsp_stream *dsps;
+	ssize_t ret;
+
+	os = find_os(fi->fh);
+	if (!os) {
+		fuse_reply_err(req, EBADF);
+		return;
+	}
+	dsps = os_to_dsps(os);
+
+	if (!os->mmap_off || len > os->mmap_size / 2) {
+		fuse_reply_err(req, EINVAL);
+		return;
+	}
+
+	pthread_mutex_lock(&os->mmap_mutex);
+
+	ret = -EBUSY;
+	if (dsps->mmapped & (1 << dir))
+		goto out_unlock;
+
+	arg.dir = dir;
+	arg.size = len;
+
+	ret = exec_simple_cmd(os, OSSP_DSP_MMAP, &arg, NULL);
+	if (ret == 0)
+		dsps->mmapped |= 1 << dir;
+
+out_unlock:
+	pthread_mutex_unlock(&os->mmap_mutex);
+
+	if (ret == 0)
+		fuse_reply_mmap(req, os->mmap_off + dir * os->mmap_size / 2, 0);
+	else
+		fuse_reply_err(req, -ret);
+}
+
+static void dsp_munmap(fuse_req_t req, size_t len, struct fuse_file_info *fi,
+		       off_t offset, uint64_t mh)
+{
+	struct ossp_stream *os;
+	struct ossp_dsp_stream *dsps;
+	int dir, rc;
+
+	os = find_os(fi->fh);
+	if (!os)
+		goto out;
+	dsps = os_to_dsps(os);
+
+	pthread_mutex_lock(&os->mmap_mutex);
+
+	for (dir = 0; dir < 2; dir++)
+		if (offset == os->mmap_off + dir * os->mmap_size / 2)
+			break;
+	if (dir == 2 || len > os->mmap_size / 2) {
+		warn_os(os, "invalid munmap request "
+			"offset=%llu len=%zu mmapped=0x%x",
+			(unsigned long long)offset, len, dsps->mmapped);
+		goto out_unlock;
+	}
+
+	rc = exec_simple_cmd(os, OSSP_DSP_MUNMAP, &dir, NULL);
+	if (rc)
+		warn_ose(os, rc, "MUNMAP failed for dir=%d", dir);
+
+	dsps->mmapped &= ~(1 << dir);
+
+out_unlock:
+	pthread_mutex_unlock(&os->mmap_mutex);
+out:
+	fuse_reply_none(req);
+}
+#endif
+
+
+/***************************************************************************
+ * Notify poller
+ */
+
+static void *notify_poller(void *arg)
+{
+	struct epoll_event events[1024];
+	int i, nfds;
+
+repeat:
+	nfds = epoll_wait(notify_epfd, events, ARRAY_SIZE(events), -1);
+	for (i = 0; i < nfds; i++) {
+		int do_notify = 0;
+		struct ossp_stream *os;
+		struct ossp_notify notify;
+		ssize_t ret;
+
+		os = find_os_by_notify_rx(events[i].data.fd);
+		if (!os) {
+			err("can't find stream for notify_rx fd %d",
+			    events[i].data.fd);
+			epoll_ctl(notify_epfd, EPOLL_CTL_DEL, events[i].data.fd,
+				  NULL);
+			/* we don't know what's going on, don't close the fd */
+			continue;
+		}
+
+		while ((ret = read(os->notify_rx,
+				   &notify, sizeof(notify))) > 0) {
+			if (os->dead)
+				continue;
+			if (ret != sizeof(notify)) {
+				warn_os(os, "short read on notify_rx (%zu, "
+					"expected %zu), killing the stream",
+					ret, sizeof(notify));
+				os->dead = 1;
+				break;
+			}
+			if (notify.magic != OSSP_NOTIFY_MAGIC) {
+				warn_os(os, "invalid magic on notification, "
+					"killing the stream");
+				os->dead = 1;
+				break;
+			}
+
+			if (notify.opcode >= OSSP_NR_NOTIFY_OPCODES)
+				goto unknown;
+
+			dbg1_os(os, "NOTIFY %s", ossp_notify_str[notify.opcode]);
+
+			switch (notify.opcode) {
+			case OSSP_NOTIFY_POLL:
+				do_notify = 1;
+				break;
+			case OSSP_NOTIFY_OBITUARY:
+				os->dead = 1;
+				break;
+			case OSSP_NOTIFY_VOLCHG:
+				pthread_mutex_lock(&mixer_mutex);
+				os->mixer->modify_counter++;
+				pthread_mutex_unlock(&mixer_mutex);
+				break;
+			default:
+			unknown:
+				warn_os(os, "unknown notification %d",
+					notify.opcode);
+			}
+		}
+		if (ret == 0)
+			os->dead = 1;
+		else if (ret < 0 && errno != EAGAIN) {
+			warn_ose(os, -errno, "read fail on notify fd");
+			os->dead = 1;
+		}
+
+		if (!do_notify && !os->dead)
+			continue;
+
+		pthread_mutex_lock(&mutex);
+
+		if (os->ph) {
+			fuse_lowlevel_notify_poll(os->ph);
+			fuse_pollhandle_destroy(os->ph);
+			os->ph = NULL;
+		}
+
+		if (os->dead) {
+			dbg0_os(os, "removing %d from notify poll list",
+				os->notify_rx);
+			epoll_ctl(notify_epfd, EPOLL_CTL_DEL, os->notify_rx,
+				  NULL);
+			close(os->notify_rx);
+			os->notify_rx = -1;
+			pthread_cond_broadcast(&notify_poller_kill_wait);
+		}
+
+		pthread_mutex_unlock(&mutex);
+	}
+	goto repeat;
+}
+
+
+/***************************************************************************
+ * Slave corpse reaper
+ */
+
+static void *slave_reaper(void *arg)
+{
+	struct ossp_stream *os;
+	int status;
+	pid_t pid;
+
+	pthread_mutex_lock(&mutex);
+repeat:
+	while (list_empty(&slave_corpse_list))
+		pthread_cond_wait(&slave_reaper_wait, &mutex);
+
+	os = list_first_entry(&slave_corpse_list, struct ossp_stream, link);
+	list_del_init(&os->link);
+
+	pthread_mutex_unlock(&mutex);
+
+	do {
+		pid = waitpid(os->slave_pid, &status, 0);
+	} while (pid < 0 && errno == EINTR);
+
+	if (pid < 0) {
+		if (errno == ECHILD)
+			warn_ose(os, -errno, "slave %d already gone?",
+				 os->slave_pid);
+		else
+			fatal_e(-errno, "waitpid(%d) failed", os->slave_pid);
+	}
+
+	pthread_mutex_lock(&mutex);
+
+	dbg1_os(os, "slave %d reaped", os->slave_pid);
+	__clear_bit(os->id, os_id_bitmap);
+	free(os);
+
+	goto repeat;
+}
+
+
+/***************************************************************************
+ * Stuff to bind and start everything
+ */
+
+static void ossp_daemonize(void)
+{
+	int fd, pfd[2];
+	pid_t pid;
+	ssize_t ret;
+	int err;
+
+	fd = open("/dev/null", O_RDWR);
+	if (fd >= 0) {
+		dup2(fd, 0);
+		dup2(fd, 1);
+		dup2(fd, 2);
+		if (fd > 2)
+			close(fd);
+	}
+
+	if (pipe(pfd))
+		fatal_e(-errno, "failed to create pipe for init wait");
+
+	if (fcntl(pfd[0], F_SETFD, FD_CLOEXEC) < 0 ||
+	    fcntl(pfd[1], F_SETFD, FD_CLOEXEC) < 0)
+		fatal_e(-errno, "failed to set CLOEXEC on init wait pipe");
+
+	pid = fork();
+	if (pid < 0)
+		fatal_e(-errno, "failed to fork for daemon");
+
+	if (pid == 0) {
+		close(pfd[0]);
+		init_wait_fd = pfd[1];
+
+		/* be evil, my child */
+		chdir("/");
+		setsid();
+		return;
+	}
+
+	/* wait for init completion and pass over success indication */
+	close(pfd[1]);
+
+	do {
+		ret = read(pfd[0], &err, sizeof(err));
+	} while (ret < 0 && errno == EINTR);
+
+	if (ret == sizeof(err) && err == 0)
+		exit(0);
+
+	fatal("daemon init failed ret=%zd err=%d", ret, err);
+	exit(1);
+}
+
+static void ossp_init_done(void *userdata)
+{
+	/* init complete, notify parent if it's waiting */
+	if (init_wait_fd >= 0) {
+		ssize_t ret;
+		int err = 0;
+
+		ret = write(init_wait_fd, &err, sizeof(err));
+		if (ret != sizeof(err))
+			fatal_e(-errno, "failed to notify init completion, "
+				"ret=%zd", ret);
+		close(init_wait_fd);
+		init_wait_fd = -1;
+	}
+}
+
+static const struct cuse_lowlevel_ops mixer_ops = {
+	.open			= mixer_open,
+	.release		= mixer_release,
+	.ioctl			= mixer_ioctl,
+};
+
+static const struct cuse_lowlevel_ops dsp_ops = {
+	.init_done		= ossp_init_done,
+	.open			= dsp_open,
+	.release		= dsp_release,
+	.read			= dsp_read,
+	.write			= dsp_write,
+	.poll			= dsp_poll,
+	.ioctl			= dsp_ioctl,
+#ifdef OSSP_MMAP
+	.mmap			= dsp_mmap,
+	.munmap			= dsp_munmap,
+#endif
+};
+
+static const struct cuse_lowlevel_ops adsp_ops = {
+	.open			= adsp_open,
+	.release		= dsp_release,
+	.read			= dsp_read,
+	.write			= dsp_write,
+	.poll			= dsp_poll,
+	.ioctl			= dsp_ioctl,
+#ifdef OSSP_MMAP
+	.mmap			= dsp_mmap,
+	.munmap			= dsp_munmap,
+#endif
+};
+
+static const char *usage =
+"usage: osspd [options]\n"
+"\n"
+"options:\n"
+"    --help            print this help message\n"
+"    --dsp=NAME        DSP device name (default dsp)\n"
+"    --dsp-maj=MAJ     DSP device major number (default 14)\n"
+"    --dsp-min=MIN     DSP device minor number (default 3)\n"
+"    --adsp=NAME       Aux DSP device name (default adsp, blank to disable)\n"
+"    --adsp-maj=MAJ    Aux DSP device major number (default 14)\n"
+"    --adsp-min=MIN    Aux DSP device minor number (default 12)\n"
+"    --mixer=NAME      mixer device name (default mixer, blank to disable)\n"
+"    --mixer-maj=MAJ   mixer device major number (default 14)\n"
+"    --mixer-min=MIN   mixer device minor number (default 0)\n"
+"    --max=MAX         maximum number of open streams (default 256)\n"
+"    --umax=MAX        maximum number of open streams per UID (default --max)\n"
+"    --exit-on-idle    exit if idle\n"
+"    --dsp-slave=PATH  DSP slave (default ossp-padsp in the same dir)\n"
+"    --log=LEVEL       log level (0..6)\n"
+"    --timestamp       timestamp log messages\n"
+"    -v                increase verbosity, can be specified multiple times\n"
+"    -f                Run in foreground (don't daemonize)\n"
+"\n";
+
+struct ossp_param {
+	char			*dsp_name;
+	unsigned		dsp_major;
+	unsigned		dsp_minor;
+	char			*adsp_name;
+	unsigned		adsp_major;
+	unsigned		adsp_minor;
+	char			*mixer_name;
+	unsigned		mixer_major;
+	unsigned		mixer_minor;
+	unsigned		max_streams;
+	unsigned		umax_streams;
+	char			*dsp_slave_path;
+	unsigned		log_level;
+	int			exit_on_idle;
+	int			timestamp;
+	int			fg;
+	int			help;
+};
+
+#define OSSP_OPT(t, p) { t, offsetof(struct ossp_param, p), 1 }
+
+static const struct fuse_opt ossp_opts[] = {
+	OSSP_OPT("--dsp=%s",		dsp_name),
+	OSSP_OPT("--dsp-maj=%u",	dsp_major),
+	OSSP_OPT("--dsp-min=%u",	dsp_minor),
+	OSSP_OPT("--adsp=%s",		adsp_name),
+	OSSP_OPT("--adsp-maj=%u",	adsp_major),
+	OSSP_OPT("--adsp-min=%u",	adsp_minor),
+	OSSP_OPT("--mixer=%s",		mixer_name),
+	OSSP_OPT("--mixer-maj=%u",	mixer_major),
+	OSSP_OPT("--mixer-min=%u",	mixer_minor),
+	OSSP_OPT("--max=%u",		max_streams),
+	OSSP_OPT("--umax=%u",		umax_streams),
+	OSSP_OPT("--exit-on-idle",	exit_on_idle),
+	OSSP_OPT("--dsp-slave=%s",	dsp_slave_path),
+	OSSP_OPT("--timestamp",		timestamp),
+	OSSP_OPT("--log=%u",		log_level),
+	OSSP_OPT("-f",			fg),
+	FUSE_OPT_KEY("-h",		0),
+	FUSE_OPT_KEY("--help",		0),
+	FUSE_OPT_KEY("-v",		1),
+	FUSE_OPT_END
+};
+
+static struct fuse_session *setup_ossp_cuse(const struct cuse_lowlevel_ops *ops,
+					    const char *name, int major,
+					    int minor, int argc, char **argv)
+{
+	char name_buf[128];
+	const char *bufp = name_buf;
+	struct cuse_info ci = { .dev_major = major, .dev_minor = minor,
+				.dev_info_argc = 1, .dev_info_argv = &bufp,
+				.flags = CUSE_UNRESTRICTED_IOCTL };
+	struct fuse_session *se;
+	int fd;
+
+	snprintf(name_buf, sizeof(name_buf), "DEVNAME=%s", name);
+
+	se = cuse_lowlevel_setup(argc, argv, &ci, ops, NULL, NULL);
+	if (!se) {
+		err("failed to setup %s CUSE", name);
+		return NULL;
+	}
+
+	fd = fuse_chan_fd(fuse_session_next_chan(se, NULL));
+	if (
+#ifdef OSSP_MMAP
+		fd != fuse_mmap_fd(se) &&
+#endif
+		fcntl(fd, F_SETFD, FD_CLOEXEC) < 0) {
+		err_e(-errno, "failed to set CLOEXEC on %s CUSE fd", name);
+		cuse_lowlevel_teardown(se);
+		return NULL;
+	}
+
+	return se;
+}
+
+static void *cuse_worker(void *arg)
+{
+	struct fuse_session *se = arg;
+	int rc;
+
+	rc = fuse_session_loop_mt(se);
+	cuse_lowlevel_teardown(se);
+
+	return (void *)(unsigned long)rc;
+}
+
+static int process_arg(void *data, const char *arg, int key,
+		       struct fuse_args *outargs)
+{
+	struct ossp_param *param = data;
+
+	switch (key) {
+	case 0:
+		fprintf(stderr, usage);
+		param->help = 1;
+		return 0;
+	case 1:
+		param->log_level++;
+		return 0;
+	}
+	return 1;
+}
+
+int main(int argc, char **argv)
+{
+	static struct ossp_param param = {
+		.dsp_name = DFL_DSP_NAME,
+		.dsp_major = DFL_DSP_MAJOR, .dsp_minor = DFL_DSP_MINOR,
+		.adsp_name = DFL_ADSP_NAME,
+		.adsp_major = DFL_ADSP_MAJOR, .adsp_minor = DFL_ADSP_MINOR,
+		.mixer_name = DFL_MIXER_NAME,
+		.mixer_major = DFL_MIXER_MAJOR, .mixer_minor = DFL_MIXER_MINOR,
+		.max_streams = DFL_MAX_STREAMS,
+	};
+	struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
+	char path_buf[PATH_MAX], *dir;
+	char adsp_buf[64] = "", mixer_buf[64] = "";
+	struct sigaction sa;
+	struct stat stat_buf;
+	ssize_t ret;
+	unsigned u;
+
+	snprintf(ossp_log_name, sizeof(ossp_log_name), "osspd");
+	param.log_level = ossp_log_level;
+
+	if (fuse_opt_parse(&args, &param, ossp_opts, process_arg))
+		fatal("failed to parse arguments");
+
+	if (param.help)
+		return 0;
+
+	max_streams = param.max_streams;
+	hashtbl_size = max_streams / 2 + 13;
+
+	umax_streams = max_streams;
+	if (param.umax_streams)
+		umax_streams = param.umax_streams;
+	if (param.log_level > OSSP_LOG_MAX)
+		param.log_level = OSSP_LOG_MAX;
+	if (!param.fg)
+		param.log_level = -param.log_level;
+	ossp_log_level = param.log_level;
+	ossp_log_timestamp = param.timestamp;
+
+	if (!param.fg)
+		ossp_daemonize();
+
+	/* daemonization already handled, prevent forking inside FUSE */
+	fuse_opt_add_arg(&args, "-f");
+
+	info("OSS Proxy v%s (C) 2008-2010 by Tejun Heo <teheo@suse.de>",
+	     OSSP_VERSION);
+
+	/* ignore stupid SIGPIPEs */
+	memset(&sa, 0, sizeof(sa));
+	sa.sa_handler = SIG_IGN;
+	if (sigaction(SIGPIPE, &sa, NULL))
+		fatal_e(-errno, "failed to ignore SIGPIPE");
+
+//#ifdef GIOVANNI
+	/* determine slave path and check for availability */
+	ret = readlink("/proc/self/exe", path_buf, PATH_MAX - 1);
+	if (ret < 0)
+		fatal_e(-errno, "failed to determine executable path");
+	path_buf[ret] = '\0';
+	dir = dirname(path_buf);
+
+	if (param.dsp_slave_path) {
+		strncpy(dsp_slave_path, param.dsp_slave_path, PATH_MAX - 1);
+		dsp_slave_path[PATH_MAX - 1] = '\0';
+	} else {
+		ret = snprintf(dsp_slave_path, PATH_MAX, "%s/%s",
+			       dir, "ossp-padsp");
+		if (ret >= PATH_MAX)
+			fatal("dsp slave pathname too long");
+	}
+
+	if (stat(dsp_slave_path, &stat_buf))
+		fatal_e(-errno, "failed to stat %s", dsp_slave_path);
+	if (!S_ISREG(stat_buf.st_mode) || !(stat_buf.st_mode & 0444))
+		fatal("%s is not executable", dsp_slave_path);
+
+//#endif// GIOVANNI
+	/* allocate tables */
+	os_id_bitmap = calloc(BITS_TO_LONGS(max_streams), sizeof(long));
+	mixer_tbl = calloc(hashtbl_size, sizeof(mixer_tbl[0]));
+	os_tbl = calloc(hashtbl_size, sizeof(os_tbl[0]));
+	os_pgrp_tbl = calloc(hashtbl_size, sizeof(os_pgrp_tbl[0]));
+	os_notify_tbl = calloc(hashtbl_size, sizeof(os_notify_tbl[0]));
+	if (!os_id_bitmap || !mixer_tbl || !os_tbl || !os_pgrp_tbl ||
+	    !os_notify_tbl)
+		fatal("failed to allocate stream hash tables");
+	for (u = 0; u < hashtbl_size; u++) {
+		INIT_LIST_HEAD(&mixer_tbl[u]);
+		INIT_LIST_HEAD(&os_tbl[u]);
+		INIT_LIST_HEAD(&os_pgrp_tbl[u]);
+		INIT_LIST_HEAD(&os_notify_tbl[u]);
+	}
+	__set_bit(0, os_id_bitmap);	/* don't use id 0 */
+
+	/* create mixer delayed reference worker */
+	ret = -pthread_create(&mixer_delayed_put_thread, NULL,
+			      mixer_delayed_put_worker, NULL);
+	if (ret)
+		fatal_e(ret, "failed to create mixer delayed put worker");
+
+	/* if exit_on_idle, touch mixer for pgrp0 */
+	exit_on_idle = param.exit_on_idle;
+	if (exit_on_idle) {
+		struct ossp_mixer *mixer;
+
+		mixer = get_mixer(0);
+		if (!mixer)
+			fatal("failed to touch idle mixer");
+		put_mixer(mixer);
+	}
+
+	/* create notify epoll and kick off watcher thread */
+	notify_epfd = epoll_create(max_streams);
+	if (notify_epfd < 0)
+		fatal_e(-errno, "failed to create notify epoll");
+	if (fcntl(notify_epfd, F_SETFD, FD_CLOEXEC) < 0)
+		fatal_e(-errno, "failed to set CLOEXEC on notify epfd");
+
+	ret = -pthread_create(&notify_poller_thread, NULL, notify_poller, NULL);
+	if (ret)
+		fatal_e(ret, "failed to create notify poller thread");
+
+	/* create reaper for slave corpses */
+	ret = -pthread_create(&slave_reaper_thread, NULL, slave_reaper, NULL);
+	if (ret)
+		fatal_e(ret, "failed to create slave reaper thread");
+
+#ifdef GIOVANNI
+	/* we're set, let's setup fuse structures */
+	if (strlen(param.mixer_name))
+		mixer_se = setup_ossp_cuse(&mixer_ops, param.mixer_name,
+					   param.mixer_major, param.mixer_minor,
+					   args.argc, args.argv);
+	if (strlen(param.adsp_name))
+		adsp_se = setup_ossp_cuse(&dsp_ops, param.adsp_name,
+					  param.adsp_major, param.adsp_minor,
+					  args.argc, args.argv);
+
+#endif// GIOVANNI
+	dsp_se = setup_ossp_cuse(&dsp_ops, param.dsp_name,
+				 param.dsp_major, param.dsp_minor,
+				 args.argc, args.argv);
+	if (!dsp_se)
+		fatal("can't create dsp, giving up");
+
+#ifdef GIOVANNI
+	if (mixer_se)
+		snprintf(mixer_buf, sizeof(mixer_buf), ", %s (%d:%d)",
+			 param.mixer_name, param.mixer_major, param.mixer_minor);
+	if (adsp_se)
+		snprintf(adsp_buf, sizeof(adsp_buf), ", %s (%d:%d)",
+			 param.adsp_name, param.adsp_major, param.adsp_minor);
+
+#endif// GIOVANNI
+	info("Creating %s (%d:%d)%s%s", param.dsp_name, param.dsp_major,
+	     param.dsp_minor, adsp_buf, mixer_buf);
+
+#ifdef GIOVANNI
+	/* start threads for mixer and adsp */
+	if (mixer_se) {
+		ret = -pthread_create(&cuse_mixer_thread, NULL,
+				      cuse_worker, mixer_se);
+		if (ret)
+			err_e(ret, "failed to create mixer worker");
+	}
+	if (adsp_se) {
+		ret = -pthread_create(&cuse_adsp_thread, NULL,
+				      cuse_worker, adsp_se);
+		if (ret)
+			err_e(ret, "failed to create adsp worker");
+	}
+#endif// GIOVANNI
+
+	/* run CUSE for /dev/dsp in the main thread */
+	ret = (ssize_t)cuse_worker(dsp_se);
+	if (ret < 0)
+		fatal("dsp worker failed");
+	return 0;
+}
diff --git a/src/mod/endpoints/mod_skypopen/skypopen.h b/src/mod/endpoints/mod_skypopen/skypopen.h
index f24eacbb46..2f1c8e48e9 100644
--- a/src/mod/endpoints/mod_skypopen/skypopen.h
+++ b/src/mod/endpoints/mod_skypopen/skypopen.h
@@ -75,7 +75,9 @@
 #define MY_EVENT_INCOMING_RAW "skypopen::incoming_raw"
 
 #define SAMPLERATE_SKYPOPEN 16000
-#define SAMPLES_PER_FRAME SAMPLERATE_SKYPOPEN/50
+#define MS_SKYPOPEN 20
+#define SAMPLES_PER_FRAME (SAMPLERATE_SKYPOPEN/(1000/MS_SKYPOPEN))
+#define BYTES_PER_FRAME (SAMPLES_PER_FRAME * sizeof(short))
 
 #ifdef SKYPOPEN_C_VER
 #ifdef MODSKYPOPEN_C_VER
@@ -339,6 +341,7 @@ struct private_object {
 	chat_t chats[MAX_CHATS];
 	uint32_t report_incoming_chatmessages;
 	switch_timer_t timer_read;
+	switch_timer_t timer_read_srv;
 	switch_timer_t timer_write;
 	int begin_to_write;
 	int begin_to_read;
diff --git a/src/mod/endpoints/mod_skypopen/skypopen_protocol.c b/src/mod/endpoints/mod_skypopen/skypopen_protocol.c
index 5c61ee6cec..391a23caaf 100644
--- a/src/mod/endpoints/mod_skypopen/skypopen_protocol.c
+++ b/src/mod/endpoints/mod_skypopen/skypopen_protocol.c
@@ -547,6 +547,9 @@ int skypopen_signaling_read(private_t *tech_pvt)
 							if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next) {
 								switch_core_timer_sync(&tech_pvt->timer_read);
 							}
+							if (tech_pvt->timer_read_srv.timer_interface && tech_pvt->timer_read_srv.timer_interface->timer_next) {
+								switch_core_timer_sync(&tech_pvt->timer_read_srv);
+							}
 							switch_mutex_unlock(tech_pvt->mutex_audio_srv);
 						}
 
@@ -846,7 +849,7 @@ void *skypopen_do_tcp_srv_thread_func(void *obj)
 		if (!(running && tech_pvt->running))
 			break;
 		FD_ZERO(&fsgio);
-		togio.tv_usec = 20000;	//20msec
+		togio.tv_usec = MS_SKYPOPEN * 1000;
 		togio.tv_sec = 0;
 		fdselectgio = s;
 		FD_SET(fdselectgio, &fsgio);
@@ -878,7 +881,7 @@ void *skypopen_do_tcp_srv_thread_func(void *obj)
 						   || tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD || tech_pvt->skype_callflow == SKYPOPEN_STATE_UP)) {
 
 					unsigned int fdselect;
-					int rt;
+					int rt=1;
 					fd_set fs;
 					struct timeval to;
 					int nospace;
@@ -888,14 +891,17 @@ void *skypopen_do_tcp_srv_thread_func(void *obj)
 					fdselect = fd;
 					FD_ZERO(&fs);
 					FD_SET(fdselect, &fs);
-					to.tv_usec = 60000;	//60 msec
+					to.tv_usec = MS_SKYPOPEN * 1000 * 3;
 					to.tv_sec = 0;
 
-					rt = select(fdselect + 1, &fs, NULL, NULL, &to);
+					if (tech_pvt->timer_read_srv.timer_interface && tech_pvt->timer_read_srv.timer_interface->timer_next) {
+						switch_core_timer_next(&tech_pvt->timer_read_srv);
+					}
+					//rt = select(fdselect + 1, &fs, NULL, NULL, &to);
 					if (rt > 0) {
 
 						if (tech_pvt->skype_callflow != CALLFLOW_STATUS_REMOTEHOLD) {
-							len = recv(fd, (char *) srv_in, 640, 0);
+							len = recv(fd, (char *) srv_in, BYTES_PER_FRAME, 0);
 						} else {
 							skypopen_sleep(10000);
 							continue;
@@ -916,13 +922,15 @@ void *skypopen_do_tcp_srv_thread_func(void *obj)
 							if (tech_pvt->read_buffer) {
 								if (switch_buffer_freespace(tech_pvt->read_buffer) < len) {
 									switch_buffer_zero(tech_pvt->read_buffer);
+									switch_buffer_write(tech_pvt->read_buffer, srv_in, len);
 									nospace = 1;
+								} else {
+									switch_buffer_write(tech_pvt->read_buffer, srv_in, len);
 								}
-								switch_buffer_write(tech_pvt->read_buffer, srv_in, len);
 							}
 							switch_mutex_unlock(tech_pvt->mutex_audio_srv);
 							if (nospace) {
-								DEBUGA_SKYPE("NO SPACE READ: there was no space for: %d\n", SKYPOPEN_P_LOG, len);
+								WARNINGA("NO SPACE READ: there was no space for: %d\n", SKYPOPEN_P_LOG, len);
 							}
 						} else if (len == 0) {
 							DEBUGA_SKYPE("CLOSED\n", SKYPOPEN_P_LOG);
@@ -1005,7 +1013,7 @@ void *skypopen_do_tcp_cli_thread_func(void *obj)
 		if (!(running && tech_pvt->running))
 			break;
 		FD_ZERO(&fsgio);
-		togio.tv_usec = 60000;	//60msec
+		togio.tv_usec = MS_SKYPOPEN * 1000 * 3;	
 		togio.tv_sec = 0;
 		fdselectgio = s;
 		FD_SET(fdselectgio, &fsgio);
@@ -1048,7 +1056,7 @@ void *skypopen_do_tcp_cli_thread_func(void *obj)
 
 					if (tech_pvt->begin_to_write == 0) {
 						memset(cli_out, 255, sizeof(cli_out));
-						bytes_to_write = 640;
+						bytes_to_write = BYTES_PER_FRAME;
 						len = send(fd, (char *) cli_out, bytes_to_write, 0);
 						if (len == -1) {
 							DEBUGA_SKYPE("len=%d, error: %s\n", SKYPOPEN_P_LOG, len, strerror(errno));
@@ -1065,14 +1073,14 @@ void *skypopen_do_tcp_cli_thread_func(void *obj)
 						}
 						switch_mutex_lock(tech_pvt->mutex_audio_cli);
 						if (tech_pvt->write_buffer && switch_buffer_inuse(tech_pvt->write_buffer)) {
-							bytes_to_write = switch_buffer_read(tech_pvt->write_buffer, cli_out, 640);
+							bytes_to_write = switch_buffer_read(tech_pvt->write_buffer, cli_out, BYTES_PER_FRAME);
 						}
 						switch_mutex_unlock(tech_pvt->mutex_audio_cli);
 
 						if (!bytes_to_write) {
 							if (tech_pvt->write_silence_when_idle) {
 								memset(cli_out, 255, sizeof(cli_out));
-								bytes_to_write = 640;
+								bytes_to_write = BYTES_PER_FRAME;
 								//DEBUGA_SKYPE("WRITE Silence!\n", SKYPOPEN_P_LOG);
 							} else {
 								continue;
@@ -1118,8 +1126,12 @@ int skypopen_senddigit(private_t *tech_pvt, char digit)
 	char msg_to_skype[1024];
 
 	DEBUGA_SKYPE("DIGIT received: %c\n", SKYPOPEN_P_LOG, digit);
-	sprintf(msg_to_skype, "SET CALL %s DTMF %c", tech_pvt->skype_call_id, digit);
-	skypopen_signaling_write(tech_pvt, msg_to_skype);
+	if(digit != 'a' && digit != 'A'  && digit != 'b' && digit != 'B' && digit != 'c' && digit != 'C' && digit != 'd' && digit != 'D'){
+		sprintf(msg_to_skype, "SET CALL %s DTMF %c", tech_pvt->skype_call_id, digit);
+		skypopen_signaling_write(tech_pvt, msg_to_skype);
+	} else {
+		WARNINGA("Received DTMF DIGIT \"%c\", but not relayed to Skype client because Skype client accepts only 0-9*#\n", SKYPOPEN_P_LOG, digit);
+	}
 
 	return 0;
 }
diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 4396b027ad..7809b62d0e 100644
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -3989,7 +3989,26 @@ static switch_call_cause_t sofia_outgoing_channel(switch_core_session_t *session
 	switch_channel_set_variable_printf(nchannel, "sip_local_network_addr", "%s", profile->extsipip ? profile->extsipip : profile->sipip);
 	switch_channel_set_variable(nchannel, "sip_profile_name", profile_name);
 
-	switch_split_user_domain(switch_core_session_strdup(nsession, tech_pvt->dest), NULL, &tech_pvt->remote_ip);
+	if (switch_stristr("fs_path", tech_pvt->dest)) {
+		char *remote_host = NULL;
+		const char *s;
+		
+		if ((s = switch_stristr("fs_path=", tech_pvt->dest))) {
+			s += 8;
+		}
+
+		if (s) {
+			remote_host = switch_core_session_strdup(nsession, s);
+			switch_url_decode(remote_host);
+		}
+		if (!zstr(remote_host)) {
+			switch_split_user_domain(remote_host, NULL, &tech_pvt->remote_ip);
+		}
+	} 
+
+	if (zstr(tech_pvt->remote_ip)) {
+		switch_split_user_domain(switch_core_session_strdup(nsession, tech_pvt->dest), NULL, &tech_pvt->remote_ip);
+	}
 
 	if (dest_to) {
 		if (strchr(dest_to, '@')) {
@@ -4025,7 +4044,7 @@ static switch_call_cause_t sofia_outgoing_channel(switch_core_session_t *session
 			dest_num = p + 5;
 		}
 	}
-#endif
+
 
 	if (profile->pres_type) {
 		char *sql;
@@ -4046,6 +4065,7 @@ static switch_call_cause_t sofia_outgoing_channel(switch_core_session_t *session
 		sofia_glue_actually_execute_sql(profile, sql, profile->ireg_mutex);
 		switch_safe_free(sql);
 	}
+#endif
 
 	caller_profile = switch_caller_profile_clone(nsession, outbound_profile);
 
diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.h b/src/mod/endpoints/mod_sofia/mod_sofia.h
index 756f153916..33142583a2 100644
--- a/src/mod/endpoints/mod_sofia/mod_sofia.h
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.h
@@ -224,6 +224,7 @@ typedef enum {
 	PFLAG_IN_DIALOG_CHAT,
 	PFLAG_DEL_SUBS_ON_REG,
 	PFLAG_IGNORE_183NOSDP,
+	PFLAG_PRESENCE_PROBE_ON_REGISTER,
 	/* No new flags below this line */
 	PFLAG_MAX
 } PFLAGS;
@@ -957,6 +958,7 @@ void sofia_presence_event_thread_start(void);
 void sofia_reg_expire_call_id(sofia_profile_t *profile, const char *call_id, int reboot);
 switch_status_t sofia_glue_tech_choose_video_port(private_object_t *tech_pvt, int force);
 switch_status_t sofia_glue_tech_set_video_codec(private_object_t *tech_pvt, int force);
+char *sofia_glue_get_register_host(const char *uri);
 const char *sofia_glue_strip_proto(const char *uri);
 switch_status_t reconfig_sofia(sofia_profile_t *profile);
 void sofia_glue_del_gateway(sofia_gateway_t *gp);
diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 5bb2ff0d66..2e13b544d0 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -666,21 +666,32 @@ void sofia_update_callee_id(switch_core_session_t *session, sofia_profile_t *pro
 			}
 		}
 	}
-
+	
 	if (((tmp = switch_channel_get_variable(channel, "effective_callee_id_name")) ||
-		 (tmp = switch_channel_get_variable(channel, "sip_callee_id_name")) ||
-		 (tmp = switch_channel_get_variable(channel, "callee_id_name"))) && !zstr(tmp)) {
+		 (tmp = switch_channel_get_variable(channel, "sip_callee_id_name"))) && !zstr(tmp)) {
 		name = (char *) tmp;
 	}
 
 	if (((tmp = switch_channel_get_variable(channel, "effective_callee_id_number")) ||
-		 (tmp = switch_channel_get_variable(channel, "sip_callee_id_number")) ||
-		 (tmp = switch_channel_get_variable(channel, "callee_id_number"))) && !zstr(tmp)) {
+		 (tmp = switch_channel_get_variable(channel, "sip_callee_id_number"))) && !zstr(tmp)) {
 		number = tmp;
 	}
 
-	if (zstr(name))
+	if (zstr(number)) {
+		if ((tmp = switch_channel_get_variable(channel, "callee_id_number")) && !zstr(tmp)) {
+			number = (char *) tmp;
+		}
+	}
+
+	if (zstr(name)) {
+		if ((tmp = switch_channel_get_variable(channel, "callee_id_name")) && !zstr(tmp)) {
+			name = (char *) tmp;
+		}
+	}
+
+	if (zstr(name)) {
 		name = (char *) number;
+	}
 
 	if (zstr(name) && zstr(number)) {
 		goto end;
@@ -1230,43 +1241,43 @@ static void sofia_perform_profile_start_failure(sofia_profile_t *profile, char *
 void *SWITCH_THREAD_FUNC sofia_profile_worker_thread_run(switch_thread_t *thread, void *obj)
 {
 	sofia_profile_t *profile = (sofia_profile_t *) obj;
-	uint32_t ireg_loops = 0;
-	uint32_t gateway_loops = 0;
-	int loops = 0;
-	uint32_t qsize;
-	void *pop = NULL;
-	int loop_count = 0;
-	switch_size_t sql_len = 1024 * 32;
-	char *tmp, *sqlbuf = NULL;
-	char *sql = NULL;
+	uint32_t ireg_loops = IREG_SECONDS;					/* Number of loop iterations done when we haven't checked for registrations */
+	uint32_t gateway_loops = GATEWAY_SECONDS;			/* Number of loop iterations done when we haven't checked for gateways */
+	void *pop = NULL;					/* queue_pop placeholder */
+	switch_size_t sql_len = 1024 * 32;	/* length of sqlbuf */
+	char *tmp, *sqlbuf = NULL;			/* Buffer for SQL statements */
+	char *sql = NULL;					/* Current SQL statement */
+	switch_time_t last_commit;			/* Last time we committed stuff to the DB */
+	switch_time_t last_check;			/* Last time we did the second-resolution loop that checks various stuff */
+	switch_size_t len = 0;				/* Current length of sqlbuf */
+	uint32_t statements = 0;			/* Number of statements in the current sql buffer */
+	
+	last_commit = last_check = switch_micro_time_now();
 	
 	if (sofia_test_pflag(profile, PFLAG_SQL_IN_TRANS)) {
 		sqlbuf = (char *) malloc(sql_len);
 	}
 
-	ireg_loops = IREG_SECONDS;
-	gateway_loops = GATEWAY_SECONDS;
-
 	sofia_set_pflag_locked(profile, PFLAG_WORKER_RUNNING);
 
 	switch_queue_create(&profile->sql_queue, SOFIA_QUEUE_SIZE, profile->pool);
 
-	qsize = switch_queue_size(profile->sql_queue);
-
-	while ((mod_sofia_globals.running == 1 && sofia_test_pflag(profile, PFLAG_RUNNING)) || qsize) {
+	/* While we're running, or there is a pending sql statment that we haven't appended to sqlbuf yet, because of a lack of buffer space */
+	while ((mod_sofia_globals.running == 1 && sofia_test_pflag(profile, PFLAG_RUNNING)) || sql) {
 		if (sofia_test_pflag(profile, PFLAG_SQL_IN_TRANS)) {
-			if (qsize > 0 && (qsize >= 1024 || ++loop_count >= (int)profile->trans_timeout)) {
-				switch_size_t newlen;
-				uint32_t iterations = 0;
-				switch_size_t len = 0;
-
-				switch_mutex_lock(profile->ireg_mutex);
+			/* Do we have enough statements or is the timeout expired */
+			while (sql || (sofia_test_pflag(profile, PFLAG_RUNNING) && mod_sofia_globals.running == 1 &&
+						switch_micro_time_now() - last_check < 1000000 &&
+				    	(statements == 0 || (statements <= 1024 && (switch_micro_time_now() - last_commit)/1000 < profile->trans_timeout)))) {
 				
-				while (sql || (switch_queue_trypop(profile->sql_queue, &pop) == SWITCH_STATUS_SUCCESS && pop)) {
+				switch_interval_time_t sleepy_time = !statements ? 1000000 : switch_micro_time_now() - last_commit - profile->trans_timeout*1000;
+				
+				if (sql || (switch_queue_pop_timeout(profile->sql_queue, &pop, sleepy_time) == SWITCH_STATUS_SUCCESS && pop)) {
+					switch_size_t newlen;
+					
 					if (!sql) sql = (char *) pop;
 
-					newlen = strlen(sql) + 2;
-					iterations++;
+					newlen = strlen(sql) + 2 /* strlen(";\n") */ ;
 
 					if (len + newlen + 10 > sql_len) {
 						switch_size_t new_mlen = len + newlen + 10 + 10240;
@@ -1280,7 +1291,7 @@ void *SWITCH_THREAD_FUNC sofia_profile_worker_thread_run(switch_thread_t *thread
 							}
 							sqlbuf = tmp;
 						} else {
-							goto skip;
+							break;
 						}
 					}
 
@@ -1288,31 +1299,32 @@ void *SWITCH_THREAD_FUNC sofia_profile_worker_thread_run(switch_thread_t *thread
 					len += newlen;
 					free(sql);
 					sql = NULL;
+					
+					statements++;
 				}
-
-			skip:
-
+			}
+			
+			/* Execute here */
+			last_commit = switch_micro_time_now();
+			
+			if (len) {
 				//printf("TRANS:\n%s\n", sqlbuf);
+				switch_mutex_lock(profile->ireg_mutex);
 				sofia_glue_actually_execute_sql_trans(profile, sqlbuf, NULL);
 				//sofia_glue_actually_execute_sql(profile, "commit;\n", NULL);
 				switch_mutex_unlock(profile->ireg_mutex);
-				loop_count = 0;
+				statements = 0;
+				len = 0;
 			}
+
 		} else {
-			if (qsize) {
-				//switch_mutex_lock(profile->ireg_mutex);
-				while (switch_queue_trypop(profile->sql_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) {
-					sofia_glue_actually_execute_sql(profile, (char *) pop, profile->ireg_mutex);
-					free(pop);
-				}
-				//switch_mutex_unlock(profile->ireg_mutex);
+			if (switch_queue_pop_timeout(profile->sql_queue, &pop, 1000000) == SWITCH_STATUS_SUCCESS && pop) {
+				sofia_glue_actually_execute_sql(profile, (char *) pop, profile->ireg_mutex);
+				free(pop);
 			}
 		}
 
-		if (++loops >= 1000) {
-
-			
-
+		if (switch_micro_time_now() - last_check >= 1000000) {
 			if (profile->watchdog_enabled) {
 				uint32_t event_diff = 0, step_diff = 0, event_fail = 0, step_fail = 0;
 				
@@ -1339,7 +1351,7 @@ void *SWITCH_THREAD_FUNC sofia_profile_worker_thread_run(switch_thread_t *thread
 				if (event_fail || step_fail) {
 					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Profile %s: SIP STACK FAILURE DETECTED!\n"
 									  "GOODBYE CRUEL WORLD, I'M LEAVING YOU TODAY....GOODBYE, GOODBYE, GOOD BYE\n", profile->name);
-					switch_yield(2000);
+					switch_yield(2000000);
 					abort();
 				}
 			}
@@ -1354,12 +1366,11 @@ void *SWITCH_THREAD_FUNC sofia_profile_worker_thread_run(switch_thread_t *thread
 				sofia_reg_check_gateway(profile, switch_epoch_time_now(NULL));
 				gateway_loops = 0;
 			}
+			
 			sofia_sub_check_gateway(profile, time(NULL));
-			loops = 0;
+			
+			last_check = switch_micro_time_now();
 		}
-
-		switch_cond_next();
-		qsize = switch_queue_size(profile->sql_queue);
 	}
 
 	switch_mutex_lock(profile->ireg_mutex);
@@ -2145,6 +2156,30 @@ static void parse_gateways(sofia_profile_t *profile, switch_xml_t gateways_tag)
 				sipip = profile->sipip;
 			}
 
+			gateway->extension = switch_core_strdup(gateway->pool, extension);
+
+
+			if (!strncasecmp(proxy, "sip:", 4)) {
+				gateway->register_proxy = switch_core_strdup(gateway->pool, proxy);
+				gateway->register_to = switch_core_sprintf(gateway->pool, "sip:%s@%s", username, proxy + 4);
+			} else {
+				gateway->register_proxy = switch_core_sprintf(gateway->pool, "sip:%s", proxy);
+				gateway->register_to = switch_core_sprintf(gateway->pool, "sip:%s@%s", username, proxy);
+			}
+
+			/* This checks to make sure we provide the right contact on register for targets behind nat with us. */
+			if (sofia_test_pflag(profile, PFLAG_AUTO_NAT)) {
+				char *register_host = NULL;
+
+				register_host = sofia_glue_get_register_host(gateway->register_proxy);
+
+				if (register_host && switch_is_lan_addr(register_host)) {
+					sipip = profile->sipip;
+				}
+
+				switch_safe_free(register_host);
+			}
+
 			if (extension_in_contact) {
 				format = strchr(sipip, ':') ? "<sip:%s@[%s]:%d%s>" : "<sip:%s@%s:%d%s>";
 				gateway->register_contact = switch_core_sprintf(gateway->pool, format, extension,
@@ -2159,16 +2194,6 @@ static void parse_gateways(sofia_profile_t *profile, switch_xml_t gateways_tag)
 																profile->tls_sip_port : profile->sip_port, params);
 			}
 
-			gateway->extension = switch_core_strdup(gateway->pool, extension);
-
-			if (!strncasecmp(proxy, "sip:", 4)) {
-				gateway->register_proxy = switch_core_strdup(gateway->pool, proxy);
-				gateway->register_to = switch_core_sprintf(gateway->pool, "sip:%s@%s", username, proxy + 4);
-			} else {
-				gateway->register_proxy = switch_core_sprintf(gateway->pool, "sip:%s", proxy);
-				gateway->register_to = switch_core_sprintf(gateway->pool, "sip:%s@%s", username, proxy);
-			}
-
 			gateway->expires_str = switch_core_strdup(gateway->pool, expire_seconds);
 
 			if ((gateway->freq = atoi(gateway->expires_str)) < 5) {
@@ -2380,6 +2405,12 @@ switch_status_t reconfig_sofia(sofia_profile_t *profile)
 						} else {
 							sofia_clear_pflag(profile, PFLAG_IGNORE_183NOSDP);
 						}
+					} else if (!strcasecmp(var, "presence-probe-on-register")) {
+						if (switch_true(val)) {
+							sofia_set_pflag(profile, PFLAG_PRESENCE_PROBE_ON_REGISTER);
+						} else {
+							sofia_clear_pflag(profile, PFLAG_PRESENCE_PROBE_ON_REGISTER);
+						}
 					} else if (!strcasecmp(var, "cid-in-1xx")) {
 						if (switch_true(val)) {
 							sofia_set_pflag(profile, PFLAG_CID_IN_1XX);
@@ -3045,6 +3076,12 @@ switch_status_t config_sofia(int reload, char *profile_name)
 						} else {
 							sofia_clear_pflag(profile, PFLAG_IGNORE_183NOSDP);
 						}
+					} else if (!strcasecmp(var, "presence-probe-on-register")) {
+						if (switch_true(val)) {
+							sofia_set_pflag(profile, PFLAG_PRESENCE_PROBE_ON_REGISTER);
+						} else {
+							sofia_clear_pflag(profile, PFLAG_PRESENCE_PROBE_ON_REGISTER);
+						}
 					} else if (!strcasecmp(var, "cid-in-1xx")) {
 						if (switch_true(val)) {
 							sofia_set_pflag(profile, PFLAG_CID_IN_1XX);
@@ -4395,7 +4432,6 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
 										 contact_host, astate, "outbound", user_agent,
 										 profile->name, mod_sofia_globals.hostname, switch_str_nil(full_contact),
 										 switch_str_nil(presence_id), switch_str_nil(presence_data), switch_str_nil(p));
-
 					switch_assert(sql);
 
 					sofia_glue_actually_execute_sql(profile, sql, profile->ireg_mutex);
@@ -5947,7 +5983,14 @@ void sofia_handle_sip_i_info(nua_t *nua, sofia_profile_t *profile, nua_handle_t
 
 		/* Barf if we didn't get our private */
 		assert(switch_core_session_get_private(session));
-
+		
+		if (sip->sip_content_type && sip->sip_content_type->c_subtype && sip->sip_content_type->c_type &&
+			!strncasecmp(sip->sip_content_type->c_type, "message", 7) &&
+			!strcasecmp(sip->sip_content_type->c_subtype, "update_display")) {
+			sofia_update_callee_id(session, profile, sip, SWITCH_TRUE);
+			goto end;
+		}
+		
 		if (sip && sip->sip_content_type && sip->sip_content_type->c_type && sip->sip_content_type->c_subtype &&
 			sip->sip_payload && sip->sip_payload->pl_data) {
 			if (!strncasecmp(sip->sip_content_type->c_type, "application", 11) && !strcasecmp(sip->sip_content_type->c_subtype, "media_control+xml")) {
@@ -6000,8 +6043,6 @@ void sofia_handle_sip_i_info(nua_t *nua, sofia_profile_t *profile, nua_handle_t
 			} else if (!strncasecmp(sip->sip_content_type->c_type, "application", 11) && !strcasecmp(sip->sip_content_type->c_subtype, "dtmf")) {
 				int tmp = atoi(sip->sip_payload->pl_data);
 				dtmf.digit = switch_rfc2833_to_char(tmp);
-			} else if (!strncasecmp(sip->sip_content_type->c_type, "message", 11) && !strcasecmp(sip->sip_content_type->c_subtype, "update_display")) {
-				sofia_update_callee_id(session, profile, sip, SWITCH_TRUE);
 			} else {
 				goto end;
 			}
@@ -6842,8 +6883,9 @@ void sofia_handle_sip_i_invite(nua_t *nua, sofia_profile_t *profile, nua_handle_
 
 			sql =
 				switch_mprintf
-				("select call_id from sip_dialogs where call_info='%q' and sip_from_user='%q' and sip_from_host='%q' and call_id is not null",
-				 switch_str_nil(p), user, host);
+				("select call_id from sip_dialogs where call_info='%q' and ((sip_from_user='%q' and sip_from_host='%q') or presence_id='%q@%q') "
+				 "and call_id is not null",
+				 switch_str_nil(p), user, host, user, host);
 
 			if ((str = sofia_glue_execute_sql2str(profile, profile->ireg_mutex, sql, cid, sizeof(cid)))) {
 				bnh = nua_handle_by_call_id(nua, str);
@@ -6959,6 +7001,8 @@ void sofia_handle_sip_i_invite(nua_t *nua, sofia_profile_t *profile, nua_handle_
 
 	if (tech_pvt->caller_profile) {
 
+		int first_history_info = 1;
+
 		if (rpid) {
 			if (rpid->rpid_privacy) {
 				if (!strcasecmp(rpid->rpid_privacy, "yes")) {
@@ -7003,7 +7047,25 @@ void sofia_handle_sip_i_invite(nua_t *nua, sofia_profile_t *profile, nua_handle_
 					}
 				}
 			} else if (!strncasecmp(un->un_name, "History-Info", 12)) {
-				switch_channel_set_variable(channel, "sip_history_info", un->un_value);
+				if (first_history_info) {
+					/* If the header exists first time, make sure to remove old info and re-set the variable */
+					switch_channel_set_variable(channel, "sip_history_info", un->un_value);
+					first_history_info = 0;
+				} else {
+					/* Append the History-Info into one long string */
+					const char *history_var = switch_channel_get_variable(channel, "sip_history_info");
+					if (!zstr(history_var)) {
+						char *tmp_str;
+						if ((tmp_str = switch_mprintf("%s, %s", history_var, un->un_value))) {
+							switch_channel_set_variable(channel, "sip_history_info", tmp_str);
+							free(tmp_str);
+						} else {
+							switch_channel_set_variable(channel, "sip_history_info", un->un_value);
+						}
+					} else {
+						switch_channel_set_variable(channel, "sip_history_info", un->un_value);
+					}
+				}
 			} else if (!strcasecmp(un->un_name, "X-FS-Support")) {
 				tech_pvt->x_freeswitch_support_remote = switch_core_session_strdup(session, un->un_value);
 			} else if (!strncasecmp(un->un_name, "X-", 2) || !strncasecmp(un->un_name, "P-", 2)) {
diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index 6e9aacb126..6416778ab0 100644
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -187,7 +187,7 @@ void sofia_glue_set_image_sdp(private_object_t *tech_pvt, switch_t38_options_t *
 
 static void generate_m(private_object_t *tech_pvt, char *buf, size_t buflen, 
 					   switch_port_t port,
-					   int cur_ptime, const char *append_audio, const char *sr, int use_cng, int cng_type, switch_event_t *map)
+					   int cur_ptime, const char *append_audio, const char *sr, int use_cng, int cng_type, switch_event_t *map, int verbose_sdp)
 {
 	int i = 0;
 	int rate;
@@ -298,7 +298,7 @@ static void generate_m(private_object_t *tech_pvt, char *buf, size_t buflen,
 			}
 		}
 		
-		if (tech_pvt->ianacodes[i] > 95) {
+		if (tech_pvt->ianacodes[i] > 95 || verbose_sdp) {
 			switch_snprintf(buf + strlen(buf), buflen - strlen(buf), "a=rtpmap:%d %s/%d\n", tech_pvt->ianacodes[i], imp->iananame, rate);
 		}
 
@@ -373,6 +373,7 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32
 	const char *fmtp_out_var = switch_channel_get_variable(tech_pvt->channel, "sip_force_audio_fmtp");
 	switch_event_t *map = NULL, *ptmap = NULL;
 	const char *b_sdp = NULL;
+	int verbose_sdp = 0;
 
 	sofia_glue_check_dtmf_type(tech_pvt);
 
@@ -396,6 +397,10 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32
 		fmtp_out = fmtp_out_var;
 	}
 
+	if ((val = switch_channel_get_variable(tech_pvt->channel, "verbose_sdp")) && switch_true(val)) {
+		verbose_sdp = 1;
+	}
+
 	if (sofia_test_pflag(tech_pvt->profile, PFLAG_SUPPRESS_CNG) ||
 		((val = switch_channel_get_variable(tech_pvt->channel, "supress_cng")) && switch_true(val)) ||
 		((val = switch_channel_get_variable(tech_pvt->channel, "suppress_cng")) && switch_true(val))) {
@@ -533,7 +538,7 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32
 		}
 
 		if (!switch_true(switch_channel_get_variable(tech_pvt->channel, "sdp_m_per_ptime"))) {
-			generate_m(tech_pvt, buf, sizeof(buf), port, 0, append_audio, sr, use_cng, cng_type, map);
+			generate_m(tech_pvt, buf, sizeof(buf), port, 0, append_audio, sr, use_cng, cng_type, map, verbose_sdp);
 		} else {
 
 			for (i = 0; i < tech_pvt->num_codecs; i++) {
@@ -547,7 +552,7 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32
 				
 				if (cur_ptime != this_ptime) {
 					cur_ptime = this_ptime;
-					generate_m(tech_pvt, buf, sizeof(buf), port, cur_ptime, append_audio, sr, use_cng, cng_type, map);
+					generate_m(tech_pvt, buf, sizeof(buf), port, cur_ptime, append_audio, sr, use_cng, cng_type, map, verbose_sdp);
 				}
 				
 			}
@@ -2668,6 +2673,7 @@ switch_status_t sofia_glue_tech_set_codec(private_object_t *tech_pvt, int force)
 			switch_core_session_lock_codec_write(tech_pvt->session);
 			switch_core_session_lock_codec_read(tech_pvt->session);
 			resetting = 1;
+			switch_yield(tech_pvt->read_impl.microseconds_per_packet);
 			switch_core_codec_destroy(&tech_pvt->read_codec);
 			switch_core_codec_destroy(&tech_pvt->write_codec);
 		} else {
@@ -3727,6 +3733,14 @@ static switch_t38_options_t *tech_process_udptl(private_object_t *tech_pvt, sdp_
 
 	if (!t38_options) {
 		t38_options = switch_core_session_alloc(tech_pvt->session, sizeof(switch_t38_options_t));
+
+		// set some default value
+		t38_options->T38FaxVersion = 0;
+		t38_options->T38MaxBitRate = 9600;
+		t38_options->T38FaxRateManagement = switch_core_session_strdup(tech_pvt->session, "transferredTCF");
+		t38_options->T38FaxUdpEC = switch_core_session_strdup(tech_pvt->session, "t38UDPRedundancy");
+		t38_options->T38FaxMaxBuffer = 500;
+		t38_options->T38FaxMaxDatagram = 500;
 	}
 
 	t38_options->remote_port = (switch_port_t)m->m_port;
@@ -5729,6 +5743,48 @@ char *sofia_glue_execute_sql2str(sofia_profile_t *profile, switch_mutex_t *mutex
 	return ret;
 }
 
+char *sofia_glue_get_register_host(const char *uri)
+{
+	char *register_host = NULL;
+	const char *s;
+	char *p = NULL;
+
+	if (zstr(uri)) {
+		return NULL;
+	}
+
+	if ((s = switch_stristr("sip:", uri))) {
+		s += 4;
+	} else if ((s = switch_stristr("sips:", uri))) {
+		s += 5;
+	}
+
+	if (!s) {
+		return NULL;
+	}
+
+	register_host = strdup(s);
+	
+	/* remove port for register_host for testing nat acl take into account 
+	   ipv6 addresses which are required to have brackets around the addr 
+	*/
+	
+	if ((p = strchr(register_host, ']'))) {
+		if (*(p + 1) == ':') {
+			*(p + 1) = '\0';
+		}
+	} else {
+		if ((p = strrchr(register_host, ':'))) {
+			*p = '\0';
+		}
+	}
+	
+	/* register_proxy should always start with "sip:" or "sips:" */
+	assert(register_host);
+
+	return register_host;
+}
+
 const char *sofia_glue_strip_proto(const char *uri)
 {
 	char *p;
@@ -5978,7 +6034,6 @@ void sofia_glue_tech_simplify(private_object_t *tech_pvt)
 	}
 }
 
-
 void sofia_glue_build_vid_refresh_message(switch_core_session_t *session, const char *pl)
 {
 	switch_core_session_message_t *msg;
diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index dc02ca47ae..143666ceb8 100644
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -86,6 +86,10 @@ switch_status_t sofia_presence_chat_send(const char *proto, const char *from, co
 	char *to_uri = NULL;
 	switch_console_callback_match_t *list = NULL;
 	switch_console_callback_match_node_t *m;
+	char *remote_ip = NULL;
+	char *user_via = NULL;
+	char *contact_str = NULL;
+	char *dup_dest = NULL;
 
 	if (!to) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing To: header.\n");
@@ -181,12 +185,80 @@ switch_status_t sofia_presence_chat_send(const char *proto, const char *from, co
 	
 		/* sofia_glue is running sofia_overcome_sip_uri_weakness we do not, not sure if it matters */
 
+		remote_ip = malloc(sizeof(80));
+		dup_dest = strdup(dst->contact);
+
+		if (switch_stristr("fs_path", dst->contact)) {
+			char *remote_host = NULL;
+			const char *s;
+
+			if ((s = switch_stristr("fs_path=", dst->contact))) {
+				s += 8;
+			}
+			if (s) {
+				remote_host = strdup(s);
+				switch_url_decode(remote_host);
+			}
+			if (!zstr(remote_host)) {
+				switch_split_user_domain(remote_host, NULL, &remote_ip);
+			}
+			switch_safe_free(remote_host);
+		}
+
+		if (zstr(remote_ip)) {
+			switch_split_user_domain(dup_dest, NULL, &remote_ip);
+		}
+
+		if (!zstr(remote_ip) && sofia_glue_check_nat(profile, remote_ip)) {
+			char *ptr = NULL;
+			const char *transport_str = NULL;
+			if ((ptr = sofia_glue_find_parameter(dst->contact, "transport="))) {
+				sofia_transport_t transport = sofia_glue_str2transport(ptr);
+				transport_str = sofia_glue_transport2str(transport);
+				switch (transport) {
+				case SOFIA_TRANSPORT_TCP:
+					contact_str = profile->tcp_public_contact;
+					break;
+				case SOFIA_TRANSPORT_TCP_TLS:
+					contact_str = profile->tls_public_contact;
+					break;
+				default:
+					contact_str = profile->public_url;
+					break;
+				}
+				user_via = sofia_glue_create_external_via(NULL, profile, transport);
+			} else {
+				user_via = sofia_glue_create_external_via(NULL, profile, SOFIA_TRANSPORT_UDP);
+				contact_str = profile->public_url;
+			}
+		} else {
+			contact_str = profile->url;
+		}
+
+		switch_safe_free(dup_dest);
+		free(remote_ip);
+
 		status = SWITCH_STATUS_SUCCESS;
+
 		/* if this cries, add contact here too, change the 1 to 0 and omit the safe_free */
-		msg_nh = nua_handle(profile->nua, NULL, TAG_IF(dst->route_uri, NUTAG_PROXY(dst->route_uri)), TAG_IF(dst->route, SIPTAG_ROUTE_STR(dst->route)),
-							SIPTAG_FROM_STR(from), TAG_IF(contact, NUTAG_URL(contact)), SIPTAG_TO_STR(dst->to), SIPTAG_CONTACT_STR(profile->url), TAG_END());
+
+		msg_nh = nua_handle(profile->nua, NULL,
+							TAG_IF(dst->route_uri, NUTAG_PROXY(dst->route_uri)),
+							TAG_IF(dst->route, SIPTAG_ROUTE_STR(dst->route)),
+							SIPTAG_FROM_STR(from),
+							TAG_IF(contact, NUTAG_URL(contact)),
+							SIPTAG_TO_STR(dst->to),
+							SIPTAG_CONTACT_STR(contact_str),
+							TAG_END());
+
 		nua_handle_bind(msg_nh, &mod_sofia_globals.destroy_private);
-		nua_message(msg_nh, SIPTAG_CONTENT_TYPE_STR(ct), SIPTAG_PAYLOAD_STR(body), TAG_END());
+		
+		nua_message(msg_nh,
+					TAG_IF(user_via, SIPTAG_VIA_STR(user_via)),
+					SIPTAG_CONTENT_TYPE_STR(ct),
+					SIPTAG_PAYLOAD_STR(body),
+					TAG_END());
+
 		sofia_glue_free_destination(dst);
 	}		
 	
@@ -197,6 +269,7 @@ switch_status_t sofia_presence_chat_send(const char *proto, const char *from, co
 	switch_safe_free(contact);
 	switch_safe_free(ffrom);
 	switch_safe_free(dup);
+
 	if (profile) {
 		switch_thread_rwlock_unlock(profile->rwlock);
 	}
@@ -567,7 +640,8 @@ static void actual_sofia_presence_event_handler(switch_event_t *event)
 			}
 
 			if (probe_euser && probe_host && (profile = sofia_glue_find_profile(probe_host))) {
-				sql = switch_mprintf("select status,rpid from sip_dialogs where sip_from_user='%q' and sip_from_host='%q'", probe_euser, probe_host);
+				sql = switch_mprintf("select status,rpid from sip_dialogs where ((sip_from_user='%q' and sip_from_host='%q') or presence_id='%q@%q')", 
+									 probe_euser, probe_host, probe_euser, probe_host);
 				sofia_glue_execute_sql_callback(profile, profile->ireg_mutex, sql, sofia_presence_dialog_callback, &dh);
 
 				h.profile = profile;
@@ -591,9 +665,11 @@ static void actual_sofia_presence_event_handler(switch_event_t *event)
 									 "'%q','%q' "
 
 									 "from sip_registrations left join sip_dialogs on "
-									 "(sip_dialogs.sip_from_user = sip_registrations.sip_user "
-									 "and (sip_dialogs.sip_from_host = sip_registrations.orig_server_host or "
-									 "sip_dialogs.sip_from_host = sip_registrations.sip_host) ) "
+									 "sip_dialogs.presence_id = sip_registrations.sip_user || '@' || sip_registrations.sip_host "
+
+
+									 "or (sip_dialogs.sip_from_user = sip_registrations.sip_user "
+									 "and sip_dialogs.sip_from_host = sip_registrations.sip_host) "
  
 									 "left join sip_presence on "
 									 "(sip_registrations.sip_user=sip_presence.sip_user and sip_registrations.orig_server_host=sip_presence.sip_host and "
@@ -601,7 +677,8 @@ static void actual_sofia_presence_event_handler(switch_event_t *event)
 									 "where sip_dialogs.presence_id='%q@%q' or (sip_registrations.sip_user='%q' and "
 									 "(sip_registrations.orig_server_host='%q' or sip_registrations.sip_host='%q' "
 									 "or sip_registrations.presence_hosts like '%%%q%%'))",
-									 dh.status, dh.rpid, probe_euser, probe_host,  probe_euser, probe_host, probe_host, probe_host);
+									 dh.status, dh.rpid, 
+									 probe_euser, probe_host,  probe_euser, probe_host, probe_host, probe_host);
 				switch_assert(sql);
 				
 				if (mod_sofia_globals.debug_presence > 0) {
@@ -711,9 +788,10 @@ static void actual_sofia_presence_event_handler(switch_event_t *event)
 				sql = switch_mprintf("update sip_dialogs set call_info='%q',call_info_state='%q' where hostname='%q' and uuid='%q'",
 									 call_info, call_info_state, mod_sofia_globals.hostname, uuid);
 			} else {
-				sql = switch_mprintf("update sip_dialogs set call_info='%q', call_info_state='%q' where hostname='%q' and sip_dialogs.sip_from_user='%q' "
-									 "and sip_dialogs.sip_from_host='%q' and call_info='%q'",
-									 call_info, call_info_state, mod_sofia_globals.hostname, euser, host, call_info);
+				sql = switch_mprintf("update sip_dialogs set call_info='%q', call_info_state='%q' where hostname='%q' and "
+									 "((sip_dialogs.sip_from_user='%q' and sip_dialogs.sip_from_host='%q') or presence_id='%q@%q') and call_info='%q'",
+									 
+									 call_info, call_info_state, mod_sofia_globals.hostname, euser, host, euser, host, call_info);
 
 			}
 
@@ -737,7 +815,8 @@ static void actual_sofia_presence_event_handler(switch_event_t *event)
 			sofia_glue_execute_sql_now(profile, &sql, SWITCH_TRUE);
 		}
 
-		sql = switch_mprintf("select status,rpid from sip_dialogs where sip_from_user='%q' and sip_from_host='%q'", euser, host);
+		sql = switch_mprintf("select status,rpid from sip_dialogs where ((sip_from_user='%q' and sip_from_host='%q') or presence_id='%q@%q')", 
+							 euser, host, euser, host);
 		sofia_glue_execute_sql_callback(profile, profile->ireg_mutex, sql, sofia_presence_dialog_callback, &dh);
 		switch_safe_free(sql);
 		
@@ -753,17 +832,20 @@ static void actual_sofia_presence_event_handler(switch_event_t *event)
 								  "(sip_subscriptions.sub_to_user=sip_presence.sip_user and sip_subscriptions.sub_to_host=sip_presence.sip_host and "
 								  "sip_subscriptions.profile_name=sip_presence.profile_name) "
 								  "left join sip_dialogs on "
+								  
+								  "sip_dialogs.presence_id = sip_subscriptions.sub_to_user || '@' || sip_subscriptions.sub_to_host or "
 
+								  
 								  "(sip_dialogs.sip_from_user = sip_subscriptions.sub_to_user "
 								  "and sip_dialogs.sip_from_host = sip_subscriptions.sub_to_host) "
 								  
 								  "where sip_subscriptions.expires > -1 and "
-								  "(event='%q' or event='%q') and (sub_to_user='%q' or sip_dialogs.presence_id like '%q@%%') "
+								  "(event='%q' or event='%q') and sub_to_user='%q' "
 								  "and (sub_to_host='%q' or presence_hosts like '%%%q%%') "
 								  "and (sip_subscriptions.profile_name = '%q' or sip_subscriptions.presence_hosts != sip_subscriptions.sub_to_host)",
 								  switch_str_nil(status), switch_str_nil(rpid), host, 
 								  dh.status,dh.rpid,
-								  event_type, alt_event_type, euser, euser, host, host, profile->name))) {
+								  event_type, alt_event_type, euser, host, host, profile->name))) {
 			
 			struct presence_helper helper = { 0 };			
 
@@ -1616,7 +1698,7 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
 
 	}
 
-	/* commenting to test
+
 	if (helper->event){ 
 		const char *uuid = switch_event_get_header_nil(helper->event, "unique-id");
 
@@ -1625,7 +1707,7 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
 			sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE);
 		}
 	}
-	*/
+
 
 	nua_handle_bind(nh, &mod_sofia_globals.keep_private);
 
@@ -1918,7 +2000,8 @@ static void sync_sla(sofia_profile_t *profile, const char *to_user, const char *
 	switch_core_hash_init(&sh->hash, sh->pool);
 
 	sql = switch_mprintf("select sip_from_user,sip_from_host,call_info,call_info_state,uuid from sip_dialogs "
-						 "where hostname='%q' " "and sip_from_user='%q' and sip_from_host='%q' ", mod_sofia_globals.hostname, to_user, to_host);
+						 "where hostname='%q' and ((sip_from_user='%q' and sip_from_host='%q') or presence_id='%q@%q')", 
+						 mod_sofia_globals.hostname, to_user, to_host, to_user, to_host);
 
 
 	if (mod_sofia_globals.debug_sla > 1) {
@@ -1954,7 +2037,8 @@ static void sync_sla(sofia_profile_t *profile, const char *to_user, const char *
 
 
 	if (clear) {
-		sql = switch_mprintf("delete from sip_dialogs where sip_from_user='%q' and sip_from_host='%q' and call_info_state='seized'", to_user, to_host);
+		sql = switch_mprintf("delete from sip_dialogs where ((sip_from_user='%q' and sip_from_host='%q') or presence_id='%q@%q') "
+							 "and call_info_state='seized'", to_user, to_host, to_user, to_host);
 
 
 		if (mod_sofia_globals.debug_sla > 1) {
@@ -2326,8 +2410,9 @@ void sofia_presence_handle_sip_i_subscribe(int status,
 						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "CANCEL LINE SEIZE\n");
 					}
 
-					sql = switch_mprintf("delete from sip_dialogs where sip_from_user='%q' and sip_from_host='%q' and call_info_state='seized'",
-										 to_user, to_host);
+					sql = switch_mprintf("delete from sip_dialogs where ((sip_from_user='%q' and sip_from_host='%q') or presence_id='%q@%q') "
+										 "and call_info_state='seized'",
+										 to_user, to_host, to_user, to_host);
 
 
 					if (mod_sofia_globals.debug_sla > 1) {
@@ -2360,8 +2445,9 @@ void sofia_presence_handle_sip_i_subscribe(int status,
 
 
 
-					sql = switch_mprintf("delete from sip_dialogs where sip_from_user='%q' and sip_from_host='%q' and call_info_state='seized'",
-										 to_user, to_host);
+					sql = switch_mprintf("delete from sip_dialogs where ((sip_from_user='%q' and sip_from_host='%q') or presence_id='%q@%q') "
+										 "and call_info_state='seized'",
+										 to_user, to_host, to_user, to_host);
 
 
 					if (mod_sofia_globals.debug_sla > 1) {
diff --git a/src/mod/endpoints/mod_sofia/sofia_reg.c b/src/mod/endpoints/mod_sofia/sofia_reg.c
index 571c1673eb..570e297f6d 100644
--- a/src/mod/endpoints/mod_sofia/sofia_reg.c
+++ b/src/mod/endpoints/mod_sofia/sofia_reg.c
@@ -142,16 +142,22 @@ void sofia_sub_check_gateway(sofia_profile_t *profile, time_t now)
 			int ss_state = nua_callstate_authenticating;
 			sub_state_t ostate = gw_sub_ptr->state;
 			char *user_via = NULL;
+			char *register_host = NULL;
 
 			if (!now) {
 				gw_sub_ptr->state = ostate = SUB_STATE_UNSUBED;
 				gw_sub_ptr->expires_str = "0";
 			}
 
-			if (sofia_glue_check_nat(gateway_ptr->profile, gateway_ptr->register_proxy)) {
+			register_host = sofia_glue_get_register_host(gateway_ptr->register_proxy);
+
+			/* check for NAT and place a Via header if necessary (hostname or non-local IP) */
+			if (register_host && sofia_glue_check_nat(gateway_ptr->profile, register_host)) {
 				user_via = sofia_glue_create_external_via(NULL, gateway_ptr->profile, gateway_ptr->register_transport);
 			}
 
+			switch_safe_free(register_host);
+
 			switch (ostate) {
 			case SUB_STATE_NOSUB:
 				break;
@@ -189,7 +195,15 @@ void sofia_sub_check_gateway(sofia_profile_t *profile, time_t now)
 				nua_handle_bind(gateway_ptr->nh, gateway_ptr->sofia_private);
 
 				if (now) {
-					nua_subscribe(gateway_ptr->sub_nh, NUTAG_URL(gateway_ptr->register_url), TAG_IF(user_via, SIPTAG_VIA_STR(user_via)), SIPTAG_EVENT_STR(gw_sub_ptr->event), SIPTAG_ACCEPT_STR(gw_sub_ptr->content_type), SIPTAG_TO_STR(gateway_ptr->register_from), SIPTAG_FROM_STR(gateway_ptr->register_from), SIPTAG_CONTACT_STR(gateway_ptr->register_contact), SIPTAG_EXPIRES_STR(gw_sub_ptr->expires_str),	// sofia stack bases its auto-refresh stuff on this
+					nua_subscribe(gateway_ptr->sub_nh,
+								  NUTAG_URL(gateway_ptr->register_url),
+								  TAG_IF(user_via, SIPTAG_VIA_STR(user_via)),
+								  SIPTAG_EVENT_STR(gw_sub_ptr->event),
+								  SIPTAG_ACCEPT_STR(gw_sub_ptr->content_type),
+								  SIPTAG_TO_STR(gateway_ptr->register_from),
+								  SIPTAG_FROM_STR(gateway_ptr->register_from),
+								  SIPTAG_CONTACT_STR(gateway_ptr->register_contact),
+								  SIPTAG_EXPIRES_STR(gw_sub_ptr->expires_str),	/* sofia stack bases its auto-refresh stuff on this */
 								  TAG_NULL());
 					gw_sub_ptr->retry = now + gw_sub_ptr->retry_seconds;
 				} else {
@@ -266,6 +280,7 @@ void sofia_reg_check_gateway(sofia_profile_t *profile, time_t now)
 	for (gateway_ptr = profile->gateways; gateway_ptr; gateway_ptr = gateway_ptr->next) {
 		reg_state_t ostate = gateway_ptr->state;
 		char *user_via = NULL;
+		char *register_host = NULL;
 
 		if (!now) {
 			gateway_ptr->state = ostate = REG_STATE_UNREGED;
@@ -277,10 +292,15 @@ void sofia_reg_check_gateway(sofia_profile_t *profile, time_t now)
 			nua_handle_t *nh = nua_handle(profile->nua, NULL, NUTAG_URL(gateway_ptr->register_url), TAG_END());
 			sofia_private_t *pvt;
 
-			if (sofia_glue_check_nat(gateway_ptr->profile, gateway_ptr->register_proxy)) {
+			register_host = sofia_glue_get_register_host(gateway_ptr->register_proxy);
+
+			/* check for NAT and place a Via header if necessary (hostname or non-local IP) */
+			if (register_host && sofia_glue_check_nat(gateway_ptr->profile, register_host)) {
 				user_via = sofia_glue_create_external_via(NULL, gateway_ptr->profile, gateway_ptr->register_transport);
 			}
 
+			switch_safe_free(register_host);
+
 			pvt = malloc(sizeof(*pvt));
 			switch_assert(pvt);
 			memset(pvt, 0, sizeof(*pvt));
@@ -335,10 +355,15 @@ void sofia_reg_check_gateway(sofia_profile_t *profile, time_t now)
 				sofia_reg_new_handle(gateway_ptr, now ? 1 : 0);
 			}
 
-			if (sofia_glue_check_nat(gateway_ptr->profile, gateway_ptr->register_proxy)) {
+			register_host = sofia_glue_get_register_host(gateway_ptr->register_proxy);
+
+			/* check for NAT and place a Via header if necessary (hostname or non-local IP) */
+			if (register_host && sofia_glue_check_nat(gateway_ptr->profile, register_host)) {
 				user_via = sofia_glue_create_external_via(NULL, gateway_ptr->profile, gateway_ptr->register_transport);
 			}
 
+			switch_safe_free(register_host);
+
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Registering %s\n", gateway_ptr->name);
 
 			if (now) {
@@ -486,7 +511,7 @@ void sofia_reg_send_reboot(sofia_profile_t *profile, const char *user, const cha
 	const char *contenttype = "application/simple-message-summary";
 	const char *body = "";
 
-	if (switch_stristr("snom", user_agent)) {
+	if (switch_stristr("snom", user_agent) || switch_stristr("yealink", user_agent)) {
 		event = "check-sync;reboot=true";
 	} else if (switch_stristr("linksys", user_agent)) {
 		event = "reboot_now";
@@ -1114,18 +1139,23 @@ uint8_t sofia_reg_handle_register(nua_t *nua, sofia_profile_t *profile, nua_hand
 		}
 
 		if (auth_res != AUTH_OK && !stale) {
+			if (sofia_test_pflag(profile, PFLAG_LOG_AUTH_FAIL)) {
+				if (regtype == REG_REGISTER) {
+					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SIP auth %s (REGISTER) on sofia profile '%s' "
+									  "for [%s@%s] from ip %s\n", forbidden ? "failure" : "challenge", profile->name, to_user, to_host, network_ip);
+				}
+			}
+
 			if (profile->debug) {
-				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send %s for [%s@%s]\n", forbidden ? "forbidden" : "challenge", to_user, to_host);
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send %s for [%s@%s]\n",
+								  forbidden ? "forbidden" : "challenge", to_user, to_host);
 			}
 			if (auth_res == AUTH_FORBIDDEN) {
 				nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END());
-
+				
 				/* Log line added to support Fail2Ban */
 				if (sofia_test_pflag(profile, PFLAG_LOG_AUTH_FAIL)) {
-					if (regtype == REG_REGISTER) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "SIP auth failure (REGISTER) on sofia profile '%s' "
-										  "for [%s@%s] from ip %s\n", profile->name, to_user, to_host, network_ip);
-					} else if (regtype == REG_INVITE) {
+					if (regtype == REG_INVITE) {
 						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "SIP auth failure (INVITE) on sofia profile '%s' "
 										  "for [%s@%s] from ip %s\n", profile->name, to_user, to_host, network_ip);
 					}
@@ -1415,27 +1445,27 @@ uint8_t sofia_reg_handle_register(nua_t *nua, sofia_profile_t *profile, nua_hand
 				}
 			}
 
-
-#if 0
-			if (switch_event_create(&s_event, SWITCH_EVENT_PRESENCE_PROBE) == SWITCH_STATUS_SUCCESS) {
-				switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "proto", SOFIA_CHAT_PROTO);
-				switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "login", profile->name);
-				switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "from", "%s@%s", to_user, sub_host);
-				switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "to", "%s@%s", to_user, sub_host);
-				switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "event_type", "presence");
-				switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
-				switch_event_fire(&s_event);
+			if (sofia_test_pflag(profile, PFLAG_PRESENCE_PROBE_ON_REGISTER)) {
+				if (switch_event_create(&s_event, SWITCH_EVENT_PRESENCE_PROBE) == SWITCH_STATUS_SUCCESS) {
+					switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "proto", SOFIA_CHAT_PROTO);
+					switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "login", profile->name);
+					switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "from", "%s@%s", to_user, sub_host);
+					switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "to", "%s@%s", to_user, sub_host);
+					switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "event_type", "presence");
+					switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog");
+					switch_event_fire(&s_event);
+				}
+			} else {
+				if (switch_event_create(&s_event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) {
+					switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "proto", SOFIA_CHAT_PROTO);
+					switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "login", profile->name);
+					switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "from", "%s@%s", to_user, sub_host);
+					switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "rpid", "unknown");
+					switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "status", "Registered");
+					switch_event_fire(&s_event);
+				}		
 			}
-#else
-			if (switch_event_create(&s_event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) {
-				switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "proto", SOFIA_CHAT_PROTO);
-				switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "login", profile->name);
-				switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "from", "%s@%s", to_user, sub_host);
-				switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "rpid", "unknown");
-				switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "status", "Registered");
-				switch_event_fire(&s_event);
-			}				
-#endif
+			
 		} else {
 			if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_UNREGISTER) == SWITCH_STATUS_SUCCESS) {
 				switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "profile-name", profile->name);
diff --git a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
index 941db22c84..ee7cfc9eaf 100644
--- a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
+++ b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
@@ -691,7 +691,7 @@ SWITCH_STANDARD_API(event_sink_function)
 
 		switch_mutex_lock(listener->filter_mutex);
 		if (!listener->filters) {
-			switch_event_create_plain(&listener->filters, SWITCH_EVENT_CHANNEL_DATA);
+			switch_event_create_plain(&listener->filters, SWITCH_EVENT_CLONE);
 		}
 
 		if (!strcasecmp(action, "delete")) {
@@ -702,7 +702,7 @@ SWITCH_STANDARD_API(event_sink_function)
 
 			if (!strcasecmp(header_val, "all")) {
 				switch_event_destroy(&listener->filters);
-				switch_event_create_plain(&listener->filters, SWITCH_EVENT_CHANNEL_DATA);
+				switch_event_create_plain(&listener->filters, SWITCH_EVENT_CLONE);
 			} else {
 				switch_event_del_header(listener->filters, header_val);
 			}
@@ -1744,7 +1744,7 @@ static switch_status_t parse_command(listener_t *listener, switch_event_t **even
 
 		switch_mutex_lock(listener->filter_mutex);
 		if (!listener->filters) {
-			switch_event_create_plain(&listener->filters, SWITCH_EVENT_CHANNEL_DATA);
+			switch_event_create_plain(&listener->filters, SWITCH_EVENT_CLONE);
 		}
 
 		if (!strcasecmp(header_name, "delete") && header_val) {
@@ -1754,7 +1754,7 @@ static switch_status_t parse_command(listener_t *listener, switch_event_t **even
 			}
 			if (!strcasecmp(header_name, "all")) {
 				switch_event_destroy(&listener->filters);
-				switch_event_create_plain(&listener->filters, SWITCH_EVENT_CHANNEL_DATA);
+				switch_event_create_plain(&listener->filters, SWITCH_EVENT_CLONE);
 			} else {
 				switch_event_del_header_val(listener->filters, header_name, header_val);
 			}
diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
index 4a0b52efec..8033a8faa5 100644
--- a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
+++ b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
@@ -6454,6 +6454,42 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_destroy() {
 }
 
 
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_io_read_lock(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_core_session_io_read_lock(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_io_write_lock(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_core_session_io_write_lock(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_io_rwunlock(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_core_session_io_rwunlock(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_read_lock(void * jarg1) {
   int jresult ;
   switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
@@ -7336,6 +7372,22 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_execute_application_get_fl
 }
 
 
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_execute_application_async(void * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_status_t)switch_core_session_execute_application_async(arg1,(char const *)arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_app_flags(char * jarg1, void * jarg2) {
   int jresult ;
   char *arg1 = (char *) 0 ;
@@ -7566,6 +7618,18 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_event_count(void
 }
 
 
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_messages_waiting(void * jarg1) {
+  unsigned long jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (uint32_t)switch_core_session_messages_waiting(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_dequeue_event(void * jarg1, void * jarg2, int jarg3) {
   int jresult ;
   switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
@@ -27597,6 +27661,74 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_set_realm(void * jarg1, ch
 }
 
 
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_get_file_handle(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_file_handle_t **arg2 = (switch_file_handle_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_file_handle_t **)jarg2; 
+  result = (switch_status_t)switch_ivr_get_file_handle(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_release_file_handle(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_file_handle_t **arg2 = (switch_file_handle_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_file_handle_t **)jarg2; 
+  result = (switch_status_t)switch_ivr_release_file_handle(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_process_fh(void * jarg1, char * jarg2, void * jarg3) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_file_handle_t *arg3 = (switch_file_handle_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_file_handle_t *)jarg3; 
+  result = (switch_status_t)switch_ivr_process_fh(arg1,(char const *)arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_insert_file(void * jarg1, char * jarg2, char * jarg3, void * jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_size_t arg4 ;
+  switch_size_t *argp4 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  argp4 = (switch_size_t *)jarg4; 
+  if (!argp4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg4 = *argp4; 
+  result = (switch_status_t)switch_ivr_insert_file(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_MAX_BUF_LEN_get() {
   int jresult ;
   int result;
diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.cxx
index ca001f64b1..a65d82d9cb 100644
--- a/src/mod/languages/mod_managed/freeswitch_wrap.cxx
+++ b/src/mod/languages/mod_managed/freeswitch_wrap.cxx
@@ -6744,6 +6744,42 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_destroy() {
 }
 
 
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_io_read_lock(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_core_session_io_read_lock(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_io_write_lock(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_core_session_io_write_lock(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_io_rwunlock(void * jarg1) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (switch_status_t)switch_core_session_io_rwunlock(arg1);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_read_lock(void * jarg1) {
   int jresult ;
   switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
@@ -7626,6 +7662,22 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_execute_application_get_fl
 }
 
 
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_execute_application_async(void * jarg1, char * jarg2, char * jarg3) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  result = (switch_status_t)switch_core_session_execute_application_async(arg1,(char const *)arg2,(char const *)arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_app_flags(char * jarg1, void * jarg2) {
   int jresult ;
   char *arg1 = (char *) 0 ;
@@ -7856,6 +7908,18 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_event_count(void
 }
 
 
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_messages_waiting(void * jarg1) {
+  unsigned long jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  uint32_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  result = (uint32_t)switch_core_session_messages_waiting(arg1);
+  jresult = (unsigned long)result; 
+  return jresult;
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_dequeue_event(void * jarg1, void * jarg2, int jarg3) {
   int jresult ;
   switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
@@ -28289,6 +28353,74 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_dmachine_set_realm(void * jarg1, ch
 }
 
 
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_get_file_handle(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_file_handle_t **arg2 = (switch_file_handle_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_file_handle_t **)jarg2; 
+  result = (switch_status_t)switch_ivr_get_file_handle(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_release_file_handle(void * jarg1, void * jarg2) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  switch_file_handle_t **arg2 = (switch_file_handle_t **) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (switch_file_handle_t **)jarg2; 
+  result = (switch_status_t)switch_ivr_release_file_handle(arg1,arg2);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_process_fh(void * jarg1, char * jarg2, void * jarg3) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  switch_file_handle_t *arg3 = (switch_file_handle_t *) 0 ;
+  switch_status_t result;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (switch_file_handle_t *)jarg3; 
+  result = (switch_status_t)switch_ivr_process_fh(arg1,(char const *)arg2,arg3);
+  jresult = result; 
+  return jresult;
+}
+
+
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_insert_file(void * jarg1, char * jarg2, char * jarg3, void * jarg4) {
+  int jresult ;
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  switch_size_t arg4 ;
+  switch_status_t result;
+  switch_size_t *argp4 ;
+  
+  arg1 = (switch_core_session_t *)jarg1; 
+  arg2 = (char *)jarg2; 
+  arg3 = (char *)jarg3; 
+  argp4 = (switch_size_t *)jarg4; 
+  if (!argp4) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0);
+    return 0;
+  }
+  arg4 = *argp4; 
+  result = (switch_status_t)switch_ivr_insert_file(arg1,(char const *)arg2,(char const *)arg3,arg4);
+  jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_MAX_BUF_LEN_get() {
   int jresult ;
   int result;
diff --git a/src/mod/languages/mod_managed/managed/swig.2010.cs b/src/mod/languages/mod_managed/managed/swig.2010.cs
index 2897fef1e5..4d14f10879 100644
--- a/src/mod/languages/mod_managed/managed/swig.2010.cs
+++ b/src/mod/languages/mod_managed/managed/swig.2010.cs
@@ -1113,6 +1113,21 @@ public class freeswitch {
     return ret;
   }
 
+  public static switch_status_t switch_core_session_io_read_lock(SWIGTYPE_p_switch_core_session session) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_io_read_lock(SWIGTYPE_p_switch_core_session.getCPtr(session));
+    return ret;
+  }
+
+  public static switch_status_t switch_core_session_io_write_lock(SWIGTYPE_p_switch_core_session session) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_io_write_lock(SWIGTYPE_p_switch_core_session.getCPtr(session));
+    return ret;
+  }
+
+  public static switch_status_t switch_core_session_io_rwunlock(SWIGTYPE_p_switch_core_session session) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_io_rwunlock(SWIGTYPE_p_switch_core_session.getCPtr(session));
+    return ret;
+  }
+
   public static switch_status_t switch_core_session_read_lock(SWIGTYPE_p_switch_core_session session) {
     switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_read_lock(SWIGTYPE_p_switch_core_session.getCPtr(session));
     return ret;
@@ -1449,6 +1464,11 @@ public class freeswitch {
     return ret;
   }
 
+  public static switch_status_t switch_core_session_execute_application_async(SWIGTYPE_p_switch_core_session session, string app, string arg) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_execute_application_async(SWIGTYPE_p_switch_core_session.getCPtr(session), app, arg);
+    return ret;
+  }
+
   public static switch_status_t switch_core_session_get_app_flags(string app, SWIGTYPE_p_int flags) {
     switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_get_app_flags(app, SWIGTYPE_p_int.getCPtr(flags));
     return ret;
@@ -1528,6 +1548,11 @@ public class freeswitch {
     return ret;
   }
 
+  public static uint switch_core_session_messages_waiting(SWIGTYPE_p_switch_core_session session) {
+    uint ret = freeswitchPINVOKE.switch_core_session_messages_waiting(SWIGTYPE_p_switch_core_session.getCPtr(session));
+    return ret;
+  }
+
   public static switch_status_t switch_core_session_dequeue_event(SWIGTYPE_p_switch_core_session session, SWIGTYPE_p_p_switch_event arg1, switch_bool_t force) {
     switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_dequeue_event(SWIGTYPE_p_switch_core_session.getCPtr(session), SWIGTYPE_p_p_switch_event.getCPtr(arg1), (int)force);
     return ret;
@@ -4471,6 +4496,27 @@ public class freeswitch {
     return ret;
   }
 
+  public static switch_status_t switch_ivr_get_file_handle(SWIGTYPE_p_switch_core_session session, SWIGTYPE_p_p_switch_file_handle fh) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_get_file_handle(SWIGTYPE_p_switch_core_session.getCPtr(session), SWIGTYPE_p_p_switch_file_handle.getCPtr(fh));
+    return ret;
+  }
+
+  public static switch_status_t switch_ivr_release_file_handle(SWIGTYPE_p_switch_core_session session, SWIGTYPE_p_p_switch_file_handle fh) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_release_file_handle(SWIGTYPE_p_switch_core_session.getCPtr(session), SWIGTYPE_p_p_switch_file_handle.getCPtr(fh));
+    return ret;
+  }
+
+  public static switch_status_t switch_ivr_process_fh(SWIGTYPE_p_switch_core_session session, string cmd, switch_file_handle fhp) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_process_fh(SWIGTYPE_p_switch_core_session.getCPtr(session), cmd, switch_file_handle.getCPtr(fhp));
+    return ret;
+  }
+
+  public static switch_status_t switch_ivr_insert_file(SWIGTYPE_p_switch_core_session session, string file, string insert_file, SWIGTYPE_p_switch_size_t sample_point) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_insert_file(SWIGTYPE_p_switch_core_session.getCPtr(session), file, insert_file, SWIGTYPE_p_switch_size_t.getCPtr(sample_point));
+    if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
   public static switch_status_t switch_rtp_add_crypto_key(SWIGTYPE_p_switch_rtp rtp_session, switch_rtp_crypto_direction_t direction, uint index, switch_rtp_crypto_key_type_t type, SWIGTYPE_p_unsigned_char key, SWIGTYPE_p_switch_size_t keylen) {
     switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_rtp_add_crypto_key(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session), (int)direction, index, (int)type, SWIGTYPE_p_unsigned_char.getCPtr(key), SWIGTYPE_p_switch_size_t.getCPtr(keylen));
     if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve();
@@ -7259,6 +7305,15 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_core_destroy")]
   public static extern int switch_core_destroy();
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_io_read_lock")]
+  public static extern int switch_core_session_io_read_lock(HandleRef jarg1);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_io_write_lock")]
+  public static extern int switch_core_session_io_write_lock(HandleRef jarg1);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_io_rwunlock")]
+  public static extern int switch_core_session_io_rwunlock(HandleRef jarg1);
+
   [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_read_lock")]
   public static extern int switch_core_session_read_lock(HandleRef jarg1);
 
@@ -7463,6 +7518,9 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_execute_application_get_flags")]
   public static extern int switch_core_session_execute_application_get_flags(HandleRef jarg1, string jarg2, string jarg3, HandleRef jarg4);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_execute_application_async")]
+  public static extern int switch_core_session_execute_application_async(HandleRef jarg1, string jarg2, string jarg3);
+
   [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_get_app_flags")]
   public static extern int switch_core_session_get_app_flags(string jarg1, HandleRef jarg2);
 
@@ -7511,6 +7569,9 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_event_count")]
   public static extern uint switch_core_session_event_count(HandleRef jarg1);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_messages_waiting")]
+  public static extern uint switch_core_session_messages_waiting(HandleRef jarg1);
+
   [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_dequeue_event")]
   public static extern int switch_core_session_dequeue_event(HandleRef jarg1, HandleRef jarg2, int jarg3);
 
@@ -12242,6 +12303,18 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_dmachine_set_realm")]
   public static extern int switch_ivr_dmachine_set_realm(HandleRef jarg1, string jarg2);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_get_file_handle")]
+  public static extern int switch_ivr_get_file_handle(HandleRef jarg1, HandleRef jarg2);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_release_file_handle")]
+  public static extern int switch_ivr_release_file_handle(HandleRef jarg1, HandleRef jarg2);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_process_fh")]
+  public static extern int switch_ivr_process_fh(HandleRef jarg1, string jarg2, HandleRef jarg3);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_insert_file")]
+  public static extern int switch_ivr_insert_file(HandleRef jarg1, string jarg2, string jarg3, HandleRef jarg4);
+
   [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_RTP_MAX_BUF_LEN_get")]
   public static extern int SWITCH_RTP_MAX_BUF_LEN_get();
 
@@ -17157,6 +17230,36 @@ namespace FreeSWITCH.Native {
 using System;
 using System.Runtime.InteropServices;
 
+public class SWIGTYPE_p_p_switch_file_handle {
+  private HandleRef swigCPtr;
+
+  internal SWIGTYPE_p_p_switch_file_handle(IntPtr cPtr, bool futureUse) {
+    swigCPtr = new HandleRef(this, cPtr);
+  }
+
+  protected SWIGTYPE_p_p_switch_file_handle() {
+    swigCPtr = new HandleRef(null, IntPtr.Zero);
+  }
+
+  internal static HandleRef getCPtr(SWIGTYPE_p_p_switch_file_handle obj) {
+    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+  }
+}
+
+}
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 2.0.1
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+namespace FreeSWITCH.Native {
+
+using System;
+using System.Runtime.InteropServices;
+
 public class SWIGTYPE_p_p_switch_frame {
   private HandleRef swigCPtr;
 
diff --git a/src/mod/languages/mod_managed/managed/swig.cs b/src/mod/languages/mod_managed/managed/swig.cs
index bd901911ed..e024c586f8 100644
--- a/src/mod/languages/mod_managed/managed/swig.cs
+++ b/src/mod/languages/mod_managed/managed/swig.cs
@@ -1103,6 +1103,21 @@ public class freeswitch {
     return ret;
   }
 
+  public static switch_status_t switch_core_session_io_read_lock(SWIGTYPE_p_switch_core_session session) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_io_read_lock(SWIGTYPE_p_switch_core_session.getCPtr(session));
+    return ret;
+  }
+
+  public static switch_status_t switch_core_session_io_write_lock(SWIGTYPE_p_switch_core_session session) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_io_write_lock(SWIGTYPE_p_switch_core_session.getCPtr(session));
+    return ret;
+  }
+
+  public static switch_status_t switch_core_session_io_rwunlock(SWIGTYPE_p_switch_core_session session) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_io_rwunlock(SWIGTYPE_p_switch_core_session.getCPtr(session));
+    return ret;
+  }
+
   public static switch_status_t switch_core_session_read_lock(SWIGTYPE_p_switch_core_session session) {
     switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_read_lock(SWIGTYPE_p_switch_core_session.getCPtr(session));
     return ret;
@@ -1439,6 +1454,11 @@ public class freeswitch {
     return ret;
   }
 
+  public static switch_status_t switch_core_session_execute_application_async(SWIGTYPE_p_switch_core_session session, string app, string arg) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_execute_application_async(SWIGTYPE_p_switch_core_session.getCPtr(session), app, arg);
+    return ret;
+  }
+
   public static switch_status_t switch_core_session_get_app_flags(string app, SWIGTYPE_p_int flags) {
     switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_get_app_flags(app, SWIGTYPE_p_int.getCPtr(flags));
     return ret;
@@ -1518,6 +1538,11 @@ public class freeswitch {
     return ret;
   }
 
+  public static uint switch_core_session_messages_waiting(SWIGTYPE_p_switch_core_session session) {
+    uint ret = freeswitchPINVOKE.switch_core_session_messages_waiting(SWIGTYPE_p_switch_core_session.getCPtr(session));
+    return ret;
+  }
+
   public static switch_status_t switch_core_session_dequeue_event(SWIGTYPE_p_switch_core_session session, SWIGTYPE_p_p_switch_event arg1, switch_bool_t force) {
     switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_dequeue_event(SWIGTYPE_p_switch_core_session.getCPtr(session), SWIGTYPE_p_p_switch_event.getCPtr(arg1), (int)force);
     return ret;
@@ -4461,6 +4486,27 @@ public class freeswitch {
     return ret;
   }
 
+  public static switch_status_t switch_ivr_get_file_handle(SWIGTYPE_p_switch_core_session session, SWIGTYPE_p_p_switch_file_handle fh) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_get_file_handle(SWIGTYPE_p_switch_core_session.getCPtr(session), SWIGTYPE_p_p_switch_file_handle.getCPtr(fh));
+    return ret;
+  }
+
+  public static switch_status_t switch_ivr_release_file_handle(SWIGTYPE_p_switch_core_session session, SWIGTYPE_p_p_switch_file_handle fh) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_release_file_handle(SWIGTYPE_p_switch_core_session.getCPtr(session), SWIGTYPE_p_p_switch_file_handle.getCPtr(fh));
+    return ret;
+  }
+
+  public static switch_status_t switch_ivr_process_fh(SWIGTYPE_p_switch_core_session session, string cmd, switch_file_handle fhp) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_process_fh(SWIGTYPE_p_switch_core_session.getCPtr(session), cmd, switch_file_handle.getCPtr(fhp));
+    return ret;
+  }
+
+  public static switch_status_t switch_ivr_insert_file(SWIGTYPE_p_switch_core_session session, string file, string insert_file, SWIGTYPE_p_switch_size_t sample_point) {
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_insert_file(SWIGTYPE_p_switch_core_session.getCPtr(session), file, insert_file, SWIGTYPE_p_switch_size_t.getCPtr(sample_point));
+    if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
   public static switch_status_t switch_rtp_add_crypto_key(SWIGTYPE_p_switch_rtp rtp_session, switch_rtp_crypto_direction_t direction, uint index, switch_rtp_crypto_key_type_t type, SWIGTYPE_p_unsigned_char key, SWIGTYPE_p_switch_size_t keylen) {
     switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_rtp_add_crypto_key(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session), (int)direction, index, (int)type, SWIGTYPE_p_unsigned_char.getCPtr(key), SWIGTYPE_p_switch_size_t.getCPtr(keylen));
     if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve();
@@ -7245,6 +7291,15 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_core_destroy")]
   public static extern int switch_core_destroy();
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_io_read_lock")]
+  public static extern int switch_core_session_io_read_lock(HandleRef jarg1);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_io_write_lock")]
+  public static extern int switch_core_session_io_write_lock(HandleRef jarg1);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_io_rwunlock")]
+  public static extern int switch_core_session_io_rwunlock(HandleRef jarg1);
+
   [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_read_lock")]
   public static extern int switch_core_session_read_lock(HandleRef jarg1);
 
@@ -7449,6 +7504,9 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_execute_application_get_flags")]
   public static extern int switch_core_session_execute_application_get_flags(HandleRef jarg1, string jarg2, string jarg3, HandleRef jarg4);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_execute_application_async")]
+  public static extern int switch_core_session_execute_application_async(HandleRef jarg1, string jarg2, string jarg3);
+
   [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_get_app_flags")]
   public static extern int switch_core_session_get_app_flags(string jarg1, HandleRef jarg2);
 
@@ -7497,6 +7555,9 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_event_count")]
   public static extern uint switch_core_session_event_count(HandleRef jarg1);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_messages_waiting")]
+  public static extern uint switch_core_session_messages_waiting(HandleRef jarg1);
+
   [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_dequeue_event")]
   public static extern int switch_core_session_dequeue_event(HandleRef jarg1, HandleRef jarg2, int jarg3);
 
@@ -12228,6 +12289,18 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_dmachine_set_realm")]
   public static extern int switch_ivr_dmachine_set_realm(HandleRef jarg1, string jarg2);
 
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_get_file_handle")]
+  public static extern int switch_ivr_get_file_handle(HandleRef jarg1, HandleRef jarg2);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_release_file_handle")]
+  public static extern int switch_ivr_release_file_handle(HandleRef jarg1, HandleRef jarg2);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_process_fh")]
+  public static extern int switch_ivr_process_fh(HandleRef jarg1, string jarg2, HandleRef jarg3);
+
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_insert_file")]
+  public static extern int switch_ivr_insert_file(HandleRef jarg1, string jarg2, string jarg3, HandleRef jarg4);
+
   [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_RTP_MAX_BUF_LEN_get")]
   public static extern int SWITCH_RTP_MAX_BUF_LEN_get();
 
@@ -17103,6 +17176,36 @@ namespace FreeSWITCH.Native {
 using System;
 using System.Runtime.InteropServices;
 
+public class SWIGTYPE_p_p_switch_file_handle {
+  private HandleRef swigCPtr;
+
+  internal SWIGTYPE_p_p_switch_file_handle(IntPtr cPtr, bool futureUse) {
+    swigCPtr = new HandleRef(this, cPtr);
+  }
+
+  protected SWIGTYPE_p_p_switch_file_handle() {
+    swigCPtr = new HandleRef(null, IntPtr.Zero);
+  }
+
+  internal static HandleRef getCPtr(SWIGTYPE_p_p_switch_file_handle obj) {
+    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+  }
+}
+
+}
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.35
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+namespace FreeSWITCH.Native {
+
+using System;
+using System.Runtime.InteropServices;
+
 public class SWIGTYPE_p_p_switch_frame {
   private HandleRef swigCPtr;
 
diff --git a/src/mod/languages/mod_managed/mono28.patch b/src/mod/languages/mod_managed/mono28.patch
new file mode 100644
index 0000000000..7ec60f596c
--- /dev/null
+++ b/src/mod/languages/mod_managed/mono28.patch
@@ -0,0 +1,75 @@
+diff --git a/src/mod/languages/mod_managed/Makefile b/src/mod/languages/mod_managed/Makefile
+index 0ac49b4..ec44ff5 100644
+--- a/src/mod/languages/mod_managed/Makefile
++++ b/src/mod/languages/mod_managed/Makefile
+@@ -1,6 +1,6 @@
+-LOCAL_INSERT_CFLAGS= /usr/bin/pkg-config mono --cflags
+-LOCAL_INSERT_LDFLAGS= /usr/bin/pkg-config mono --libs
+-#MOD_CFLAGS=-D_REENTRANT -pthread -I/opt/mono-1.9/lib/pkgconfig/../../include/mono-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -lmono
++LOCAL_INSERT_CFLAGS= /usr/bin/pkg-config mono-2 --cflags
++LOCAL_INSERT_LDFLAGS= /usr/bin/pkg-config mono-2 --libs
++#MOD_CFLAGS=-D_REENTRANT -pthread -I/usr/lib/mono -lmono
+ BASE=../../../..
+ VERBOSE=1
+ include $(BASE)/build/modmake.rules
+diff --git a/src/mod/languages/mod_managed/freeswitch.i b/src/mod/languages/mod_managed/freeswitch.i
+index ffbdf9b..117d58c 100644
+--- a/src/mod/languages/mod_managed/freeswitch.i
++++ b/src/mod/languages/mod_managed/freeswitch.i
+@@ -8,7 +8,6 @@
+ 
+ /* Callback for returning strings to C# without leaking memory */
+ #ifndef _MANAGED
+-#include <glib.h>
+ #include <mono/jit/jit.h>
+ #include <mono/metadata/environment.h>
+ #include <mono/metadata/mono-config.h>
+diff --git a/src/mod/languages/mod_managed/freeswitch_managed.h b/src/mod/languages/mod_managed/freeswitch_managed.h
+index 1d0b6a7..13ffe5d 100644
+--- a/src/mod/languages/mod_managed/freeswitch_managed.h
++++ b/src/mod/languages/mod_managed/freeswitch_managed.h
+@@ -40,7 +40,6 @@ typedef void (*hangupFunction) (void);
+ typedef char *(*inputFunction) (void *, switch_input_type_t);
+ 
+ #ifndef _MANAGED
+-#include <glib.h>
+ #include <mono/jit/jit.h>
+ #include <mono/metadata/assembly.h>
+ #include <mono/metadata/environment.h>
+@@ -73,7 +72,7 @@ extern mod_managed_globals globals;
+ #ifdef WIN32
+ #define RESULT_FREE(x) CoTaskMemFree(x)
+ #else
+-#define RESULT_FREE(x) g_free(x)
++#define RESULT_FREE(x) mono_free(x)
+ #endif
+ 
+ SWITCH_END_EXTERN_C
+diff --git a/src/mod/languages/mod_managed/mod_managed.cpp b/src/mod/languages/mod_managed/mod_managed.cpp
+index ec2d866..87e831f 100644
+--- a/src/mod/languages/mod_managed/mod_managed.cpp
++++ b/src/mod/languages/mod_managed/mod_managed.cpp
+@@ -208,18 +208,13 @@ switch_status_t loadRuntime()
+ 	}
+ 
+ 	/* Already loaded? */
+-	MonoAssemblyName name;
+-	name.name = MOD_MANAGED_ASM_NAME;
+-	name.major = MOD_MANAGED_ASM_V1;
+-	name.minor = MOD_MANAGED_ASM_V2;
+-	name.revision = MOD_MANAGED_ASM_V3;
+-	name.build = MOD_MANAGED_ASM_V4;
+-	name.culture = "";
+-	name.hash_value = "";
+-
++	MonoAssemblyName *name = mono_assembly_name_new (MOD_MANAGED_ASM_NAME);
++	//Note also that it can't be allocated on the stack anymore and you'll need to create and destroy it with the following API:
++	//mono_assembly_name_free (name);
++	
+ 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Calling mono_assembly_loaded.\n");
+ 
+-	if (!(globals.mod_mono_asm = mono_assembly_loaded(&name))) {
++	if (!(globals.mod_mono_asm = mono_assembly_loaded(name))) {
+ 		/* Open the assembly */ 
+ 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Calling mono_domain_assembly_open.\n");
+ 		globals.mod_mono_asm = mono_domain_assembly_open(globals.domain, filename);
diff --git a/src/mod/languages/mod_perl/mod_perl_wrap.cpp b/src/mod/languages/mod_perl/mod_perl_wrap.cpp
index 370c88bc99..2efbdf1abc 100644
--- a/src/mod/languages/mod_perl/mod_perl_wrap.cpp
+++ b/src/mod/languages/mod_perl/mod_perl_wrap.cpp
@@ -9732,17 +9732,17 @@ XS(SWIG_init) {
   SWIG_TypeClientData(SWIGTYPE_p_IVRMenu, (void*) "freeswitch::IVRMenu");
   SWIG_TypeClientData(SWIGTYPE_p_API, (void*) "freeswitch::API");
   SWIG_TypeClientData(SWIGTYPE_p_input_callback_state, (void*) "freeswitch::input_callback_state_t");
-  /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
+  /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "S_HUP", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_HUP)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
+  /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "S_FREE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_FREE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
+  /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "S_RDLOCK", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_RDLOCK)));
     SvREADONLY_on(sv);
diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj
index d2f7fb3a25..cf35ce5e13 100644
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj
@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1"
+				PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN"
 				UsePrecompiledHeader="0"
 			/>
 			<Tool
@@ -111,7 +111,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1"
+				PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN"
 				UsePrecompiledHeader="0"
 			/>
 			<Tool
@@ -178,7 +178,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1"
+				PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN"
 				UsePrecompiledHeader="0"
 			/>
 			<Tool
@@ -244,7 +244,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1"
+				PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN"
 				UsePrecompiledHeader="0"
 			/>
 			<Tool
diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2010.vcxproj b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2010.vcxproj
index fd7c7c82a4..330feaa602 100644
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2010.vcxproj
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2010.vcxproj
@@ -72,7 +72,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
@@ -91,7 +91,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
@@ -107,7 +107,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
@@ -125,7 +125,7 @@
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SM_EXPORTS;JS_HAS_FILE_OBJECT=1;XP_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
diff --git a/src/switch_apr.c b/src/switch_apr.c
index bc1af4678b..fcf32f8dc8 100644
--- a/src/switch_apr.c
+++ b/src/switch_apr.c
@@ -999,6 +999,12 @@ SWITCH_DECLARE(switch_status_t) switch_queue_pop(switch_queue_t *queue, void **d
 	return apr_queue_pop(queue, data);
 }
 
+SWITCH_DECLARE(switch_status_t) switch_queue_pop_timeout(switch_queue_t *queue, void **data, switch_interval_time_t timeout)
+{
+	return apr_queue_pop_timeout(queue, data, timeout);
+}
+
+
 SWITCH_DECLARE(switch_status_t) switch_queue_push(switch_queue_t *queue, void *data)
 {
 	apr_status_t s;
diff --git a/src/switch_channel.c b/src/switch_channel.c
index 0b1b6e8f82..a9c87c5954 100644
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -1971,7 +1971,7 @@ SWITCH_DECLARE(void) switch_channel_event_set_basic_data(switch_channel_t *chann
 SWITCH_DECLARE(void) switch_channel_event_set_extended_data(switch_channel_t *channel, switch_event_t *event)
 {
 	switch_event_header_t *hi;
-	int x, global_verbose_events = 0;
+	int global_verbose_events = -1;
 
 	switch_mutex_lock(channel->profile_mutex);
 
@@ -2004,7 +2004,6 @@ SWITCH_DECLARE(void) switch_channel_event_set_extended_data(switch_channel_t *ch
 		event->event_id == SWITCH_EVENT_MEDIA_BUG_STOP || 
 		event->event_id == SWITCH_EVENT_CUSTOM) {
 
-		x = 0;
 		/* Index Variables */
 		if (channel->variables) {
 			for (hi = channel->variables->headers; hi; hi = hi->next) {
@@ -2013,8 +2012,7 @@ SWITCH_DECLARE(void) switch_channel_event_set_extended_data(switch_channel_t *ch
 
 				vvar = (char *) hi->name;
 				vval = (char *) hi->value;
-				x++;
-
+				
 				switch_assert(vvar && vval);
 				switch_snprintf(buf, sizeof(buf), "variable_%s", vvar);
 				switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, buf, vval);
@@ -2520,7 +2518,12 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_ring_ready_value(swi
 			if ((arg = strchr(app, ' '))) {
 				*arg++ = '\0';
 			}
-			switch_core_session_execute_application(channel->session, app, arg);
+
+			if (switch_core_session_in_thread(channel->session)) {
+				switch_core_session_execute_application(channel->session, app, arg);
+			} else {
+				switch_core_session_execute_application_async(channel->session, app, arg);
+			}
 		}
 
 		return SWITCH_STATUS_SUCCESS;
@@ -2573,7 +2576,12 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_pre_answered(switch_
 			if ((arg = strchr(app, ' '))) {
 				*arg++ = '\0';
 			}
-			switch_core_session_execute_application(channel->session, app, arg);
+
+			if (switch_core_session_in_thread(channel->session)) {
+				switch_core_session_execute_application(channel->session, app, arg);
+			} else {
+				switch_core_session_execute_application_async(channel->session, app, arg);
+			}
 		}
 
 		if ((var = switch_channel_get_variable(channel, SWITCH_PASSTHRU_PTIME_MISMATCH_VARIABLE))) {
@@ -2752,7 +2760,12 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_answered(switch_chan
 			}
 			switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_DEBUG, "%s execute on answer: %s(%s)\n", channel->name, app,
 							  switch_str_nil(arg));
-			switch_core_session_execute_application(channel->session, app, arg);
+
+			if (switch_core_session_in_thread(channel->session)) {
+				switch_core_session_execute_application(channel->session, app, arg);
+			} else {
+				switch_core_session_execute_application_async(channel->session, app, arg);
+			}
 		}
 	}
 
diff --git a/src/switch_core_codec.c b/src/switch_core_codec.c
index 9b607ea873..d6b627093e 100644
--- a/src/switch_core_codec.c
+++ b/src/switch_core_codec.c
@@ -672,14 +672,19 @@ SWITCH_DECLARE(switch_status_t) switch_core_codec_decode(switch_codec_t *codec,
 
 SWITCH_DECLARE(switch_status_t) switch_core_codec_destroy(switch_codec_t *codec)
 {
-	switch_mutex_t *mutex;
-	switch_memory_pool_t *pool;
+	switch_mutex_t *mutex = codec->mutex;
+	switch_memory_pool_t *pool = codec->memory_pool;
 	int free_pool = 0;
 
 	switch_assert(codec != NULL);
 
-	if (!switch_core_codec_ready(codec)) {
+	if (mutex) switch_mutex_lock(mutex);
+
+	if (switch_core_codec_ready(codec)) {
+		switch_clear_flag(codec, SWITCH_CODEC_FLAG_READY);
+	} else {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Codec is not initialized!\n");
+		if (mutex) switch_mutex_unlock(mutex);
 		return SWITCH_STATUS_NOT_INITALIZED;
 	}
 
@@ -687,23 +692,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_codec_destroy(switch_codec_t *codec)
 		free_pool = 1;
 	}
 
-	pool = codec->memory_pool;
-	mutex = codec->mutex;
-
-	if (mutex) {
-		switch_mutex_lock(mutex);
-		switch_clear_flag(codec, SWITCH_CODEC_FLAG_READY);
-		switch_mutex_unlock(mutex);
-		switch_mutex_lock(mutex);
-	}
-
 	codec->implementation->destroy(codec);
 	
 	UNPROTECT_INTERFACE(codec->codec_interface);
 
-	if (mutex) {
-		switch_mutex_unlock(mutex);
-	}
+	if (mutex) switch_mutex_unlock(mutex);
 	
 	if (free_pool) {
 		switch_core_destroy_memory_pool(&pool);
diff --git a/src/switch_core_io.c b/src/switch_core_io.c
index cd25622b5d..6f3e65a9f4 100644
--- a/src/switch_core_io.c
+++ b/src/switch_core_io.c
@@ -110,6 +110,15 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
 
 	switch_assert(session != NULL);
 
+
+	if (switch_mutex_trylock(session->codec_read_mutex) == SWITCH_STATUS_SUCCESS) {
+		switch_mutex_unlock(session->codec_read_mutex);
+	} else {
+		switch_cond_next();
+		*frame = &runtime.dummy_cng_frame;
+		return SWITCH_STATUS_SUCCESS;
+	}
+
 	if (!(session->read_codec && session->read_codec->implementation && switch_core_codec_ready(session->read_codec))) {
 		if (switch_channel_test_flag(session->channel, CF_PROXY_MODE) || switch_channel_get_state(session->channel) == CS_HIBERNATE) {
 			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "%s reading on a session with no media!\n",
@@ -641,11 +650,18 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
 		return SWITCH_STATUS_FALSE;
 	}
 
+	if (switch_mutex_trylock(session->codec_write_mutex) == SWITCH_STATUS_SUCCESS) {
+		switch_mutex_unlock(session->codec_write_mutex);
+	} else {
+		return SWITCH_STATUS_SUCCESS;
+	}
+
 	if (switch_test_flag(frame, SFF_CNG)) {
 		if (switch_channel_test_flag(session->channel, CF_ACCEPT_CNG)) {
 			pass_cng = 1;
+		} else {
+			return SWITCH_STATUS_SUCCESS;
 		}
-		return SWITCH_STATUS_SUCCESS;
 	}
 
 	if (!(session->write_codec && switch_core_codec_ready(session->write_codec)) && !pass_cng) {
diff --git a/src/switch_core_memory.c b/src/switch_core_memory.c
index 39d0403c42..a63ce0d6f9 100644
--- a/src/switch_core_memory.c
+++ b/src/switch_core_memory.c
@@ -548,7 +548,7 @@ static void *SWITCH_THREAD_FUNC pool_thread(switch_thread_t *thread, void *obj)
 				goto done;
 			}
 		} else {
-			switch_yield(100000);
+			switch_yield(1000000);
 		}
 	}
 
diff --git a/src/switch_core_rwlock.c b/src/switch_core_rwlock.c
index 4285491dc1..57168d9a29 100644
--- a/src/switch_core_rwlock.c
+++ b/src/switch_core_rwlock.c
@@ -36,6 +36,46 @@
 #include "private/switch_core_pvt.h"
 
 
+SWITCH_DECLARE(switch_status_t) switch_core_session_io_read_lock(switch_core_session_t *session)
+{
+	switch_status_t status = SWITCH_STATUS_FALSE;
+
+	if (session->io_rwlock) {
+		if (switch_thread_rwlock_tryrdlock(session->io_rwlock) == SWITCH_STATUS_SUCCESS) {
+			status = SWITCH_STATUS_SUCCESS;
+		}
+	}
+
+	return status;
+}
+
+SWITCH_DECLARE(switch_status_t) switch_core_session_io_write_lock(switch_core_session_t *session)
+{
+	switch_status_t status = SWITCH_STATUS_FALSE;
+
+	if (session->io_rwlock) {
+		switch_thread_rwlock_wrlock(session->io_rwlock);
+		status = SWITCH_STATUS_SUCCESS;
+	}
+
+	return status;
+}
+
+
+SWITCH_DECLARE(switch_status_t) switch_core_session_io_rwunlock(switch_core_session_t *session)
+{
+	switch_status_t status = SWITCH_STATUS_FALSE;
+
+	if (session->io_rwlock) {
+		switch_thread_rwlock_unlock(session->io_rwlock);
+		status = SWITCH_STATUS_SUCCESS;
+	}
+
+	return status;
+}
+
+
+
 #ifdef SWITCH_DEBUG_RWLOCKS
 SWITCH_DECLARE(switch_status_t) switch_core_session_perform_read_lock(switch_core_session_t *session, const char *file, const char *func, int line)
 #else
diff --git a/src/switch_core_session.c b/src/switch_core_session.c
index b3bb638c76..2567d17712 100644
--- a/src/switch_core_session.c
+++ b/src/switch_core_session.c
@@ -855,12 +855,31 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_queue_event(switch_core_sess
 		if (switch_queue_trypush(session->event_queue, *event) == SWITCH_STATUS_SUCCESS) {
 			*event = NULL;
 			status = SWITCH_STATUS_SUCCESS;
+
+			if (switch_channel_test_flag(session->channel, CF_PROXY_MODE) || switch_channel_test_flag(session->channel, CF_THREAD_SLEEPING)) {
+				switch_core_session_wake_session_thread(session);
+			}
 		}
 	}
 
 	return status;
 }
 
+SWITCH_DECLARE(uint32_t) switch_core_session_messages_waiting(switch_core_session_t *session)
+{
+	int x = 0;
+
+	if (session->private_event_queue) {
+		x += switch_queue_size(session->private_event_queue);
+	}
+
+	if (session->message_queue) {
+		x += switch_queue_size(session->message_queue);
+	}
+
+	return x;
+}
+
 SWITCH_DECLARE(uint32_t) switch_core_session_event_count(switch_core_session_t *session)
 {
 	if (session->event_queue) {
@@ -1308,6 +1327,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_uuid(switch_core_session
 {
 	switch_event_t *event;
 	switch_core_session_message_t msg = { 0 };
+	switch_caller_profile_t *profile;
 
 	switch_assert(use_uuid);
 
@@ -1324,6 +1344,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_uuid(switch_core_session
 	msg.string_array_arg[1] = use_uuid;
 	switch_core_session_receive_message(session, &msg);
 
+	if ((profile = switch_channel_get_caller_profile(session->channel))) {
+		profile->uuid = switch_core_strdup(profile->pool, use_uuid);
+	}
+
 	switch_event_create(&event, SWITCH_EVENT_CHANNEL_UUID);
 	switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Old-Unique-ID", session->uuid_str);
 	switch_core_hash_delete(session_manager.session_table, session->uuid_str);
@@ -1648,6 +1672,7 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_uuid(switch_
 	switch_thread_rwlock_create(&session->bug_rwlock, session->pool);
 	switch_thread_cond_create(&session->cond, session->pool);
 	switch_thread_rwlock_create(&session->rwlock, session->pool);
+	switch_thread_rwlock_create(&session->io_rwlock, session->pool);
 	switch_queue_create(&session->message_queue, SWITCH_MESSAGE_QUEUE_LEN, session->pool);
 	switch_queue_create(&session->event_queue, SWITCH_EVENT_QUEUE_LEN, session->pool);
 	switch_queue_create(&session->private_event_queue, SWITCH_EVENT_QUEUE_LEN, session->pool);
@@ -1799,6 +1824,28 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_get_app_flags(const char *ap
 
 }
 
+SWITCH_DECLARE(switch_status_t) switch_core_session_execute_application_async(switch_core_session_t *session, const char *app, const char *arg)
+{
+	switch_event_t *execute_event;
+	
+	if (switch_event_create(&execute_event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) {
+		switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "call-command", "execute");
+		switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "execute-app-name", app);
+
+		if (arg) {
+			switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "execute-app-arg", arg);
+		}
+		
+		switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "event-lock", "true");
+		switch_core_session_queue_private_event(session, &execute_event, SWITCH_FALSE);
+		
+		return SWITCH_STATUS_SUCCESS;
+	}
+
+	return SWITCH_STATUS_FALSE;
+}
+
+
 SWITCH_DECLARE(switch_status_t) switch_core_session_execute_application_get_flags(switch_core_session_t *session, const char *app,
 																				  const char *arg, int32_t *flags)
 {
@@ -1831,10 +1878,16 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_execute_application_get_flag
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Application %s Requires media on channel %s!\n",
 						  app, switch_channel_get_name(session->channel));
 	} else if (!switch_test_flag(application_interface, SAF_SUPPORT_NOMEDIA) && !switch_channel_media_ready(session->channel)) {
-		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Application %s Requires media! pre_answering channel %s\n",
-						  app, switch_channel_get_name(session->channel));
-		if (switch_channel_pre_answer(session->channel) != SWITCH_STATUS_SUCCESS) {
-			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Well, that didn't work very well did it? ...\n");
+		if (switch_channel_direction(session->channel) == SWITCH_CALL_DIRECTION_INBOUND) {
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Application %s Requires media! pre_answering channel %s\n",
+							  app, switch_channel_get_name(session->channel));
+			if (switch_channel_pre_answer(session->channel) != SWITCH_STATUS_SUCCESS) {
+				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Well, that didn't work very well did it? ...\n");
+				switch_goto_status(SWITCH_STATUS_FALSE, done);
+			}
+		} else {
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, 
+							  "Cannot execute app '%s' media required on an outbound channel that does not have media established\n", app);
 			switch_goto_status(SWITCH_STATUS_FALSE, done);
 		}
 	}
diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c
index 509d989581..4364ff2844 100644
--- a/src/switch_core_sqldb.c
+++ b/src/switch_core_sqldb.c
@@ -898,7 +898,7 @@ static void *SWITCH_THREAD_FUNC switch_core_sql_db_thread(switch_thread_t *threa
 			wake_thread(0);
 			sec = 0;
 		}
-		switch_yield(1000);
+		switch_yield(1000000);
 	}
 
 
@@ -913,11 +913,11 @@ static void *SWITCH_THREAD_FUNC switch_core_sql_thread(switch_thread_t *thread,
 	uint32_t target = 20000;
 	switch_size_t len = 0, sql_len = runtime.sql_buffer_len;
 	char *tmp, *sqlbuf = (char *) malloc(sql_len);
-	char *sql = NULL;
+	char *sql = NULL, *save_sql = NULL;
 	switch_size_t newlen;
-	int lc = 0;
+	int lc = 0, wrote = 0, do_sleep = 1;
 	uint32_t sanity = 120;
-
+	
 	switch_assert(sqlbuf);
 
 	while (!sql_manager.event_db) {
@@ -938,11 +938,16 @@ static void *SWITCH_THREAD_FUNC switch_core_sql_thread(switch_thread_t *thread,
 	switch_mutex_lock(sql_manager.cond_mutex);
 
 	while (sql_manager.thread_running == 1) {
-		if (sql || switch_queue_trypop(sql_manager.sql_queue[0], &pop) == SWITCH_STATUS_SUCCESS ||
+		if (save_sql || switch_queue_trypop(sql_manager.sql_queue[0], &pop) == SWITCH_STATUS_SUCCESS ||
 			switch_queue_trypop(sql_manager.sql_queue[1], &pop) == SWITCH_STATUS_SUCCESS) {
 
-			if (!sql) sql = (char *) pop;
-
+			if (save_sql) {
+				sql = save_sql;
+				save_sql = NULL;
+			} else if ((sql = (char *) pop)) {
+				pop = NULL;
+			}
+			
 			if (sql) {
 				newlen = strlen(sql) + 2;
 
@@ -971,6 +976,9 @@ static void *SWITCH_THREAD_FUNC switch_core_sql_thread(switch_thread_t *thread,
 						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, 
 										  "SAVE %d %d\n", switch_queue_size(sql_manager.sql_queue[0]), switch_queue_size(sql_manager.sql_queue[1]));
 #endif
+						save_sql = sql;
+						sql = NULL;
+						lc = 0;
 						goto skip;
 					}
 				}
@@ -986,10 +994,12 @@ static void *SWITCH_THREAD_FUNC switch_core_sql_thread(switch_thread_t *thread,
 			}
 		}
 
+		lc = switch_queue_size(sql_manager.sql_queue[0]) + switch_queue_size(sql_manager.sql_queue[1]);
+
 	skip:
 		
-		lc = sql ? 1 : 0 + switch_queue_size(sql_manager.sql_queue[0]) + switch_queue_size(sql_manager.sql_queue[1]);
-		
+		wrote = 0;
+
 		if (trans && iterations && (iterations > target || !lc)) {
 #ifdef DEBUG_SQL
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, 
@@ -1006,14 +1016,25 @@ static void *SWITCH_THREAD_FUNC switch_core_sql_thread(switch_thread_t *thread,
 			len = 0;
 			*sqlbuf = '\0';
 			lc = 0;
-			switch_yield(400000);
+			if (do_sleep) {
+				switch_yield(200000);
+			}
+			wrote = 1;
 		}
 
-		lc = sql ? 1 : 0 + switch_queue_size(sql_manager.sql_queue[0]) + switch_queue_size(sql_manager.sql_queue[1]);
+		lc = switch_queue_size(sql_manager.sql_queue[0]) + switch_queue_size(sql_manager.sql_queue[1]);
 		
 		if (!lc) {
 			switch_thread_cond_wait(sql_manager.cond, sql_manager.cond_mutex);
+		} else if (wrote) {
+			if (lc > 2000) {
+				do_sleep = 0;
+			} else {
+				do_sleep = 1;
+			}
 		}
+		
+		
 	}
 
 	switch_mutex_unlock(sql_manager.cond_mutex);
diff --git a/src/switch_cpp.cpp b/src/switch_cpp.cpp
index 469ae18c4b..40462db567 100644
--- a/src/switch_cpp.cpp
+++ b/src/switch_cpp.cpp
@@ -1269,120 +1269,7 @@ SWITCH_DECLARE(switch_status_t) CoreSession::process_callback_result(char *resul
 	this_check(SWITCH_STATUS_FALSE);
 	sanity_check(SWITCH_STATUS_FALSE);
 	
-    if (zstr(result)) {
-		return SWITCH_STATUS_SUCCESS;	
-    }
-
-	if (fhp) {
-		if (!switch_test_flag(fhp, SWITCH_FILE_OPEN)) {
-			return SWITCH_STATUS_FALSE;
-		}
-
-		if (!strncasecmp(result, "speed", 5)) {
-			char *p;
-		
-			if ((p = strchr(result, ':'))) {
-				p++;
-				if (*p == '+' || *p == '-') {
-					int step;
-					if (!(step = atoi(p))) {
-						step = 1;
-					}
-					fhp->speed += step;
-				} else {
-					int speed = atoi(p);
-					fhp->speed = speed;
-				}
-				return SWITCH_STATUS_SUCCESS;
-			}
-
-			return SWITCH_STATUS_FALSE;
-
-		} else if (!strncasecmp(result, "volume", 6)) {
-			char *p;
-			
-			if ((p = strchr(result, ':'))) {
-				p++;
-				if (*p == '+' || *p == '-') {
-					int step;
-					if (!(step = atoi(p))) {
-						step = 1;
-					}
-					fhp->vol += step;
-				} else {
-					int vol = atoi(p);
-					fhp->vol = vol;
-				}
-				return SWITCH_STATUS_SUCCESS;
-			}
-			
-			if (fhp->vol) {
-				switch_normalize_volume(fhp->vol);
-			}
-			
-			return SWITCH_STATUS_FALSE;
-		} else if (!strcasecmp(result, "pause")) {
-			if (switch_test_flag(fhp, SWITCH_FILE_PAUSE)) {
-				switch_clear_flag(fhp, SWITCH_FILE_PAUSE);
-			} else {
-				switch_set_flag(fhp, SWITCH_FILE_PAUSE);
-			}
-			return SWITCH_STATUS_SUCCESS;
-		} else if (!strcasecmp(result, "stop")) {
-			return SWITCH_STATUS_FALSE;
-		} else if (!strcasecmp(result, "truncate")) {
-			switch_core_file_truncate(fhp, 0);
-		} else if (!strcasecmp(result, "restart")) {
-			unsigned int pos = 0;
-			fhp->speed = 0;
-			switch_core_file_seek(fhp, &pos, 0, SEEK_SET);
-			return SWITCH_STATUS_SUCCESS;
-		} else if (!strncasecmp(result, "seek", 4)) {
-			switch_codec_t *codec;
-			unsigned int samps = 0;
-			unsigned int pos = 0;
-			char *p;
-			codec = switch_core_session_get_read_codec(session);
-			
-			if ((p = strchr(result, ':'))) {
-				p++;
-				if (*p == '+' || *p == '-') {
-					int step;
-					int32_t target;
-					if (!(step = atoi(p))) {
-						step = 1000;
-					}
-
-					samps = step * (codec->implementation->samples_per_second / 1000);
-					target = (int32_t)fhp->pos + samps;
-
-					if (target < 0) {
-						target = 0;
-					}
-
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "seek to position %d\n", target);
-					switch_core_file_seek(fhp, &pos, target, SEEK_SET);
-
-				} else {
-					samps = atoi(p) * (codec->implementation->samples_per_second / 1000);
-					if (samps < 0) {
-						samps = 0;
-					}
-					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "seek to position %d\n", samps);
-					switch_core_file_seek(fhp, &pos, samps, SEEK_SET);
-				}
-			}
-
-			return SWITCH_STATUS_SUCCESS;
-		}
-	}
-
-    if (!strcmp(result, "true") || !strcmp(result, "undefined")) {
-		return SWITCH_STATUS_SUCCESS;
-    }
-
-
-    return SWITCH_STATUS_FALSE;
+	return switch_ivr_process_fh(session, result, fhp);
 }
 
 /* For Emacs:
diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index e599839e16..46ba4e6659 100644
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -763,6 +763,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_park(switch_core_session_t *session,
 		write_frame.samples = write_frame.datalen / sizeof(int16_t);
 	}
 
+	if (switch_channel_test_flag(channel, CF_RECOVERED) && switch_channel_test_flag(channel, CF_CONTROLLED)) {
+		switch_channel_clear_flag(channel, CF_CONTROLLED);
+	}
+
 	if (switch_channel_test_flag(channel, CF_CONTROLLED)) {
 		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot park channels that are under control already.\n");
 		return SWITCH_STATUS_FALSE;
@@ -914,21 +918,23 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_park(switch_core_session_t *session,
 		if (switch_channel_has_dtmf(channel)) {
 			switch_dtmf_t dtmf = { 0 };
 				
-			if (!args->input_callback && !args->buf && !args->dmachine) {
+			if (args && !args->input_callback && !args->buf && !args->dmachine) {
 				status = SWITCH_STATUS_BREAK;
 				break;
 			}
 				
 			switch_channel_dequeue_dtmf(channel, &dtmf);
 
-			if (args->dmachine) {
-				char ds[2] = {dtmf.digit, '\0'};
-				if ((status = switch_ivr_dmachine_feed(args->dmachine, ds, NULL)) != SWITCH_STATUS_SUCCESS) {
-					break;
-				}
-			} else if (args && args->input_callback) {
-				if ((status = args->input_callback(session, (void *) &dtmf, SWITCH_INPUT_TYPE_DTMF, args->buf, args->buflen)) != SWITCH_STATUS_SUCCESS) {
-					break;
+			if (args) {
+				if (args->dmachine) {
+					char ds[2] = {dtmf.digit, '\0'};
+					if ((status = switch_ivr_dmachine_feed(args->dmachine, ds, NULL)) != SWITCH_STATUS_SUCCESS) {
+						break;
+					}
+				} else if (args->input_callback) {
+					if ((status = args->input_callback(session, (void *) &dtmf, SWITCH_INPUT_TYPE_DTMF, args->buf, args->buflen)) != SWITCH_STATUS_SUCCESS) {
+						break;
+					}
 				}
 			}
 		}
@@ -2557,6 +2563,280 @@ SWITCH_DECLARE(switch_bool_t) switch_ivr_uuid_exists(const char *uuid)
 	return exists;
 }
 
+SWITCH_DECLARE(switch_status_t) switch_ivr_process_fh(switch_core_session_t *session, const char *cmd, switch_file_handle_t *fhp)
+{
+    if (zstr(cmd)) {
+		return SWITCH_STATUS_SUCCESS;	
+    }
+
+	if (fhp) {
+		if (!switch_test_flag(fhp, SWITCH_FILE_OPEN)) {
+			return SWITCH_STATUS_FALSE;
+		}
+
+		if (!strncasecmp(cmd, "speed", 5)) {
+			char *p;
+		
+			if ((p = strchr(cmd, ':'))) {
+				p++;
+				if (*p == '+' || *p == '-') {
+					int step;
+					if (!(step = atoi(p))) {
+						step = 1;
+					}
+					fhp->speed += step;
+				} else {
+					int speed = atoi(p);
+					fhp->speed = speed;
+				}
+				return SWITCH_STATUS_SUCCESS;
+			}
+
+			return SWITCH_STATUS_FALSE;
+
+		} else if (!strncasecmp(cmd, "volume", 6)) {
+			char *p;
+			
+			if ((p = strchr(cmd, ':'))) {
+				p++;
+				if (*p == '+' || *p == '-') {
+					int step;
+					if (!(step = atoi(p))) {
+						step = 1;
+					}
+					fhp->vol += step;
+				} else {
+					int vol = atoi(p);
+					fhp->vol = vol;
+				}
+				return SWITCH_STATUS_SUCCESS;
+			}
+			
+			if (fhp->vol) {
+				switch_normalize_volume(fhp->vol);
+			}
+			
+			return SWITCH_STATUS_FALSE;
+		} else if (!strcasecmp(cmd, "pause")) {
+			if (switch_test_flag(fhp, SWITCH_FILE_PAUSE)) {
+				switch_clear_flag(fhp, SWITCH_FILE_PAUSE);
+			} else {
+				switch_set_flag(fhp, SWITCH_FILE_PAUSE);
+			}
+			return SWITCH_STATUS_SUCCESS;
+		} else if (!strcasecmp(cmd, "stop")) {
+			return SWITCH_STATUS_FALSE;
+		} else if (!strcasecmp(cmd, "truncate")) {
+			switch_core_file_truncate(fhp, 0);
+		} else if (!strcasecmp(cmd, "restart")) {
+			unsigned int pos = 0;
+			fhp->speed = 0;
+			switch_core_file_seek(fhp, &pos, 0, SEEK_SET);
+			return SWITCH_STATUS_SUCCESS;
+		} else if (!strncasecmp(cmd, "seek", 4)) {
+			switch_codec_t *codec;
+			unsigned int samps = 0;
+			unsigned int pos = 0;
+			char *p;
+			codec = switch_core_session_get_read_codec(session);
+			
+			if ((p = strchr(cmd, ':'))) {
+				p++;
+				if (*p == '+' || *p == '-') {
+					int step;
+					int32_t target;
+					if (!(step = atoi(p))) {
+						step = 1000;
+					}
+
+					samps = step * (codec->implementation->samples_per_second / 1000);
+					target = (int32_t)fhp->pos + samps;
+
+					if (target < 0) {
+						target = 0;
+					}
+
+					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "seek to position %d\n", target);
+					switch_core_file_seek(fhp, &pos, target, SEEK_SET);
+
+				} else {
+					samps = atoi(p) * (codec->implementation->samples_per_second / 1000);
+					if (samps < 0) {
+						samps = 0;
+					}
+					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "seek to position %d\n", samps);
+					switch_core_file_seek(fhp, &pos, samps, SEEK_SET);
+				}
+			}
+
+			return SWITCH_STATUS_SUCCESS;
+		}
+	}
+
+    if (!strcmp(cmd, "true") || !strcmp(cmd, "undefined")) {
+		return SWITCH_STATUS_SUCCESS;
+    }
+
+    return SWITCH_STATUS_FALSE;
+	
+}
+
+#define START_SAMPLES 32768
+
+SWITCH_DECLARE(switch_status_t) switch_ivr_insert_file(switch_core_session_t *session, const char *file, const char *insert_file, switch_size_t sample_point)
+{
+	switch_file_handle_t orig_fh = { 0 };
+	switch_file_handle_t new_fh = { 0 };
+	switch_codec_implementation_t read_impl = { 0 };
+	char *tmp_file;
+	switch_uuid_t uuid;
+	char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
+	int16_t *abuf = NULL;
+	switch_size_t olen = 0;
+	int asis = 0;
+	switch_channel_t *channel = switch_core_session_get_channel(session);
+	switch_size_t sample_count = 0;
+	uint32_t pos = 0;
+	char *ext;
+
+	switch_uuid_get(&uuid);
+	switch_uuid_format(uuid_str, &uuid);
+
+	if ((ext = strrchr(file, '.'))) {
+		ext++;
+	} else {
+		ext = "wav";
+	}
+	
+	tmp_file = switch_core_session_sprintf(session, "%s%smsg_%s.%s", 
+										   SWITCH_GLOBAL_dirs.temp_dir, SWITCH_PATH_SEPARATOR, uuid_str, ext);	
+	
+	switch_core_session_get_read_impl(session, &read_impl);
+	
+	new_fh.channels = read_impl.number_of_channels;
+	new_fh.native_rate = read_impl.actual_samples_per_second;
+
+
+	if (switch_core_file_open(&new_fh,
+							  tmp_file,
+							  new_fh.channels,
+							  read_impl.actual_samples_per_second, SWITCH_FILE_FLAG_WRITE | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failed to open file %s\n", tmp_file);
+		goto end;
+	}
+
+
+	if (switch_core_file_open(&orig_fh,
+							  file,
+							  new_fh.channels,
+							  read_impl.actual_samples_per_second, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failed to open file %s\n", file);
+		goto end;
+	}
+
+
+	switch_zmalloc(abuf, START_SAMPLES * sizeof(*abuf));
+
+	if (switch_test_flag((&orig_fh), SWITCH_FILE_NATIVE)) {
+		asis = 1;
+	}
+
+	while (switch_channel_ready(channel)) {
+		olen = START_SAMPLES;
+
+		if (!asis) {
+			olen /= 2;
+		}
+
+		if ((sample_count + olen) > sample_point) {
+			olen = sample_point - sample_count;
+		}
+
+		if (!olen || switch_core_file_read(&orig_fh, abuf, &olen) != SWITCH_STATUS_SUCCESS || !olen) {
+			break;
+		}
+
+		sample_count += olen;
+
+		switch_core_file_write(&new_fh, abuf, &olen);
+	}
+
+	switch_core_file_close(&orig_fh);
+
+
+	if (switch_core_file_open(&orig_fh,
+							  insert_file,
+							  new_fh.channels,
+							  read_impl.actual_samples_per_second, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failed to open file %s\n", file);
+		goto end;
+	}
+
+
+	while (switch_channel_ready(channel)) {
+		olen = START_SAMPLES;
+
+		if (!asis) {
+			olen /= 2;
+		}
+
+		if (switch_core_file_read(&orig_fh, abuf, &olen) != SWITCH_STATUS_SUCCESS || !olen) {
+			break;
+		}
+
+		sample_count += olen;
+
+		switch_core_file_write(&new_fh, abuf, &olen);
+	}
+
+	switch_core_file_close(&orig_fh);
+
+	if (switch_core_file_open(&orig_fh,
+							  file,
+							  new_fh.channels,
+							  read_impl.actual_samples_per_second, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failed to open file %s\n", file);
+		goto end;
+	}
+
+	pos = 0;
+	switch_core_file_seek(&orig_fh, &pos, sample_point, SEEK_SET);
+
+	while (switch_channel_ready(channel)) {
+		olen = START_SAMPLES;
+
+		if (!asis) {
+			olen /= 2;
+		}
+
+		if (switch_core_file_read(&orig_fh, abuf, &olen) != SWITCH_STATUS_SUCCESS || !olen) {
+			break;
+		}
+
+		sample_count += olen;
+
+		switch_core_file_write(&new_fh, abuf, &olen);
+	}
+
+ end:
+
+	if (switch_test_flag((&orig_fh), SWITCH_FILE_OPEN)) {
+		switch_core_file_close(&orig_fh);
+	}
+
+	if (switch_test_flag((&new_fh), SWITCH_FILE_OPEN)) {
+		switch_core_file_close(&new_fh);
+	}
+
+	switch_file_rename(tmp_file, file, switch_core_session_get_pool(session));
+	unlink(tmp_file);
+
+	switch_safe_free(abuf);
+
+	return SWITCH_STATUS_SUCCESS;
+}
+
+
 
 /* For Emacs:
  * Local Variables:
diff --git a/src/switch_ivr_bridge.c b/src/switch_ivr_bridge.c
index 2549554005..afd33f16a0 100644
--- a/src/switch_ivr_bridge.c
+++ b/src/switch_ivr_bridge.c
@@ -155,7 +155,6 @@ struct switch_ivr_bridge_data {
 	switch_input_callback_function_t input_callback;
 	void *session_data;
 	int clean_exit;
-	uint32_t skip_frames;
 };
 typedef struct switch_ivr_bridge_data switch_ivr_bridge_data_t;
 
@@ -169,7 +168,7 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
 	switch_channel_t *chan_a, *chan_b;
 	switch_frame_t *read_frame;
 	switch_core_session_t *session_a, *session_b;
-	uint32_t loop_count = 0;
+	uint32_t read_frame_count = 0;
 	const char *app_name = NULL, *app_arg = NULL;
 	const char *hook_var = NULL;
 	int inner_bridge = 0;
@@ -181,6 +180,8 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
 	const char *bridge_answer_timeout = NULL;
 	int answer_timeout, sent_update = 0;
 	time_t answer_limit = 0;
+	const char *exec_app = NULL;
+	const char *exec_data = NULL;
 
 #ifdef SWITCH_VIDEO_IN_THREADS
 	switch_thread_t *vid_thread = NULL;
@@ -201,6 +202,10 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
 	chan_a = switch_core_session_get_channel(session_a);
 	chan_b = switch_core_session_get_channel(session_b);
 
+	if ((exec_app = switch_channel_get_variable(chan_a, "bridge_pre_execute_app"))) {
+		exec_data = switch_channel_get_variable(chan_a, "bridge_pre_execute_data");
+	}
+
 	bypass_media_after_bridge = switch_channel_test_flag(chan_a, CF_BYPASS_MEDIA_AFTER_BRIDGE);
 	switch_channel_clear_flag(chan_a, CF_BYPASS_MEDIA_AFTER_BRIDGE);
 
@@ -212,7 +217,7 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
 	}
 
 	inner_bridge = switch_channel_test_flag(chan_a, CF_INNER_BRIDGE);
-
+	
 	if (!switch_channel_test_flag(chan_a, CF_ANSWERED) && (bridge_answer_timeout = switch_channel_get_variable(chan_a, "bridge_answer_timeout"))) {
 		if ((answer_timeout = atoi(bridge_answer_timeout)) < 0) {
 			answer_timeout = 0;
@@ -285,7 +290,6 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
 		switch_channel_state_t b_state;
 		switch_status_t status;
 		switch_event_t *event;
-		loop_count++;
 
 		if (switch_channel_test_flag(chan_a, CF_TRANSFER)) {
 			data->clean_exit = 1;
@@ -309,7 +313,7 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
 			goto end_of_bridge_loop;
 		}
 		
-		if (loop_count > DEFAULT_LEAD_FRAMES && switch_channel_media_ack(chan_a) && switch_core_session_private_event_count(session_a)) {
+		if (read_frame_count > DEFAULT_LEAD_FRAMES && switch_channel_media_ack(chan_a) && switch_core_session_private_event_count(session_a)) {
 			switch_channel_set_flag(chan_b, CF_SUSPEND);
 			msg.string_arg = data->b_uuid;
 			msg.message_id = SWITCH_MESSAGE_INDICATE_UNBRIDGE;
@@ -341,13 +345,24 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
 		}
 #endif
 
-		if (loop_count > DEFAULT_LEAD_FRAMES && switch_channel_media_ack(chan_a) &&
-			(bypass_media_after_bridge || switch_channel_test_flag(chan_a, CF_BYPASS_MEDIA_AFTER_BRIDGE)) && switch_channel_test_flag(chan_a, CF_ANSWERED)
-			&& switch_channel_test_flag(chan_b, CF_ANSWERED)) {
-			switch_ivr_nomedia(switch_core_session_get_uuid(session_a), SMF_REBRIDGE);
-			bypass_media_after_bridge = 0;
-			switch_channel_clear_flag(chan_a, CF_BYPASS_MEDIA_AFTER_BRIDGE);
-			goto end_of_bridge_loop;
+		if (read_frame_count > DEFAULT_LEAD_FRAMES && switch_channel_media_ack(chan_a)) {
+			
+			if (exec_app) {
+				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session_a), SWITCH_LOG_DEBUG, "%s Bridge execute app %s(%s)\n", 
+								  switch_channel_get_name(chan_a), exec_app, exec_data);
+
+				switch_core_session_execute_application_async(session_a, exec_app, exec_data);
+				exec_app = exec_data = NULL;
+			}
+
+
+			if ((bypass_media_after_bridge || switch_channel_test_flag(chan_a, CF_BYPASS_MEDIA_AFTER_BRIDGE)) && switch_channel_test_flag(chan_a, CF_ANSWERED)
+				&& switch_channel_test_flag(chan_b, CF_ANSWERED)) {
+				switch_ivr_nomedia(switch_core_session_get_uuid(session_a), SMF_REBRIDGE);
+				bypass_media_after_bridge = 0;
+				switch_channel_clear_flag(chan_a, CF_BYPASS_MEDIA_AFTER_BRIDGE);
+				goto end_of_bridge_loop;
+			}
 		}
 
 		/* if 1 channel has DTMF pass it to the other */
@@ -418,19 +433,24 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
 
 		if (ans_a != ans_b) {
 			switch_channel_t *un = ans_a ? chan_b : chan_a;
+			switch_channel_t *a = un == chan_b ? chan_a : chan_b;
 
 			if (!switch_channel_test_flag(un, CF_OUTBOUND)) {
-				switch_channel_pass_callee_id(un == chan_b ? chan_a : chan_b, un);
+				if (switch_channel_test_flag(a, CF_OUTBOUND) || (un == chan_a && !originator)) {
+					switch_channel_pass_callee_id(a, un);
+				}
+
 				if (switch_channel_answer(un) != SWITCH_STATUS_SUCCESS) {
 					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Media Establishment Failed.\n", switch_channel_get_name(un));
 					goto end_of_bridge_loop;
 				}
-			}
 
-			if (ans_a)
-				ans_b = 1;
-			else
-				ans_a = 1;
+				if (ans_a) {
+					ans_b = 1;
+				} else {
+					ans_a = 1;
+				}
+			}
 		}
 
 		if (originator && !sent_update && ans_a && ans_b && switch_channel_media_ack(chan_a) && switch_channel_media_ack(chan_b)) {
@@ -454,6 +474,7 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
 		status = switch_core_session_read_frame(session_a, &read_frame, SWITCH_IO_FLAG_NONE, stream_id);
 
 		if (SWITCH_READ_ACCEPTABLE(status)) {
+			read_frame_count++;
 			if (switch_test_flag(read_frame, SFF_CNG)) {
 				if (silence_val) {
 					switch_generate_sln_silence((int16_t *) silence_frame.data, silence_frame.samples, silence_val);
@@ -463,11 +484,6 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
 				}
 			}
 
-			if (data->skip_frames) {
-				data->skip_frames--;
-				continue;
-			}
-
 			if (switch_channel_test_flag(chan_a, CF_BRIDGE_NOWRITE)) {
 				continue;
 			}
@@ -1193,35 +1209,22 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
 			switch_channel_set_variable(peer_channel, SWITCH_SIGNAL_BOND_VARIABLE, switch_core_session_get_uuid(session));
 
 			if ((app = switch_channel_get_variable(caller_channel, "bridge_pre_execute_aleg_app"))) {
-				switch_event_t *execute_event;
-
-				data = switch_channel_get_variable(caller_channel, "bridge_pre_execute_aleg_data");
-				if (switch_event_create(&execute_event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) {
-					switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "call-command", "execute");
-					switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "execute-app-name", app);
-					switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "execute-app-arg", data);
-					switch_event_add_header(execute_event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5);
-					switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "event-lock", "true");
-					switch_core_session_queue_private_event(session, &execute_event, SWITCH_FALSE);
-					a_leg->skip_frames = DEFAULT_LEAD_FRAMES;
+				switch_channel_set_variable(caller_channel, "bridge_pre_execute_app", app);
+				
+				if ((data = switch_channel_get_variable(caller_channel, "bridge_pre_execute_aleg_data"))) {
+					switch_channel_set_variable(caller_channel, "bridge_pre_execute_data", data);
 				}
-
 			}
 
 			if ((app = switch_channel_get_variable(caller_channel, "bridge_pre_execute_bleg_app"))) {
-				switch_event_t *execute_event;
-				data = switch_channel_get_variable(caller_channel, "bridge_pre_execute_bleg_data");
-				if (switch_event_create(&execute_event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) {
-					switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "call-command", "execute");
-					switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "execute-app-name", app);
-					switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "execute-app-arg", data);
-					switch_event_add_header(execute_event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5);
-					switch_event_add_header_string(execute_event, SWITCH_STACK_BOTTOM, "event-lock", "true");
-					switch_core_session_queue_private_event(peer_session, &execute_event, SWITCH_FALSE);
-					b_leg->skip_frames = DEFAULT_LEAD_FRAMES;
-				}
-			}
+				switch_channel_set_variable(peer_channel, "bridge_pre_execute_app", app);
 
+				if ((data = switch_channel_get_variable(caller_channel, "bridge_pre_execute_bleg_data"))) {
+					switch_channel_set_variable(peer_channel, "bridge_pre_execute_data", data);
+				}
+				
+			}
+			
 			switch_channel_set_private(peer_channel, "_bridge_", b_leg);
 			switch_channel_set_state(peer_channel, CS_EXCHANGE_MEDIA);
 			audio_bridge_thread(NULL, (void *) a_leg);
@@ -1546,7 +1549,14 @@ SWITCH_DECLARE(void) switch_ivr_intercept_session(switch_core_session_t *session
 		}
 	}
 
-	switch_channel_pre_answer(channel);
+	if ((var = switch_channel_get_variable(channel, "intercept_unanswered_only")) && switch_true(var)) {
+		if ((switch_channel_test_flag(rchannel, CF_ANSWERED))) {
+			switch_core_session_rwunlock(rsession);
+			return;
+		}
+	}
+
+	switch_channel_answer(channel);
 
 	if (!zstr(buuid)) {
 		if ((bsession = switch_core_session_locate(buuid))) {
diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index da76cf6cbc..e61534798b 100644
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -635,8 +635,17 @@ static uint8_t check_channel_status(originate_global_t *oglobals, originate_stat
 				}
 			}
 		}
-
-		switch_ivr_parse_all_events(originate_status[i].peer_session);
+		
+		if (!switch_channel_test_flag(originate_status[i].peer_channel, CF_PARK) && 
+			!switch_channel_test_flag(originate_status[i].peer_channel, CF_CONSUME_ON_ORIGINATE)) {
+			if (switch_core_session_messages_waiting(originate_status[i].peer_session)) {
+				if (switch_channel_test_flag(originate_status[i].peer_channel, CF_THREAD_SLEEPING)) {
+					switch_core_session_wake_session_thread(originate_status[i].peer_session);
+				} else {
+					switch_ivr_parse_all_events(originate_status[i].peer_session);
+				}
+			}
+		}
 
 		state = switch_channel_get_state(originate_status[i].peer_channel);
 		if (state >= CS_HANGUP || state == CS_RESET || switch_channel_test_flag(originate_status[i].peer_channel, CF_TRANSFER) ||
diff --git a/src/switch_ivr_play_say.c b/src/switch_ivr_play_say.c
index 7285b894ea..3c8fa5e10f 100644
--- a/src/switch_ivr_play_say.c
+++ b/src/switch_ivr_play_say.c
@@ -913,6 +913,31 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_gentones(switch_core_session_t *sessi
 	return SWITCH_STATUS_SUCCESS;
 }
 
+SWITCH_DECLARE(switch_status_t) switch_ivr_get_file_handle(switch_core_session_t *session, switch_file_handle_t **fh)
+{
+	switch_file_handle_t *fhp;
+	switch_channel_t *channel = switch_core_session_get_channel(session);
+
+	*fh = NULL;
+	switch_core_session_io_read_lock(session);
+	
+	if ((fhp = switch_channel_get_private(channel, "__fh"))) {
+		*fh = fhp;
+		return SWITCH_STATUS_SUCCESS;
+	}
+
+	switch_core_session_io_rwunlock(session);
+
+	return SWITCH_STATUS_FALSE;
+}
+
+SWITCH_DECLARE(switch_status_t) switch_ivr_release_file_handle(switch_core_session_t *session, switch_file_handle_t **fh)
+{
+	*fh = NULL;
+	switch_core_session_io_rwunlock(session);
+
+	return SWITCH_STATUS_SUCCESS;
+}
 
 #define FILE_STARTSAMPLES 1024 * 32
 #define FILE_BLOCKSIZE 1024 * 8
@@ -994,6 +1019,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
 	}
 
 
+
+
 	if (play_delimiter) {
 		file_dup = switch_core_session_strdup(session, file);
 		argc = switch_separate_string(file_dup, play_delimiter, argv, (sizeof(argv) / sizeof(argv[0])));
@@ -1134,6 +1161,11 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
 			status = SWITCH_STATUS_NOTFOUND;
 			continue;
 		}
+
+		switch_core_session_io_write_lock(session);
+		switch_channel_set_private(channel, "__fh", fh);
+		switch_core_session_io_rwunlock(session);
+
 		if (switch_test_flag(fh, SWITCH_FILE_NATIVE)) {
 			asis = 1;
 		}
@@ -1208,7 +1240,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
 				} else {
 					switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
 									  "Raw Codec Activation Failed %s@%uhz %u channels %dms\n", codec_name, fh->samplerate, fh->channels, interval);
+					switch_core_session_io_write_lock(session);
+					switch_channel_set_private(channel, "__fh", NULL);
+					switch_core_session_io_rwunlock(session);
+
 					switch_core_file_close(fh);
+
 					switch_core_session_reset(session, SWITCH_TRUE, SWITCH_FALSE);
 					status = SWITCH_STATUS_GENERR;
 					continue;
@@ -1228,6 +1265,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
 			if (switch_core_timer_init(&timer, timer_name, interval, samples, pool) != SWITCH_STATUS_SUCCESS) {
 				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Setup timer failed!\n");
 				switch_core_codec_destroy(&codec);
+				switch_core_session_io_write_lock(session);
+				switch_channel_set_private(channel, "__fh", NULL);
+				switch_core_session_io_rwunlock(session);
 				switch_core_file_close(fh);
 				switch_core_session_reset(session, SWITCH_TRUE, SWITCH_FALSE);
 				status = SWITCH_STATUS_GENERR;
@@ -1538,6 +1578,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *sess
 		}
 		switch_channel_set_variable_printf(channel, "playback_samples", "%d", fh->samples_out);
 
+		switch_core_session_io_write_lock(session);
+		switch_channel_set_private(channel, "__fh", NULL);
+		switch_core_session_io_rwunlock(session);
+
 		switch_core_file_close(fh);
 
 		if (fh->audio_buffer) {
diff --git a/src/switch_loadable_module.c b/src/switch_loadable_module.c
index 7aee9a769b..c603e27459 100644
--- a/src/switch_loadable_module.c
+++ b/src/switch_loadable_module.c
@@ -1293,7 +1293,7 @@ SWITCH_DECLARE(switch_status_t) switch_loadable_module_init(switch_bool_t autolo
 				if (path && zstr(path)) {
 					path = SWITCH_GLOBAL_dirs.mod_dir;
 				}
-				if (switch_loadable_module_load_module_ex((char *) path, (char *) val, SWITCH_FALSE, global, &err) == SWITCH_STATUS_FALSE) {
+				if (switch_loadable_module_load_module_ex((char *) path, (char *) val, SWITCH_FALSE, global, &err) == SWITCH_STATUS_GENERR) {
 					if (critical && switch_true(critical)) {
 						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failed to load critical module '%s', abort()\n", val);
 						abort();
diff --git a/src/switch_odbc.c b/src/switch_odbc.c
index 36c3c996e8..5a88ba7690 100644
--- a/src/switch_odbc.c
+++ b/src/switch_odbc.c
@@ -160,11 +160,6 @@ static int db_is_up(switch_odbc_handle_t *handle)
 		strcpy((char *) sql, "select 1");
 	}
 
-	if (stmt) {
-		SQLFreeHandle(SQL_HANDLE_STMT, stmt);
-		stmt = NULL;
-	}
-
 	if (SQLAllocHandle(SQL_HANDLE_STMT, handle->con, &stmt) != SQL_SUCCESS) {
 		code = __LINE__;
 		goto error;
@@ -229,6 +224,11 @@ static int db_is_up(switch_odbc_handle_t *handle)
 		goto done;
 	}
 
+	if (stmt) {
+		SQLFreeHandle(SQL_HANDLE_STMT, stmt);
+		stmt = NULL;
+	}
+
 	switch_safe_free(err_str);
 	switch_yield(1000000);
 	goto top;
@@ -364,7 +364,6 @@ SWITCH_DECLARE(switch_odbc_status_t) switch_odbc_handle_exec_string(switch_odbc_
 			goto done;
 		}
 
-		result = SQLExecute(stmt);
 		result = SQLFetch(stmt);
 
 		if (result != SQL_SUCCESS && result != SQL_SUCCESS_WITH_INFO && result != SQL_NO_DATA) {
diff --git a/src/switch_utils.c b/src/switch_utils.c
index 75be02a31f..1a29e2b715 100644
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -726,18 +726,31 @@ SWITCH_DECLARE(switch_bool_t) switch_is_lan_addr(const char *ip)
 	if (zstr(ip))
 		return SWITCH_FALSE;
 
-	return (strncmp(ip, "10.", 3) &&
-			strncmp(ip, "192.168.", 8) &&
-			strncmp(ip, "127.", 4) &&
+	return (strncmp(ip, "10.", 3) &&       /* 10.0.0.0        -   10.255.255.255  (10/8 prefix)       */
+			strncmp(ip, "192.168.", 8) &&  /* 192.168.0.0     -   192.168.255.255 (192.168/16 prefix) */
+			strncmp(ip, "127.", 4) &&      /* 127.0.0.0       -   127.255.255.255 (127/8 prefix)      */
 			strncmp(ip, "255.", 4) &&
-			strncmp(ip, "0.", 2) &&
+			strncmp(ip, "0.", 2) &&       
 			strncmp(ip, "1.", 2) &&
 			strncmp(ip, "2.", 2) &&
-			strncmp(ip, "172.16.", 7) &&
+			strncmp(ip, "172.16.", 7) &&   /* 172.16.0.0      -   172.31.255.255  (172.16/12 prefix)  */
 			strncmp(ip, "172.17.", 7) &&
 			strncmp(ip, "172.18.", 7) &&
 			strncmp(ip, "172.19.", 7) &&
-			strncmp(ip, "172.2", 5) && strncmp(ip, "172.30.", 7) && strncmp(ip, "172.31.", 7) && strncmp(ip, "192.0.2.", 8) && strncmp(ip, "169.254.", 8)
+			strncmp(ip, "172.20.", 7) &&
+			strncmp(ip, "172.21.", 7) &&
+			strncmp(ip, "172.22.", 7) &&
+			strncmp(ip, "172.23.", 7) &&
+			strncmp(ip, "172.24.", 7) &&
+			strncmp(ip, "172.25.", 7) &&
+			strncmp(ip, "172.26.", 7) &&
+			strncmp(ip, "172.27.", 7) &&
+			strncmp(ip, "172.28.", 7) &&
+			strncmp(ip, "172.29.", 7) &&
+			strncmp(ip, "172.30.", 7) &&
+			strncmp(ip, "172.31.", 7) &&
+			strncmp(ip, "192.0.2.", 8) &&  /* 192.0.2.0       -   192.0.2.255      (192.0.2/24 prefix) */
+			strncmp(ip, "169.254.", 8)     /* 169.254.0.0     -   169.254.255.255  (169.254/16 prefix) */
 		)? SWITCH_FALSE : SWITCH_TRUE;
 }
 
diff --git a/src/switch_xml.c b/src/switch_xml.c
index a7bfe413d0..05cfe9fd4c 100644
--- a/src/switch_xml.c
+++ b/src/switch_xml.c
@@ -1980,19 +1980,16 @@ static char not_so_threadsafe_error_buffer[256] = "";
 SWITCH_DECLARE(switch_xml_t) switch_xml_open_root(uint8_t reload, const char **err)
 {
 	char path_buf[1024];
-	uint8_t hasmain = 0, errcnt = 0;
+	uint8_t errcnt = 0;
 	switch_xml_t new_main, r = NULL;
 
 	switch_mutex_lock(XML_LOCK);
 
 	if (MAIN_XML_ROOT) {
-		hasmain++;
-
 		if (!reload) {
 			r = switch_xml_root();
 			goto done;
 		}
-		switch_thread_rwlock_wrlock(RWLOCK);
 	}
 
 	switch_snprintf(path_buf, sizeof(path_buf), "%s%s%s", SWITCH_GLOBAL_dirs.conf_dir, SWITCH_PATH_SEPARATOR, "freeswitch.xml");
@@ -2007,9 +2004,15 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_open_root(uint8_t reload, const char **e
 		} else {
 			switch_xml_t old_root;
 			*err = "Success";
+
+			switch_thread_rwlock_wrlock(RWLOCK);
+
 			old_root = MAIN_XML_ROOT;
 			MAIN_XML_ROOT = new_main;
 			switch_set_flag(MAIN_XML_ROOT, SWITCH_XML_ROOT);
+
+			switch_thread_rwlock_unlock(RWLOCK);
+
 			switch_xml_free(old_root);
 			/* switch_xml_free_in_thread(old_root); */
 		}
@@ -2018,10 +2021,6 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_open_root(uint8_t reload, const char **e
 		errcnt++;
 	}
 
-	if (hasmain) {
-		switch_thread_rwlock_unlock(RWLOCK);
-	}
-
 	if (errcnt == 0) {
 		switch_event_t *event;
 		if (switch_event_create(&event, SWITCH_EVENT_RELOADXML) == SWITCH_STATUS_SUCCESS) {
diff --git a/support-d/.gdbinit b/support-d/.gdbinit
old mode 100644
new mode 100755
index 942b761adf..e32687cfc4
--- a/support-d/.gdbinit
+++ b/support-d/.gdbinit
@@ -1,3 +1,6 @@
+handle SIGPIPE pass noprint nostop
+handle SIGTTIN pass noprint nostop
+
 # FreeSWITCH Custom GDB commands
 define list_sessions
 	dont-repeat
diff --git a/w32/Setup/Setup.wixproj b/w32/Setup/Setup.wixproj
index 9aba3a1d34..fa6c832777 100644
--- a/w32/Setup/Setup.wixproj
+++ b/w32/Setup/Setup.wixproj
@@ -336,6 +336,15 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>MODLOCATION</RefTargetDir>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\asr_tts\mod_cepstral\mod_cepstral.2010.vcxproj">
+      <Name>mod_cepstral</Name>
+      <Project>{692f6330-4d87-4c82-81df-40db5892636e}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\mod\asr_tts\mod_pocketsphinx\mod_pocketsphinx.2010.vcxproj">
       <Name>mod_pocketsphinx</Name>
       <Project>{2286da73-9fc5-45bc-a508-85994c3317ab}</Project>
@@ -597,6 +606,51 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>MODLOCATION</RefTargetDir>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\languages\mod_spidermonkey\mod_spidermonkey.2010.vcxproj">
+      <Name>mod_spidermonkey</Name>
+      <Project>{1ad3f51e-bbb6-4090-ba39-9dfab1ef1f5f}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\languages\mod_spidermonkey\mod_spidermonkey_core_db.2010.vcxproj">
+      <Name>mod_spidermonkey_core_db</Name>
+      <Project>{acfff684-4d19-4d48-af12-88ea1d778bdf}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\languages\mod_spidermonkey\mod_spidermonkey_odbc.2010.vcxproj">
+      <Name>mod_spidermonkey_odbc</Name>
+      <Project>{0a6b5ea5-6e9b-4a51-931f-ed25aa87b4df}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\languages\mod_spidermonkey\mod_spidermonkey_socket.2010.vcxproj">
+      <Name>mod_spidermonkey_socket</Name>
+      <Project>{028c7278-05d7-4e18-82fe-be231b844f41}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\mod\languages\mod_spidermonkey\mod_spidermonkey_teletone.2010.vcxproj">
+      <Name>mod_spidermonkey_teletone</Name>
+      <Project>{8f992c49-6c51-412f-b2a3-34eab708eb65}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>MODLOCATION</RefTargetDir>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\mod\loggers\mod_console\mod_console.2010.vcxproj">
       <Name>mod_console</Name>
       <Project>{1c453396-d912-4213-89fd-9b489162b7b5}</Project>