diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index a27e6e8..bf0cee4 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -10,6 +10,7 @@ Bundle-ManifestVersion: 2
 Bundle-Description: This is the FritzboxTr064 binding of the open Home Aut
  omation Bus (openHAB)
 Import-Package: javax.net.ssl,
+ org.apache.commons.httpclient.params;version="3.1.0",
  org.apache.commons.lang,
  org.openhab.core.binding,
  org.openhab.core.events,
@@ -27,7 +28,7 @@ Import-Package: javax.net.ssl,
  org.slf4j
 Export-Package: org.openhab.binding.fritzboxtr064
 Bundle-DocURL: http://www.openhab.org
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Service-Component: OSGI-INF/binding.xml, OSGI-INF/genericbindingprovider.xml
 Bundle-ClassPath: lib/httpclient-4.4.1.jar,
  lib/httpcore-4.4.1.jar,
diff --git a/OSGI-INF/binding.xml b/OSGI-INF/binding.xml
index 520c409..afbecf8 100644
--- a/OSGI-INF/binding.xml
+++ b/OSGI-INF/binding.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2010-2015, openHAB.org and others.
+    Copyright (c) 2010-2016, openHAB.org and others.
 
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License v1.0
diff --git a/OSGI-INF/genericbindingprovider.xml b/OSGI-INF/genericbindingprovider.xml
index c7ff651..ac7f583 100644
--- a/OSGI-INF/genericbindingprovider.xml
+++ b/OSGI-INF/genericbindingprovider.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2010-2015, openHAB.org and others.
+    Copyright (c) 2010-2016, openHAB.org and others.
 
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License v1.0
diff --git a/lib/xercesImpl.jar b/lib/xercesImpl.jar
new file mode 100644
index 0000000..0aaa990
Binary files /dev/null and b/lib/xercesImpl.jar differ
diff --git a/pom.xml b/pom.xml
index 82eb22a..02693f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.openhab.bundles</groupId>
 		<artifactId>binding</artifactId>
-		<version>1.8.0-SNAPSHOT</version>
+		<version>1.9.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/src/main/java/org/openhab/binding/fritzboxtr064/FritzboxTr064BindingProvider.java b/src/main/java/org/openhab/binding/fritzboxtr064/FritzboxTr064BindingProvider.java
index 524ef18..73fae57 100644
--- a/src/main/java/org/openhab/binding/fritzboxtr064/FritzboxTr064BindingProvider.java
+++ b/src/main/java/org/openhab/binding/fritzboxtr064/FritzboxTr064BindingProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2010-2015, openHAB.org and others.
+ * Copyright (c) 2010-2016, openHAB.org and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,7 +16,7 @@
  * @since 0.1.0
  */
 public interface FritzboxTr064BindingProvider extends BindingProvider {
-	
-	public FritzboxTr064BindingConfig getBindingConfigByItemName(String itemName);
+
+    public FritzboxTr064BindingConfig getBindingConfigByItemName(String itemName);
 
 }
diff --git a/src/main/java/org/openhab/binding/fritzboxtr064/internal/CallEvent.java b/src/main/java/org/openhab/binding/fritzboxtr064/internal/CallEvent.java
index 21a5d58..b663a98 100644
--- a/src/main/java/org/openhab/binding/fritzboxtr064/internal/CallEvent.java
+++ b/src/main/java/org/openhab/binding/fritzboxtr064/internal/CallEvent.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2010-2015, openHAB.org and others.
+ * Copyright (c) 2010-2016, openHAB.org and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -12,137 +12,140 @@
 import org.slf4j.LoggerFactory;
 
 /***
- * 
+ *
  * Call Events received from fbox.
  * Objects of this class represent parsed lines from fbox
  * call events
- * 
- *  12.10.15 20:24:22;RING;0;01715478654;6547841;SIP2;
- *  12.10.15 20:24:24;DISCONNECT;0;0;
- * 
+ *
+ * 12.10.15 20:24:22;RING;0;01715478654;6547841;SIP2;
+ * 12.10.15 20:24:24;DISCONNECT;0;0;
+ *
  * @author gitbock
  * @since 1.8.0
  *
  */
 public class CallEvent {
-	private String _timestamp;
-	private String _callType;
-	private String _id;
-	private String _externalNo;
-	private String _internalNo;
-	private String _connectionType;
-	private String _raw;
-	private String _line;
-	
-	//default logger
-	private static final Logger logger =  LoggerFactory.getLogger(FritzboxTr064Binding.class);
-	
-	public CallEvent(String rawEvent) {
-		this._raw = rawEvent;
-
-	}
-	
-	
-	public String getLine() {
-		return _line;
-	}
-
-
-	public void setLine(String _line) {
-		this._line = _line;
-	}
-
-
-	public String getTimestamp() {
-		return _timestamp;
-	}
-	public void setTimestamp(String _timestamp) {
-		this._timestamp = _timestamp;
-	}
-	public String getCallType() {
-		return _callType;
-	}
-	public void setCallType(String _callType) {
-		this._callType = _callType;
-	}
-	public String getId() {
-		return _id;
-	}
-	public void setId(String _id) {
-		this._id = _id;
-	}
-	public String getExternalNo() {
-		return _externalNo;
-	}
-	public void setExternalNo(String _externalNo) {
-		this._externalNo = _externalNo;
-	}
-	public String getInternalNo() {
-		return _internalNo;
-	}
-	public void setInternalNo(String _internalNo) {
-		this._internalNo = _internalNo;
-	}
-	public String getConnectionType() {
-		return _connectionType;
-	}
-	public void setConnectionType(String _connectionType) {
-		this._connectionType = _connectionType;
-	}
-	public String getRaw() {
-		return _raw;
-	}
-	public void setRaw(String _raw) {
-		this._raw = _raw;
-	}
-	
-	
-	/***
-	 * parses the raw event string/line from fbox into fields of object
-	 * @return true if parsing was successful
-	 */
-	public boolean parseRawEvent() {
-		if(_raw == null){ //check if we have something to parse
-			logger.error("Cannot parse call event. No input provided!");
-			return false;
-		}
-		String[] fields = _raw.split(";");
-		if(fields.length < 4){
-			logger.error("Cannot parse call event. Unexpected line received {}",_raw);
-			return false;
-		}
-		this._timestamp = fields[0];
-		this._callType = fields[1];
-		this._id = fields[2];
-		if (this._callType.equals("RING")) {
-			this._externalNo = fields[3];
-			this._internalNo = fields[4];
-			this._connectionType = fields[5];
-		} else if (this._callType.equals("CONNECT")) {
-			this._line = fields[3];
-			this._externalNo = fields[4];
-		} else if (this._callType.equals("CALL")) {
-			this._line = fields[3];
-			this._internalNo = fields[4];
-			this._externalNo = fields[5];
-			this._connectionType = fields[6];
-		}
-		logger.debug("Successfully parsed Call Event: {}",this.toString());
-		return true;
-	}
-
-
-	@Override
-	public String toString() {
-		return "CallEvent [_timestamp=" + _timestamp + ", _callType="
-				+ _callType + ", _id=" + _id + ", _externalNo=" + _externalNo
-				+ ", _internalNo=" + _internalNo + ", _connectionType="
-				+ _connectionType + ", _line=" + _line + "]";
-	}
-	
-	
-	
-	
-
-	
+    private String _timestamp;
+    private String _callType;
+    private String _id;
+    private String _externalNo;
+    private String _internalNo;
+    private String _connectionType;
+    private String _raw;
+    private String _line;
+
+    // default logger
+    private static final Logger logger = LoggerFactory.getLogger(FritzboxTr064Binding.class);
+
+    public CallEvent(String rawEvent) {
+        this._raw = rawEvent;
+
+    }
+
+    public String getLine() {
+        return _line;
+    }
+
+    public void setLine(String _line) {
+        this._line = _line;
+    }
+
+    public String getTimestamp() {
+        return _timestamp;
+    }
+
+    public void setTimestamp(String _timestamp) {
+        this._timestamp = _timestamp;
+    }
+
+    public String getCallType() {
+        return _callType;
+    }
+
+    public void setCallType(String _callType) {
+        this._callType = _callType;
+    }
+
+    public String getId() {
+        return _id;
+    }
+
+    public void setId(String _id) {
+        this._id = _id;
+    }
+
+    public String getExternalNo() {
+        return _externalNo;
+    }
+
+    public void setExternalNo(String _externalNo) {
+        this._externalNo = _externalNo;
+    }
+
+    public String getInternalNo() {
+        return _internalNo;
+    }
+
+    public void setInternalNo(String _internalNo) {
+        this._internalNo = _internalNo;
+    }
+
+    public String getConnectionType() {
+        return _connectionType;
+    }
+
+    public void setConnectionType(String _connectionType) {
+        this._connectionType = _connectionType;
+    }
+
+    public String getRaw() {
+        return _raw;
+    }
+
+    public void setRaw(String _raw) {
+        this._raw = _raw;
+    }
+
+    /***
+     * parses the raw event string/line from fbox into fields of object
+     * 
+     * @return true if parsing was successful
+     */
+    public boolean parseRawEvent() {
+        if (_raw == null) { // check if we have something to parse
+            logger.error("Cannot parse call event. No input provided!");
+            return false;
+        }
+        String[] fields = _raw.split(";");
+        if (fields.length < 4) {
+            logger.error("Cannot parse call event. Unexpected line received {}", _raw);
+            return false;
+        }
+        this._timestamp = fields[0];
+        this._callType = fields[1];
+        this._id = fields[2];
+        if (this._callType.equals("RING")) {
+            this._externalNo = fields[3];
+            this._internalNo = fields[4];
+            this._connectionType = fields[5];
+        } else if (this._callType.equals("CONNECT")) {
+            this._line = fields[3];
+            this._externalNo = fields[4];
+        } else if (this._callType.equals("CALL")) {
+            this._line = fields[3];
+            this._internalNo = fields[4];
+            this._externalNo = fields[5];
+            this._connectionType = fields[6];
+        }
+        logger.debug("Successfully parsed Call Event: {}", this.toString());
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "CallEvent [_timestamp=" + _timestamp + ", _callType=" + _callType + ", _id=" + _id + ", _externalNo="
+                + _externalNo + ", _internalNo=" + _internalNo + ", _connectionType=" + _connectionType + ", _line="
+                + _line + "]";
+    }
+
 }
diff --git a/src/main/java/org/openhab/binding/fritzboxtr064/internal/CallMonitor.java b/src/main/java/org/openhab/binding/fritzboxtr064/internal/CallMonitor.java
index ed3686a..0faa8d6 100644
--- a/src/main/java/org/openhab/binding/fritzboxtr064/internal/CallMonitor.java
+++ b/src/main/java/org/openhab/binding/fritzboxtr064/internal/CallMonitor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2010-2015, openHAB.org and others.
+ * Copyright (c) 2010-2016, openHAB.org and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -45,377 +45,370 @@
 /***
  * Wrapper class which handles all data/comm. when call monitoing is used
  * Thread control class
+ * 
  * @author gitbock
  * @since 1.8.0
  */
-public class CallMonitor extends Thread{
-	
-	//port number to connect at fbox
-	private final int _DEFAULT_MONITOR_PORT = 1012;
-	
-	// Event Publisher from parent Generic Binding
-	// to be able to pass item updates within this class
-	protected EventPublisher _eventPublisher;
-	
-	// Default openhab Logger
-	protected final static Logger logger = LoggerFactory.getLogger(FritzboxTr064Binding.class);
-	
-	// Main Monitor Thread receiving fbox messages
-	protected CallMonitorThread _monitorThread;
-	
-	//ip and port to connect
-	protected String _ip;
-	protected int _port;
-	
-	//Phonebook Manager to resolve phone numbers in names
-	protected PhonebookManager _pbm;
-	
-	//Providers to be able to extract all required items
-	private Collection<FritzboxTr064BindingProvider> _providers;
-	
-	protected static CallMonitor _instance;
-	
-	/***
-	 * 
-	 * @param url from openhab.cfg to connect to fbox
-	 * @param ep eventPublisher to pass updates to items
-	 * @param providers all items relevant for this binding
-	 */
-	public CallMonitor(String url, EventPublisher ep, Collection<FritzboxTr064BindingProvider> providers, PhonebookManager pbm ){
-		this._eventPublisher = ep;
-		this._ip = parseIpFromUrl(url);
-		this._port = _DEFAULT_MONITOR_PORT;
-		this._providers = providers;
-		this._pbm = pbm;
-		_instance = this;
-	}
-	
-	
-	/***
-	 * In Main Config only the TR064 URL is provided. Need IP for Socket connection.
-	 * Parses the IP from URL String
-	 * @param url String
-	 * @return IP address from url
-	 */
-	private String parseIpFromUrl(String url) {
-		String ip = "";
-		Pattern pat = Pattern.compile("(https?://)([^:^/]*)(:\\d*)?(.*)?");
-		
-		Matcher m = pat.matcher(url);
-		if(m.find()){
-			ip = m.group(2);
-		}
-		else{
-			logger.error("Cannot get IP from FritzBox URL:  {}",url);
-		}
-		return ip;
-	}
-
-
-	
-	
-	/***
-	 * reset the connection to fbox periodically
-	 */
-	public void setupReconnectJob(){
-		try {
-			//String cronPattern = "0 0 0 * * ?"; //every day
-			//String cronPattern = "0 * * * * ?"; //every minute
-			String cronPattern = "0 0 0/2 * * ?"; //every 2 hrs
-			Scheduler sched = StdSchedulerFactory.getDefaultScheduler();
-                    
+public class CallMonitor extends Thread {
+
+    // port number to connect at fbox
+    private final int _DEFAULT_MONITOR_PORT = 1012;
+
+    // Event Publisher from parent Generic Binding
+    // to be able to pass item updates within this class
+    protected EventPublisher _eventPublisher;
+
+    // Default openhab Logger
+    protected final static Logger logger = LoggerFactory.getLogger(FritzboxTr064Binding.class);
+
+    // Main Monitor Thread receiving fbox messages
+    protected CallMonitorThread _monitorThread;
+
+    // ip and port to connect
+    protected String _ip;
+    protected int _port;
+
+    // Phonebook Manager to resolve phone numbers in names
+    protected PhonebookManager _pbm;
+
+    // Providers to be able to extract all required items
+    private Collection<FritzboxTr064BindingProvider> _providers;
+
+    protected static CallMonitor _instance;
+
+    /***
+     * 
+     * @param url from openhab.cfg to connect to fbox
+     * @param ep eventPublisher to pass updates to items
+     * @param providers all items relevant for this binding
+     */
+    public CallMonitor(String url, EventPublisher ep, Collection<FritzboxTr064BindingProvider> providers,
+            PhonebookManager pbm) {
+        this._eventPublisher = ep;
+        this._ip = parseIpFromUrl(url);
+        this._port = _DEFAULT_MONITOR_PORT;
+        this._providers = providers;
+        this._pbm = pbm;
+        _instance = this;
+    }
+
+    /***
+     * In Main Config only the TR064 URL is provided. Need IP for Socket connection.
+     * Parses the IP from URL String
+     * 
+     * @param url String
+     * @return IP address from url
+     */
+    private String parseIpFromUrl(String url) {
+        String ip = "";
+        Pattern pat = Pattern.compile("(https?://)([^:^/]*)(:\\d*)?(.*)?");
+
+        Matcher m = pat.matcher(url);
+        if (m.find()) {
+            ip = m.group(2);
+        } else {
+            logger.error("Cannot get IP from FritzBox URL:  {}", url);
+        }
+        return ip;
+    }
+
+    /***
+     * reset the connection to fbox periodically
+     */
+    public void setupReconnectJob() {
+        try {
+            // String cronPattern = "0 0 0 * * ?"; //every day
+            // String cronPattern = "0 * * * * ?"; //every minute
+            String cronPattern = "0 0 0/2 * * ?"; // every 2 hrs
+            Scheduler sched = StdSchedulerFactory.getDefaultScheduler();
+
             JobKey jobKey = jobKey("Reconnect", "FritzBox");
             TriggerKey triggerKey = triggerKey("Reconnect", "FritzBox");
-            
+
             if (sched.checkExists(jobKey)) {
                 logger.debug("reconnection job already exists");
             } else {
-                CronScheduleBuilder scheduleBuilder = 
-                		CronScheduleBuilder.cronSchedule(cronPattern);
-                
+                CronScheduleBuilder scheduleBuilder = CronScheduleBuilder.cronSchedule(cronPattern);
+
                 JobDetail job = newJob(ReconnectJob.class).withIdentity(jobKey).build();
 
-                CronTrigger trigger = newTrigger()
-                        .withIdentity(triggerKey)
-                        .withSchedule(scheduleBuilder)
-                        .build();
+                CronTrigger trigger = newTrigger().withIdentity(triggerKey).withSchedule(scheduleBuilder).build();
 
                 sched.scheduleJob(job, trigger);
-                logger.debug("Scheduled reconnection job to FritzBox: {}",cronPattern);
+                logger.debug("Scheduled reconnection job to FritzBox: {}", cronPattern);
+            }
+        } catch (SchedulerException e) {
+            logger.warn("Could not create daily reconnection job", e);
+        }
+    }
+
+    /***
+     * cancel the reconnect job
+     */
+    public void shutdownReconnectJob() {
+        Scheduler sched = null;
+        try {
+            sched = StdSchedulerFactory.getDefaultScheduler();
+            JobKey jobKey = jobKey("Reconnect", "FritzBox");
+            if (sched.checkExists(jobKey)) {
+                logger.debug("Found reconnection job. Shutting down...");
+                sched.deleteJob(jobKey);
+            }
+
+        } catch (SchedulerException e) {
+            logger.warn("Error shutting down reconnect job: {}", e.getLocalizedMessage());
+        }
+    }
+
+    /**
+     * A quartz scheduler job to simply do a reconnection to the FritzBox.
+     */
+    public static class ReconnectJob implements Job {
+        @Override
+        public void execute(JobExecutionContext arg0) throws JobExecutionException {
+            Logger logger = LoggerFactory.getLogger(FritzboxTr064Binding.class);
+            logger.info("Fritzbox Reconnect Job executed");
+            _instance.stopThread();
+
+            // create a new thread for listening to the FritzBox
+            _instance._monitorThread = _instance.new CallMonitorThread();
+
+            // Wait before reconnect
+            try {
+                sleep(5000L);
+            } catch (InterruptedException e) {
+
+            }
+            logger.debug("Reconnect Job starts new monitor Thread");
+            _instance._monitorThread.start();
+
+        }
+    }
+
+    /***
+     * thread for setting up socket to fbox, listening for messages, parsing them
+     * and updating items. Most of this code is from Kai Kreuzers original
+     * fritzbox binding!
+     * 
+     * @author gitbock
+     *
+     */
+    public class CallMonitorThread extends Thread {
+
+        /***
+         * Devnote:
+         * Objects need to be set here, not in parent class!
+         * Otherwise compiler can see them, but at runtime wrong values are given(?)
+         */
+
+        // Socket to connect
+        private Socket _socket;
+
+        // Thread control flag
+        private boolean _interrupted = false;
+
+        // time to wait before reconnecting
+        private long _reconnectTime = 60000L;
+
+        public CallMonitorThread() {
+
+        }
+
+        @Override
+        public void run() {
+            logger.debug("Callmonitor Thread [{}] is interrupted: {}", Thread.currentThread().getId(), _interrupted);
+            while (!_interrupted) {
+                if (_ip != null) {
+                    BufferedReader reader = null;
+                    try {
+                        logger.info("Callmonitor Thread [{}] attempting connection to FritzBox on {}:{}..",
+                                Thread.currentThread().getId(), _ip, _port);
+                        _socket = new Socket(_ip, _port);
+                        reader = new BufferedReader(new InputStreamReader(_socket.getInputStream()));
+                        // reset the retry interval
+                        _reconnectTime = 60000L;
+                    } catch (Exception e) {
+                        logger.warn("Error attempting to connect to FritzBox. Retrying in {}s", _reconnectTime / 1000L,
+                                e);
+                        try {
+                            Thread.sleep(_reconnectTime);
+                        } catch (InterruptedException ex) {
+                            _interrupted = true;
+                        }
+                        // wait another more minute the next time
+                        _reconnectTime += 60000L;
+                    }
+                    if (reader != null) {
+                        logger.info("Connected to FritzBox on {}:{}", _ip, _port);
+                        while (!_interrupted) {
+                            try {
+                                String line = reader.readLine();
+                                if (line != null) {
+                                    logger.debug("Received raw call string from fbox: {}", line);
+                                    CallEvent ce = new CallEvent(line);
+                                    if (ce.parseRawEvent()) {
+                                        handleCallEvent(ce);
+                                    } else {
+                                        logger.error("Call Event could not be parsed!");
+                                    }
+                                    try {
+                                        // wait a moment, so that rules can be
+                                        // processed
+                                        // see
+                                        // http://knx-user-forum.de/openhab/25024-bug-im-fritzbox-binding.html
+                                        sleep(100L);
+                                    } catch (InterruptedException e) {
+                                    }
+                                }
+                            } catch (IOException e) {
+                                if (_interrupted) {
+                                    logger.info("Lost connection to Fritzbox because of interrupt");
+                                } else {
+                                    logger.error("Lost connection to FritzBox", e);
+                                }
+                                break;
+                            } finally {
+                                // allow a few seconds until reconnect.
+                                // needed for interrupt state to settle?
+                                try {
+                                    sleep(5000L);
+                                } catch (InterruptedException e) {
+
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        /**
+         * Handle call event and update item as required
+         * 
+         * @param ce call event to process
+         */
+        private void handleCallEvent(CallEvent ce) {
+
+            // Always try to resolve number to name. If not wanted return number instead later
+            // pbm can be null, if no item wanted resolving!
+            String callerName = "";
+            if (_pbm != null) {
+                // resolving caller name if external number is present in call event
+                if (ce.getExternalNo() == null || ce.getExternalNo().isEmpty()) {
+                    logger.debug("no external number provided by fbox. Will not resolve name");
+                } else {
+                    logger.debug("resolving name for number {}", ce.getExternalNo());
+                    callerName = _pbm.getNameFromNumber(ce.getExternalNo(), 7);
+                    if (callerName == null) {
+                        callerName = "Name not found for " + ce.getExternalNo(); // if no match was found, reset to
+                                                                                 // number
+                    } else {
+                        logger.debug("external number resolved to: {}", callerName);
+                    }
+                }
             }
-		} catch (SchedulerException e) {
-			logger.warn("Could not create daily reconnection job", e);
-		}
-	}
-	
-	/***
-	 * cancel the reconnect job
-	 */
-	public void shutdownReconnectJob() {
-		Scheduler sched = null;
-		try {
-			sched = StdSchedulerFactory.getDefaultScheduler();
-			JobKey jobKey = jobKey("Reconnect", "FritzBox");
-		    if (sched.checkExists(jobKey)) {
-		        logger.debug("Found reconnection job. Shutting down...");
-		        sched.deleteJob(jobKey);
-		    }
-		
-		} catch (SchedulerException e) {
-			logger.warn("Error shutting down reconnect job: {}",e.getLocalizedMessage());
-		}
-	}
-
-	/**
-	 * A quartz scheduler job to simply do a reconnection to the FritzBox.
-	 */
-	public static class ReconnectJob implements Job {
-		public void execute(JobExecutionContext arg0) throws JobExecutionException {
-			Logger logger = LoggerFactory.getLogger(FritzboxTr064Binding.class);
-			logger.info("Fritzbox Reconnect Job executed");
-			_instance.stopThread();
-			
-			// create a new thread for listening to the FritzBox
-			_instance._monitorThread = _instance.new CallMonitorThread();
-			
-			//Wait before reconnect
-			try {
-				sleep(5000L);
-			} catch (InterruptedException e) {
-				
-			}
-			logger.debug("Reconnect Job starts new monitor Thread");
-			_instance._monitorThread.start();
-			
-		}
-	}
-	
-	
-	/***
-	 * thread for setting up socket to fbox, listening for messages, parsing them
-	 * and updating items. Most of this code is from Kai Kreuzers original 
-	 * fritzbox binding!
-	 * 
-	 * @author gitbock
-	 *
-	 */
-	public class CallMonitorThread extends Thread{
-		
-		/***
-		 * Devnote: 
-		 * Objects need to be set here, not in parent class!
-		 * Otherwise compiler can see them, but at runtime wrong values are given(?) 
-		 */
-		
-		//Socket to connect
-		private Socket _socket; 
-		
-		//Thread control flag
-		private boolean _interrupted = false;
-		
-		//time to wait before reconnecting
-		private long _reconnectTime = 60000L;
-		
-		public CallMonitorThread() {
-			
-		}
-		
-		@Override
-		public void run() {
-			logger.debug("Callmonitor Thread [{}] is interrupted: {}", Thread.currentThread().getId(),_interrupted);
-			while (!_interrupted) {
-				if (_ip != null) {
-					BufferedReader reader = null;
-					try {
-						logger.info("Callmonitor Thread [{}] attempting connection to FritzBox on {}:{}..",Thread.currentThread().getId(),_ip, _port);
-						_socket = new Socket(_ip, _port);
-						reader = new BufferedReader(new InputStreamReader(_socket.getInputStream()));
-						// reset the retry interval
-						_reconnectTime = 60000L;
-					} catch (Exception e) {
-						logger.warn("Error attempting to connect to FritzBox. Retrying in {}s", _reconnectTime / 1000L, e);
-						try {
-							Thread.sleep(_reconnectTime);
-						} catch (InterruptedException ex) {
-							_interrupted = true;
-						}
-						// wait another more minute the next time
-						_reconnectTime += 60000L;
-					}
-					if (reader != null) {
-						logger.info("Connected to FritzBox on {}:{}", _ip, _port);
-						while (!_interrupted) {
-							try {
-								String line = reader.readLine();
-								if (line != null) {
-									logger.debug("Received raw call string from fbox: {}",line);
-									CallEvent ce = new CallEvent(line);
-									if(ce.parseRawEvent()){
-										handleCallEvent(ce);
-									}
-									else{
-										logger.error("Call Event could not be parsed!");
-									}
-									try {
-										// wait a moment, so that rules can be
-										// processed
-										// see
-										// http://knx-user-forum.de/openhab/25024-bug-im-fritzbox-binding.html
-										sleep(100L);
-									} catch (InterruptedException e) {
-									}
-								}
-							} catch (IOException e) {
-								if (_interrupted) {
-									logger.info("Lost connection to Fritzbox because of interrupt");
-								} else {
-									logger.error("Lost connection to FritzBox", e);
-								}
-								break;
-							}
-							finally{
-								// allow a few seconds until reconnect.
-								// needed for interrupt state to settle?
-								try {
-									sleep(5000L);
-								} catch (InterruptedException e) {
-									
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		
-		/**
-		 * Handle call event and update item as required
-		 * 
-		 * @param ce call event to process
-		 */
-		private void handleCallEvent(CallEvent ce) {
-			
-			// Always try to resolve number to name. If not wanted return number instead later
-			// pbm can be null, if no item wanted resolving!
-			String callerName = "";
-			if(_pbm != null){
-				//resolving caller name if external number is present in call event
-				if(ce.getExternalNo() == null || ce.getExternalNo().isEmpty()){
-					 logger.debug("no external number provided by fbox. Will not resolve name");
-				}
-				else{
-					logger.debug("resolving name for number {}", ce.getExternalNo());
-					callerName = _pbm.getNameFromNumber(ce.getExternalNo(), 7);
-					if(callerName == null){
-						callerName = "Name not found for "+ce.getExternalNo(); //if no match was found, reset to number
-					}
-					else{
-						logger.debug("external number resolved to: {}",callerName);
-					}
-				}
-			}
-			
-			
-			//cycle through all items
-			logger.debug("Searching item to pass call event: {}",ce.getCallType());
-			for (FritzboxTr064BindingProvider provider : _providers) { 
-				for(String itemName : provider.getItemNames() ){ //check each item relevant for this binding		
-					FritzboxTr064BindingConfig conf = provider.getBindingConfigByItemName(itemName); //config object for item
-					Class<? extends Item> itemType = conf.getItemType(); //which type is this item?
-					org.openhab.core.types.State state = null;
-					String configString = conf.getConfigString();
-					String externalInfo = null; //either name or number as requested by item
-					//number name resolving wanted?
-					if(configString.startsWith("callmonitor") && configString.contains("resolveName")){
-						logger.debug("name resolving requested in item {}. Setting external no. to",itemName,callerName);
-						externalInfo = callerName;
-					}
-					else{
-						logger.debug("NO name resolving requested in item {}. Setting external no. to",itemName,callerName);
-						externalInfo = ce.getExternalNo();
-					}
-					if (ce.getCallType().equals("DISCONNECT")) {
-						//1.12.05⌴12:00:10;DISCONNECT;0;5;
-						//reset states of callmonitor items to 0 for ALL items regardless of type
-						if(configString.startsWith("callmonitor_ringing") || configString.startsWith("callmonitor_active") || configString.startsWith("callmonitor_outgoing")){
-							state = itemType.isAssignableFrom(SwitchItem.class) ? OnOffType.OFF : CallType.EMPTY;
-						}
-					}
-					else if (ce.getCallType().equals("RING")) { //first event when call is incoming
-						//1.12.05⌴12:00:15;RING;0;5551234;5556789;SIP0;
-						if(configString.startsWith("callmonitor_ringing")){
-							state = itemType.isAssignableFrom(SwitchItem.class) ? OnOffType.ON : new CallType(ce.getInternalNo(), externalInfo );
-						}
-					}
-					else if (ce.getCallType().equals("CONNECT")){ //when call is answered/running
-						//1.12.05⌴12:00:05;CONNECT;0;0;0180537489269;
-						if(configString.startsWith("callmonitor_active")){ // only for "active" items
-							state = itemType.isAssignableFrom(SwitchItem.class) ? OnOffType.ON : new CallType(externalInfo, ce.getInternalNo());
-						}
-					}
-					else if (ce.getCallType().equals("CALL")){ //outgoing call
-						//1.12.05⌴12:00:00;CALL;0;0;5557890;0180537489269;ISDN;
-						if(configString.startsWith("callmonitor_outgoing")){
-							state = itemType.isAssignableFrom(SwitchItem.class) ? OnOffType.ON : new CallType(externalInfo, ce.getInternalNo() );
-						}
-					}
-					
-					if (state != null) {
-						logger.debug("Dispatching call type {} to item {} as {}", ce.getCallType(),itemName,state.toString());
-						_eventPublisher.postUpdate(itemName, state);
-					}
-					else{
-						logger.debug("Could not determine state for item {}. Not relevant!", itemName);
-					}
-				}
-			}
-		}
-
-		
-		/**
-		 * Close socket and stop running thread
-		 */
-		public void interrupt() {
-			_interrupted = true;
-			if (_socket != null) {
-				try {
-					
-					_socket.close();
-					logger.debug("Socket to FritzBox closed");
-				} catch (IOException e) {
-					logger.warn("Existing connection to FritzBox cannot be closed", e);
-				}
-			}
-			else{
-				logger.debug("Socket to FritzBox not open. Not closing.");
-			}
-		}
-
-	}
-	
-
-	public void stopThread() {
-		logger.debug("Stopping monitor Thread...");
-		if (_monitorThread != null) {
-			_monitorThread.interrupt();
-			_monitorThread = null;
-		}
-		
-	}
-
-
-	public void startThread() {
-		logger.debug("Starting monitor Thread...");
-		if (_monitorThread != null) {
-			logger.warn("Old monitor Thread was still running");
-			// let's end the old thread
-			_monitorThread.interrupt();
-			_monitorThread = null;
-		}
-		// create a new thread for listening to the FritzBox
-		_monitorThread = new CallMonitorThread();
-		_monitorThread.start();
-		
-	}
-	
+
+            // cycle through all items
+            logger.debug("Searching item to pass call event: {}", ce.getCallType());
+            for (FritzboxTr064BindingProvider provider : _providers) {
+                for (String itemName : provider.getItemNames()) { // check each item relevant for this binding
+                    FritzboxTr064BindingConfig conf = provider.getBindingConfigByItemName(itemName); // config object
+                                                                                                     // for item
+                    Class<? extends Item> itemType = conf.getItemType(); // which type is this item?
+                    org.openhab.core.types.State state = null;
+                    String configString = conf.getConfigString();
+                    String externalInfo = null; // either name or number as requested by item
+                    // number name resolving wanted?
+                    if (configString.startsWith("callmonitor") && configString.contains("resolveName")) {
+                        logger.debug("name resolving requested in item {}. Setting external no. to", itemName,
+                                callerName);
+                        externalInfo = callerName;
+                    } else {
+                        logger.debug("NO name resolving requested in item {}. Setting external no. to", itemName,
+                                callerName);
+                        externalInfo = ce.getExternalNo();
+                    }
+                    if (ce.getCallType().equals("DISCONNECT")) {
+                        // 1.12.05⌴12:00:10;DISCONNECT;0;5;
+                        // reset states of callmonitor items to 0 for ALL items regardless of type
+                        if (configString.startsWith("callmonitor_ringing")
+                                || configString.startsWith("callmonitor_active")
+                                || configString.startsWith("callmonitor_outgoing")) {
+                            state = itemType.isAssignableFrom(SwitchItem.class) ? OnOffType.OFF : CallType.EMPTY;
+                        }
+                    } else if (ce.getCallType().equals("RING")) { // first event when call is incoming
+                        // 1.12.05⌴12:00:15;RING;0;5551234;5556789;SIP0;
+                        if (configString.startsWith("callmonitor_ringing")) {
+                            state = itemType.isAssignableFrom(SwitchItem.class) ? OnOffType.ON
+                                    : new CallType(ce.getInternalNo(), externalInfo);
+                        }
+                    } else if (ce.getCallType().equals("CONNECT")) { // when call is answered/running
+                        // 1.12.05⌴12:00:05;CONNECT;0;0;0180537489269;
+                        if (configString.startsWith("callmonitor_active")) { // only for "active" items
+                            state = itemType.isAssignableFrom(SwitchItem.class) ? OnOffType.ON
+                                    : new CallType(externalInfo, ce.getInternalNo());
+                        }
+                    } else if (ce.getCallType().equals("CALL")) { // outgoing call
+                        // 1.12.05⌴12:00:00;CALL;0;0;5557890;0180537489269;ISDN;
+                        if (configString.startsWith("callmonitor_outgoing")) {
+                            state = itemType.isAssignableFrom(SwitchItem.class) ? OnOffType.ON
+                                    : new CallType(externalInfo, ce.getInternalNo());
+                        }
+                    }
+
+                    if (state != null) {
+                        logger.debug("Dispatching call type {} to item {} as {}", ce.getCallType(), itemName,
+                                state.toString());
+                        _eventPublisher.postUpdate(itemName, state);
+                    } else {
+                        logger.debug("Could not determine state for item {}. Not relevant!", itemName);
+                    }
+                }
+            }
+        }
+
+        /**
+         * Close socket and stop running thread
+         */
+        @Override
+        public void interrupt() {
+            _interrupted = true;
+            if (_socket != null) {
+                try {
+
+                    _socket.close();
+                    logger.debug("Socket to FritzBox closed");
+                } catch (IOException e) {
+                    logger.warn("Existing connection to FritzBox cannot be closed", e);
+                }
+            } else {
+                logger.debug("Socket to FritzBox not open. Not closing.");
+            }
+        }
+
+    }
+
+    public void stopThread() {
+        logger.debug("Stopping monitor Thread...");
+        if (_monitorThread != null) {
+            _monitorThread.interrupt();
+            _monitorThread = null;
+        }
+
+    }
+
+    public void startThread() {
+        logger.debug("Starting monitor Thread...");
+        if (_monitorThread != null) {
+            logger.warn("Old monitor Thread was still running");
+            // let's end the old thread
+            _monitorThread.interrupt();
+            _monitorThread = null;
+        }
+        // create a new thread for listening to the FritzBox
+        _monitorThread = new CallMonitorThread();
+        _monitorThread.start();
+
+    }
+
 }
diff --git a/src/main/java/org/openhab/binding/fritzboxtr064/internal/FritzboxTr064Binding.java b/src/main/java/org/openhab/binding/fritzboxtr064/internal/FritzboxTr064Binding.java
index 45343b9..5674ecc 100644
--- a/src/main/java/org/openhab/binding/fritzboxtr064/internal/FritzboxTr064Binding.java
+++ b/src/main/java/org/openhab/binding/fritzboxtr064/internal/FritzboxTr064Binding.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2010-2015, openHAB.org and others.
+ * Copyright (c) 2010-2016, openHAB.org and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -10,9 +10,9 @@
 
 import java.util.Map;
 
+import org.apache.commons.lang.StringUtils;
 import org.openhab.binding.fritzboxtr064.FritzboxTr064BindingProvider;
 import org.openhab.binding.fritzboxtr064.internal.FritzboxTr064GenericBindingProvider.FritzboxTr064BindingConfig;
-import org.apache.commons.lang.StringUtils;
 import org.openhab.core.binding.AbstractActiveBinding;
 import org.openhab.core.items.Item;
 import org.openhab.core.library.items.ContactItem;
@@ -28,211 +28,204 @@
 import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-	
 
 /**
  * Implement this class if you are going create an actively polling service
  * like querying a Website/Device.
- * 
+ *
  * @author gitbock
  * @since 1.8.0
  */
 public class FritzboxTr064Binding extends AbstractActiveBinding<FritzboxTr064BindingProvider> {
 
-	private static final Logger logger = 
-		LoggerFactory.getLogger(FritzboxTr064Binding.class);
-
-	/**
-	 * The BundleContext. This is only valid when the bundle is ACTIVE. It is set in the activate()
-	 * method and must not be accessed anymore once the deactivate() method was called or before activate()
-	 * was called.
-	 */
-	private BundleContext bundleContext;
-	
-	//URL to connect to fbox. Provided in main cfg file
-	private String _url;
-	
-	//Username to use to connect to fbox
-	private String _user; 
-		
-	//PW
-	private String _pw; 
-	
-	// Call monitor class/including thread
-	private CallMonitor _callMonitor;
-	
-	/** 
-	 * the refresh interval which is used to poll values from the FritzboxTr064
-	 * server (optional, defaults to 60000ms)
-	 */
-	private long refreshInterval = 60000;
-	
-	//holds Fbox TR064 connection
-	private Tr064Comm _fboxComm = null;
-	
-	private PhonebookManager _pbm = null;
-	
-	public FritzboxTr064Binding() {
-	}
-		
-	
-	/**
-	 * Called by the SCR to activate the component with its configuration read from CAS
-	 * 
-	 * @param bundleContext BundleContext of the Bundle that defines this component
-	 * @param configuration Configuration properties for this component obtained from the ConfigAdmin service
-	 */
-	public void activate(final BundleContext bundleContext, final Map<String, Object> configuration) {
-		this.bundleContext = bundleContext;
-		logger.debug("FritzBox TR064 Binding activated!");
-			
-		// to override the default refresh interval one has to add a 
-		// parameter to openhab.cfg like <bindingName>:refresh=<intervalInMs>
-		String refreshIntervalString = (String) configuration.get("refresh");
-		if (StringUtils.isNotBlank(refreshIntervalString)) {
-			refreshInterval = Long.parseLong(refreshIntervalString);
-			logger.debug("Custom refresh interval set to " + refreshInterval);
-		}
-
-		//Check if fritzbox parameters were provided in config, otherwise does not make sense going on...
-		String fboxurl = (String) configuration.get("url");
-		String fboxuser = (String) configuration.get("user");
-		String fboxpw = (String) configuration.get("pass");
-		if(fboxurl == null){
-			logger.warn("Fritzbox URL was not provided in config. Shutting down binding.");
-			//how to shutdown??
-			setProperlyConfigured(false);
-			return;
-		}
-		if(fboxuser == null){
-			logger.warn("Fritzbox User was not provided in config. Using default username.");
-		}
-		if(fboxpw == null){
-			logger.warn("Fritzbox Password was not provided in config. Shutting down binding.");
-			//how to shutdown??
-			setProperlyConfigured(false);
-			return;
-		}
-		this._pw = fboxpw;
-		this._user = fboxuser;
-		this._url = fboxurl;
-		
-		if(_fboxComm == null){
-			_fboxComm = new Tr064Comm(_url, _user, _pw);
-		}
-
-		setProperlyConfigured(true);
-		
-		
-		
-		
-		
-		
-	}
-		
-	
-	
-	/**
-	 * @{inheritDoc}
-	 */
-	@Override
-	protected long getRefreshInterval() {
-		return refreshInterval;
-	}
-
-	/**
-	 * @{inheritDoc}
-	 */
-	@Override
-	protected String getName() {
-		return "FritzboxTr064 Refresh Service";
-	}
-	
-	/**
-	 * @{inheritDoc}
-	 */
-	@Override
-	protected void execute() {
-		logger.trace("FritzboxTr064 executing...");
-		
-		for (FritzboxTr064BindingProvider provider : providers) { 
-			for(String itemName : provider.getItemNames() ){ //check each item relevant for this binding
-				FritzboxTr064BindingConfig conf = provider.getBindingConfigByItemName(itemName); // extract itemconfig for current item
-				if(conf.getConfigString().startsWith("callmonitor")){
-					//check if we need to start call monitor
-					if(_callMonitor == null){ //not started yet
-						logger.debug("call monitor is not running. Configured items require call monitor -> Starting call monitor...");
-						
-						if(_pbm == null){
-							logger.debug("Downloading phonebooks");
-							_pbm = new PhonebookManager(_fboxComm);
-							_pbm.downloadPhonebooks();
-						}
-						
-						_callMonitor = new CallMonitor(_url, eventPublisher, providers, _pbm);
-						_callMonitor.setupReconnectJob();
-						_callMonitor.startThread();
-					}
-					continue; //make sure, no callmonitor items are processed by tr064
-				}
-				
-				// TR064 protocol usage 
-				String tr064result = _fboxComm.getTr064Value(conf.getConfigString()); //try to get value for this item config string from fbox
-				if(tr064result == null){ //if value cannot be read
-					tr064result = "ERR";
-				}
-				Class<? extends Item> itemType = conf.getItemType();
-				if(itemType.isAssignableFrom(StringItem.class)){
-					eventPublisher.postUpdate(itemName, new StringType(tr064result));
-				}
-				else if(itemType.isAssignableFrom(ContactItem.class)){
-					State newState = tr064result.equals("1") ? OpenClosedType.OPEN : OpenClosedType.CLOSED;
-					eventPublisher.postUpdate(itemName, newState );
-				}
-				else if(itemType.isAssignableFrom(SwitchItem.class)){
-					State newState = tr064result.equals("1") ? OnOffType.ON : OnOffType.OFF;
-					eventPublisher.postUpdate(itemName, newState );
-				}
-				else if(itemType.isAssignableFrom(NumberItem.class)){ //number items e.g. TAM messages
-					// tr064 retrieves only Strings, trying to parse value returned
-					int val = 0;
-					try{
-						val = Integer.parseInt(tr064result);
-					}
-					catch(NumberFormatException ex){
-						val = -1; //indicate error as -1
-					}
-					
-					State newState = new DecimalType(val);
-					eventPublisher.postUpdate(itemName, newState );
-				}
-				
-			}
-			
-		
-		}
-	}
-	
-		
-
-	/**
-	 * @{inheritDoc}
-	 */
-	@Override
-	protected void internalReceiveCommand(String itemName, Command command) {
-		logger.trace("internalReceiveCommand({},{}) is called!", itemName, command);
-		if(_fboxComm == null){
-			_fboxComm = new Tr064Comm(_url, _user, _pw);
-		}
-		//Search Item Binding config for this itemName
-		for (FritzboxTr064BindingProvider provider : providers) { 
-			FritzboxTr064BindingConfig conf = provider.getBindingConfigByItemName(itemName);
-			if(conf != null){
-				_fboxComm.setTr064Value(conf.getConfigString(), command); //pass config String because config string needed for finding item map
-			}
-		}
-	}
-	
-	
-	
+    private static final Logger logger = LoggerFactory.getLogger(FritzboxTr064Binding.class);
+
+    /**
+     * The BundleContext. This is only valid when the bundle is ACTIVE. It is set in the activate()
+     * method and must not be accessed anymore once the deactivate() method was called or before activate()
+     * was called.
+     */
+    private BundleContext bundleContext;
+
+    // URL to connect to fbox. Provided in main cfg file
+    private String _url;
+
+    // Username to use to connect to fbox
+    private String _user;
+
+    // PW
+    private String _pw;
+
+    // Call monitor class/including thread
+    private CallMonitor _callMonitor;
+
+    /**
+     * the refresh interval which is used to poll values from the FritzboxTr064
+     * server (optional, defaults to 60000ms)
+     */
+    private long refreshInterval = 60000;
+
+    // holds Fbox TR064 connection
+    private Tr064Comm _fboxComm = null;
+
+    private PhonebookManager _pbm = null;
+
+    public FritzboxTr064Binding() {
+    }
+
+    /**
+     * Called by the SCR to activate the component with its configuration read from CAS
+     *
+     * @param bundleContext BundleContext of the Bundle that defines this component
+     * @param configuration Configuration properties for this component obtained from the ConfigAdmin service
+     */
+    public void activate(final BundleContext bundleContext, final Map<String, Object> configuration) {
+        this.bundleContext = bundleContext;
+        logger.debug("FritzBox TR064 Binding activated!");
+
+        // to override the default refresh interval one has to add a
+        // parameter to openhab.cfg like <bindingName>:refresh=<intervalInMs>
+        String refreshIntervalString = (String) configuration.get("refresh");
+        if (StringUtils.isNotBlank(refreshIntervalString)) {
+            refreshInterval = Long.parseLong(refreshIntervalString);
+            logger.debug("Custom refresh interval set to " + refreshInterval);
+        }
+
+        // Check if fritzbox parameters were provided in config, otherwise does not make sense going on...
+        String fboxurl = (String) configuration.get("url");
+        String fboxuser = (String) configuration.get("user");
+        String fboxpw = (String) configuration.get("pass");
+        if (fboxurl == null) {
+            logger.warn("Fritzbox URL was not provided in config. Shutting down binding.");
+            // how to shutdown??
+            setProperlyConfigured(false);
+            return;
+        }
+        if (fboxuser == null) {
+            logger.warn("Fritzbox User was not provided in config. Using default username.");
+        }
+        if (fboxpw == null) {
+            logger.warn("Fritzbox Password was not provided in config. Shutting down binding.");
+            // how to shutdown??
+            setProperlyConfigured(false);
+            return;
+        }
+        this._pw = fboxpw;
+        this._user = fboxuser;
+        this._url = fboxurl;
+
+        if (_fboxComm == null) {
+            _fboxComm = new Tr064Comm(_url, _user, _pw);
+        }
+
+        setProperlyConfigured(true);
+
+    }
+
+    /**
+     * @{inheritDoc}
+     */
+    @Override
+    protected long getRefreshInterval() {
+        return refreshInterval;
+    }
+
+    /**
+     * @{inheritDoc}
+     */
+    @Override
+    protected String getName() {
+        return "FritzboxTr064 Refresh Service";
+    }
+
+    /**
+     * @{inheritDoc}
+     */
+    @Override
+    protected void execute() {
+        logger.trace("FritzboxTr064 executing...");
+
+        for (FritzboxTr064BindingProvider provider : providers) {
+            for (String itemName : provider.getItemNames()) { // check each item relevant for this binding
+                FritzboxTr064BindingConfig conf = provider.getBindingConfigByItemName(itemName); // extract itemconfig
+                                                                                                 // for current item
+                if (conf.getConfigString().startsWith("callmonitor")) {
+                    // check if we need to start call monitor
+                    if (_callMonitor == null) { // not started yet
+                        logger.debug(
+                                "call monitor is not running. Configured items require call monitor -> Starting call monitor...");
+
+                        if (_pbm == null) {
+                            logger.debug("Downloading phonebooks");
+                            _pbm = new PhonebookManager(_fboxComm);
+                            _pbm.downloadPhonebooks();
+                        }
+
+                        _callMonitor = new CallMonitor(_url, eventPublisher, providers, _pbm);
+                        _callMonitor.setupReconnectJob();
+                        _callMonitor.startThread();
+                    }
+                    continue; // make sure, no callmonitor items are processed by tr064
+                }
+
+                // TR064 protocol usage
+                String tr064result = _fboxComm.getTr064Value(conf.getConfigString()); // try to get value for this item
+                                                                                      // config string from fbox
+                if (tr064result == null) { // if value cannot be read
+                    tr064result = "ERR";
+                }
+                Class<? extends Item> itemType = conf.getItemType();
+                if (itemType.isAssignableFrom(StringItem.class)) {
+                    eventPublisher.postUpdate(itemName, new StringType(tr064result));
+                } else if (itemType.isAssignableFrom(ContactItem.class)) {
+                    State newState = tr064result.equals("1") ? OpenClosedType.OPEN : OpenClosedType.CLOSED;
+                    eventPublisher.postUpdate(itemName, newState);
+                } else if (itemType.isAssignableFrom(SwitchItem.class)) {
+                    State newState = tr064result.equals("1") ? OnOffType.ON : OnOffType.OFF;
+                    eventPublisher.postUpdate(itemName, newState);
+                } else if (itemType.isAssignableFrom(NumberItem.class)) { // number items e.g. TAM messages
+                    // tr064 retrieves only Strings, trying to parse value returned
+                    int val = 0;
+                    try {
+                        val = Integer.parseInt(tr064result);
+                    } catch (NumberFormatException ex) {
+                        val = -1; // indicate error as -1
+                    }
+
+                    State newState = new DecimalType(val);
+                    eventPublisher.postUpdate(itemName, newState);
+                }
+
+            }
+
+        }
+    }
+
+    /**
+     * @{inheritDoc}
+     */
+    @Override
+    protected void internalReceiveCommand(String itemName, Command command) {
+        logger.trace("internalReceiveCommand({},{}) is called!", itemName, command);
+        if (_fboxComm == null) {
+            _fboxComm = new Tr064Comm(_url, _user, _pw);
+        }
+        // Search Item Binding config for this itemName
+        for (FritzboxTr064BindingProvider provider : providers) {
+            FritzboxTr064BindingConfig conf = provider.getBindingConfigByItemName(itemName);
+            if (conf != null) {
+                _fboxComm.setTr064Value(conf.getConfigString(), command); // pass config String because config string
+                                                                          // needed for finding item map
+            }
+        }
+    }
+
+    protected void addBindingProvider(FritzboxTr064BindingProvider bindingProvider) {
+        super.addBindingProvider(bindingProvider);
+    }
+
+    protected void removeBindingProvider(FritzboxTr064BindingProvider bindingProvider) {
+        super.removeBindingProvider(bindingProvider);
+    }
+
 }
diff --git a/src/main/java/org/openhab/binding/fritzboxtr064/internal/FritzboxTr064GenericBindingProvider.java b/src/main/java/org/openhab/binding/fritzboxtr064/internal/FritzboxTr064GenericBindingProvider.java
index 300cb53..83fd7db 100644
--- a/src/main/java/org/openhab/binding/fritzboxtr064/internal/FritzboxTr064GenericBindingProvider.java
+++ b/src/main/java/org/openhab/binding/fritzboxtr064/internal/FritzboxTr064GenericBindingProvider.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2010-2015, openHAB.org and others.
+ * Copyright (c) 2010-2016, openHAB.org and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,114 +11,103 @@
 import org.openhab.binding.fritzboxtr064.FritzboxTr064BindingProvider;
 import org.openhab.core.binding.BindingConfig;
 import org.openhab.core.items.Item;
-import org.openhab.core.library.items.DimmerItem;
-import org.openhab.core.library.items.SwitchItem;
 import org.openhab.model.item.binding.AbstractGenericBindingProvider;
 import org.openhab.model.item.binding.BindingConfigParseException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 /**
  * This class is responsible for parsing the binding configuration.
- * 
+ *
  * @author gitbock
  * @since 1.8.0
  */
-public class FritzboxTr064GenericBindingProvider extends AbstractGenericBindingProvider implements FritzboxTr064BindingProvider {
-	
-	//to access logger object in this class
-	static final Logger logger = LoggerFactory.getLogger(FritzboxTr064GenericBindingProvider.class);
-
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getBindingType() {
-		return "fritzboxtr064";
-	}
-
-	/**
-	 * @{inheritDoc}
-	 */
-	@Override
-	public void validateItemType(Item item, String bindingConfig) throws BindingConfigParseException {
-		//if (!(item instanceof SwitchItem || item instanceof DimmerItem)) {
-		//	throw new BindingConfigParseException("item '" + item.getName()
-		//			+ "' is of type '" + item.getClass().getSimpleName()
-		//			+ "', only Switch- and DimmerItems are allowed - please check your *.items configuration");
-		//}
-	}
-	
-	public FritzboxTr064GenericBindingProvider() {
-		super();
-		
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void processBindingConfiguration(String context, Item item, String bindingConfig) throws BindingConfigParseException {
-		super.processBindingConfiguration(context, item, bindingConfig);
-		if(bindingConfig == null){
-			throw new BindingConfigParseException("binding Config String in *.cfg is null for "+item.getName());
-		}
-		FritzboxTr064BindingConfig config = new FritzboxTr064BindingConfig(item.getClass(), bindingConfig);
-		
-		addBindingConfig(item, config);
-		logger.debug("Adding item {} with config {}", item.getName(),config.getConfigString());
-	}
-	
-	
-	/**
-	 * This is a helper class holding binding specific configuration details
-	 * 
-	 * @author gitbock
-	 * @since 0.1.0
-	 */
-	public class FritzboxTr064BindingConfig implements BindingConfig {
-		private Class<? extends Item> itemType; //type is expressed as class instance
-		private String configString;
-		
-		
-		public FritzboxTr064BindingConfig(Class<? extends Item> type, String configString) {
-			this.itemType = type;
-			this.configString = configString;
-		}
-
-
-		public Class<? extends Item> getItemType() {
-			return itemType;
-		}
-
-
-		public String getConfigString() {
-			return configString;
-		}
-
-
-		@Override
-		public String toString() {
-			return "FritzboxTr064BindingConfig [itemType=" + itemType
-					+ ", configString=" + configString + "]";
-		}
-		
-		
-		
-	}
-
-
-	@Override
-	public FritzboxTr064BindingConfig getBindingConfigByItemName(String itemName) {
-		FritzboxTr064BindingConfig conf = null;
-
-		if (bindingConfigs.containsKey(itemName)){
-			conf = (FritzboxTr064BindingConfig) bindingConfigs.get(itemName);
-			
-		}
-		return conf;
-	}
-	
-	
+public class FritzboxTr064GenericBindingProvider extends AbstractGenericBindingProvider
+        implements FritzboxTr064BindingProvider {
+
+    // to access logger object in this class
+    static final Logger logger = LoggerFactory.getLogger(FritzboxTr064GenericBindingProvider.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getBindingType() {
+        return "fritzboxtr064";
+    }
+
+    /**
+     * @{inheritDoc}
+     */
+    @Override
+    public void validateItemType(Item item, String bindingConfig) throws BindingConfigParseException {
+        // if (!(item instanceof SwitchItem || item instanceof DimmerItem)) {
+        // throw new BindingConfigParseException("item '" + item.getName()
+        // + "' is of type '" + item.getClass().getSimpleName()
+        // + "', only Switch- and DimmerItems are allowed - please check your *.items configuration");
+        // }
+    }
+
+    public FritzboxTr064GenericBindingProvider() {
+        super();
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void processBindingConfiguration(String context, Item item, String bindingConfig)
+            throws BindingConfigParseException {
+        super.processBindingConfiguration(context, item, bindingConfig);
+        if (bindingConfig == null) {
+            throw new BindingConfigParseException("binding Config String in *.cfg is null for " + item.getName());
+        }
+        FritzboxTr064BindingConfig config = new FritzboxTr064BindingConfig(item.getClass(), bindingConfig);
+
+        addBindingConfig(item, config);
+        logger.debug("Adding item {} with config {}", item.getName(), config.getConfigString());
+    }
+
+    /**
+     * This is a helper class holding binding specific configuration details
+     * 
+     * @author gitbock
+     * @since 0.1.0
+     */
+    public class FritzboxTr064BindingConfig implements BindingConfig {
+        private Class<? extends Item> itemType; // type is expressed as class instance
+        private String configString;
+
+        public FritzboxTr064BindingConfig(Class<? extends Item> type, String configString) {
+            this.itemType = type;
+            this.configString = configString;
+        }
+
+        public Class<? extends Item> getItemType() {
+            return itemType;
+        }
+
+        public String getConfigString() {
+            return configString;
+        }
+
+        @Override
+        public String toString() {
+            return "FritzboxTr064BindingConfig [itemType=" + itemType + ", configString=" + configString + "]";
+        }
+
+    }
+
+    @Override
+    public FritzboxTr064BindingConfig getBindingConfigByItemName(String itemName) {
+        FritzboxTr064BindingConfig conf = null;
+
+        if (bindingConfigs.containsKey(itemName)) {
+            conf = (FritzboxTr064BindingConfig) bindingConfigs.get(itemName);
+
+        }
+        return conf;
+    }
+
 }
diff --git a/src/main/java/org/openhab/binding/fritzboxtr064/internal/Helper.java b/src/main/java/org/openhab/binding/fritzboxtr064/internal/Helper.java
index b47b3b3..10e4a07 100644
--- a/src/main/java/org/openhab/binding/fritzboxtr064/internal/Helper.java
+++ b/src/main/java/org/openhab/binding/fritzboxtr064/internal/Helper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2010-2015, openHAB.org and others.
+ * Copyright (c) 2010-2016, openHAB.org and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,9 +8,8 @@
  */
 package org.openhab.binding.fritzboxtr064.internal;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.io.StringWriter;
+import java.io.Writer;
 
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
@@ -19,60 +18,67 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
-
-import com.sun.org.apache.xml.internal.serialize.OutputFormat;
-import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
-
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSOutput;
+import org.w3c.dom.ls.LSSerializer;
 
 /***
  * Static Helper methods
- * 
+ *
  * @author gitbock
  * @since 1.8.0
- *
  */
 public class Helper {
-	
-	
-	/***
-	 * Helper method which converts XML Document into pretty formatted string
-	 * @param doc to convert
-	 * @return converted XML as String
-	 */
-	public static String documentToString(Document doc){
-		String strMsg ="";
-		OutputFormat format = new OutputFormat(doc);
-        format.setIndenting(true);
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        XMLSerializer serializer = new XMLSerializer(baos, format);
+    private static final Logger logger = LoggerFactory.getLogger(FritzboxTr064Binding.class);
+
+    /***
+     * Helper method which converts XML Document into pretty formatted string
+     *
+     * @param doc to convert
+     * @return converted XML as String
+     */
+    public static String documentToString(Document doc) {
+
+        String strMsg = "";
+        try {
+            DOMImplementation domImpl = doc.getImplementation();
+            DOMImplementationLS domImplLS = (DOMImplementationLS) domImpl.getFeature("LS", "3.0");
+            LSSerializer lsSerializer = domImplLS.createLSSerializer();
+            lsSerializer.getDomConfig().setParameter("format-pretty-print", true);
+
+            Writer stringWriter = new StringWriter();
+            LSOutput lsOutput = domImplLS.createLSOutput();
+            lsOutput.setEncoding("UTF-8");
+            lsOutput.setCharacterStream(stringWriter);
+            lsSerializer.write(doc, lsOutput);
+            strMsg = stringWriter.toString();
+        } catch (Exception e) {
+            logger.warn("Error occured when converting document to string", e);
+        }
+        return strMsg;
+    }
+
+    /***
+     * Converts a xml Node into String
+     *
+     * @param node to convert
+     * @return converted string
+     */
+    public static String nodeToString(Node node) {
+        StringWriter sw = new StringWriter();
         try {
-			serializer.serialize(doc);
-			strMsg = baos.toString("UTF-8");
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return strMsg;
-	}
-	
-	
-	/***
-	 * Converts  a xml Node into String
-	 * @param node to convert
-	 * @return converted string
-	 */
-	public static String nodeToString(Node node) {
-		  StringWriter sw = new StringWriter();
-		  try {
-		    Transformer t = TransformerFactory.newInstance().newTransformer();
-		    t.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
-		    t.transform(new DOMSource(node), new StreamResult(sw));
-		  } catch (TransformerException te) {
-		    System.out.println("nodeToString Transformer Exception");
-		  }
-		  return sw.toString();
-		}
-	
+            Transformer t = TransformerFactory.newInstance().newTransformer();
+            t.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+            t.transform(new DOMSource(node), new StreamResult(sw));
+        } catch (TransformerException te) {
+            logger.warn("nodeToString Transformer Exception", te);
+        }
+        return sw.toString();
+    }
 
 }
diff --git a/src/main/java/org/openhab/binding/fritzboxtr064/internal/ItemMap.java b/src/main/java/org/openhab/binding/fritzboxtr064/internal/ItemMap.java
index 79a1dda..b1b4bdb 100644
--- a/src/main/java/org/openhab/binding/fritzboxtr064/internal/ItemMap.java
+++ b/src/main/java/org/openhab/binding/fritzboxtr064/internal/ItemMap.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2010-2015, openHAB.org and others.
+ * Copyright (c) 2010-2016, openHAB.org and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,107 +9,116 @@
 package org.openhab.binding.fritzboxtr064.internal;
 
 /***
- * Represents a item mapping. An item mapping is a collection of all parameters 
+ * Represents a item mapping. An item mapping is a collection of all parameters
  * based on the config string of the item. config string is like the key of an item mapping
  * Item Mappings must be created manually to support desired fbox tr064 functions.
- * 
+ *
  * @author gitbock
  *
  */
-public class ItemMap{
-	//common parameters 
-	private String _itemCommand;     // matches itemconfig
-	private String _serviceId;       // SOAP service ID
-	
-	//read specific 
-	private String _readServiceCommand; // command to execute on fbox if value should be read
-	private String _readDataInName;		//name of parameter to put in soap request to read value
-	private String _readDataOutName;		//name of parameter to extract from fbox soap response when reading value (is parsed as value)
-	private SoapValueParser _soapValueParser; 		//handler to use for parsing soapresponse
-	
-	// write specific
-	private String _writeServiceCommand; // command to execute on fbox if value should be set
-	private String _writeDataInName;		//name of parameter which is put in soap request when setting an option on fbox
-	private String _writeDataInNameAdditional; //additional Parameter to add to write request. e.g. id of TAM to set
-	
-	
-	
-	public String getWriteDataInNameAdditional() {
-		return _writeDataInNameAdditional;
-	}
-	public void setWriteDataInNameAdditional(String _writeDataInNameAdditional) {
-		this._writeDataInNameAdditional = _writeDataInNameAdditional;
-	}
-	public String getWriteServiceCommand() {
-		return _writeServiceCommand;
-	}
-	public void setWriteServiceCommand(String _writeServiceCommand) {
-		this._writeServiceCommand = _writeServiceCommand;
-	}
-		
-	
-	public String getWriteDataInName() {
-		return _writeDataInName;
-	}
-	public void setWriteDataInName(String _setDataInName) {
-		this._writeDataInName = _setDataInName;
-	}
-	
-	public SoapValueParser getSoapValueParser() {
-		return _soapValueParser;
-	}
-	public void setSoapValueParser(SoapValueParser _svp) {
-		this._soapValueParser = _svp;
-	}
-	
-	public ItemMap(String _itemCommand, String _getServiceCommand,
-			String _serviceId, String _getDataInName1, String _getDataOutName1) {
-		this._itemCommand = _itemCommand;
-		this._readServiceCommand = _getServiceCommand;
-		this._serviceId = _serviceId;
-		this._readDataInName = _getDataInName1;
-		this._readDataOutName = _getDataOutName1;
-	}
-	public String getItemCommand() {
-		return _itemCommand;
-	}
-	public void setItemCommand(String _itemCommand) {
-		this._itemCommand = _itemCommand;
-	}
-	public String getReadServiceCommand() {
-		return _readServiceCommand;
-	}
-	public void setReadServiceCommand(String _serviceCommand) {
-		this._readServiceCommand = _serviceCommand;
-	}
-	public String getServiceId() {
-		return _serviceId;
-	}
-	public void setServiceId(String _serviceId) {
-		this._serviceId = _serviceId;
-	}
-	public String getReadDataInName() {
-		return _readDataInName;
-	}
-	public void setReadDataInName1(String _dataInName1) {
-		this._readDataInName = _dataInName1;
-	}
-	public String getReadDataOutName() {
-		return _readDataOutName;
-	}
-	public void setReadDataOutName(String _dataOutName1) {
-		this._readDataOutName = _dataOutName1;
-	}
-	@Override
-	public String toString() {
-		return "ItemMap [_itemCommand=" + _itemCommand + ", _serviceId="
-				+ _serviceId + ", _readServiceCommand=" + _readServiceCommand
-				+ ", _readDataInName=" + _readDataInName
-				+ ", _readDataOutName=" + _readDataOutName + ", _svp=" + _soapValueParser
-				+ ", _writeDataInName=" + _writeDataInName + "]";
-	}
-	
-	
-	
-	
+public class ItemMap {
+    // common parameters
+    private String _itemCommand; // matches itemconfig
+    private String _serviceId; // SOAP service ID
+
+    // read specific
+    private String _readServiceCommand; // command to execute on fbox if value should be read
+    private String _readDataInName; // name of parameter to put in soap request to read value
+    private String _readDataOutName; // name of parameter to extract from fbox soap response when reading value (is
+                                     // parsed as value)
+    private SoapValueParser _soapValueParser; // handler to use for parsing soapresponse
+
+    // write specific
+    private String _writeServiceCommand; // command to execute on fbox if value should be set
+    private String _writeDataInName; // name of parameter which is put in soap request when setting an option on fbox
+    private String _writeDataInNameAdditional; // additional Parameter to add to write request. e.g. id of TAM to set
+
+    public String getWriteDataInNameAdditional() {
+        return _writeDataInNameAdditional;
+    }
+
+    public void setWriteDataInNameAdditional(String _writeDataInNameAdditional) {
+        this._writeDataInNameAdditional = _writeDataInNameAdditional;
+    }
+
+    public String getWriteServiceCommand() {
+        return _writeServiceCommand;
+    }
+
+    public void setWriteServiceCommand(String _writeServiceCommand) {
+        this._writeServiceCommand = _writeServiceCommand;
+    }
+
+    public String getWriteDataInName() {
+        return _writeDataInName;
+    }
+
+    public void setWriteDataInName(String _setDataInName) {
+        this._writeDataInName = _setDataInName;
+    }
+
+    public SoapValueParser getSoapValueParser() {
+        return _soapValueParser;
+    }
+
+    public void setSoapValueParser(SoapValueParser _svp) {
+        this._soapValueParser = _svp;
+    }
+
+    public ItemMap(String _itemCommand, String _getServiceCommand, String _serviceId, String _getDataInName1,
+            String _getDataOutName1) {
+        this._itemCommand = _itemCommand;
+        this._readServiceCommand = _getServiceCommand;
+        this._serviceId = _serviceId;
+        this._readDataInName = _getDataInName1;
+        this._readDataOutName = _getDataOutName1;
+    }
+
+    public String getItemCommand() {
+        return _itemCommand;
+    }
+
+    public void setItemCommand(String _itemCommand) {
+        this._itemCommand = _itemCommand;
+    }
+
+    public String getReadServiceCommand() {
+        return _readServiceCommand;
+    }
+
+    public void setReadServiceCommand(String _serviceCommand) {
+        this._readServiceCommand = _serviceCommand;
+    }
+
+    public String getServiceId() {
+        return _serviceId;
+    }
+
+    public void setServiceId(String _serviceId) {
+        this._serviceId = _serviceId;
+    }
+
+    public String getReadDataInName() {
+        return _readDataInName;
+    }
+
+    public void setReadDataInName1(String _dataInName1) {
+        this._readDataInName = _dataInName1;
+    }
+
+    public String getReadDataOutName() {
+        return _readDataOutName;
+    }
+
+    public void setReadDataOutName(String _dataOutName1) {
+        this._readDataOutName = _dataOutName1;
+    }
+
+    @Override
+    public String toString() {
+        return "ItemMap [_itemCommand=" + _itemCommand + ", _serviceId=" + _serviceId + ", _readServiceCommand="
+                + _readServiceCommand + ", _readDataInName=" + _readDataInName + ", _readDataOutName="
+                + _readDataOutName + ", _svp=" + _soapValueParser + ", _writeDataInName=" + _writeDataInName + "]";
+    }
+
 }
diff --git a/src/main/java/org/openhab/binding/fritzboxtr064/internal/PhoneBookEntry.java b/src/main/java/org/openhab/binding/fritzboxtr064/internal/PhoneBookEntry.java
index aa19348..187831d 100644
--- a/src/main/java/org/openhab/binding/fritzboxtr064/internal/PhoneBookEntry.java
+++ b/src/main/java/org/openhab/binding/fritzboxtr064/internal/PhoneBookEntry.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2010-2015, openHAB.org and others.
+ * Copyright (c) 2010-2016, openHAB.org and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -17,127 +17,123 @@
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Node;
 
-
 public class PhoneBookEntry {
-	
-	//default logger
-	private static final Logger logger = LoggerFactory.getLogger(FritzboxTr064Binding.class);
-	
-	// Phone numbers
-	private String _privateTel;
-	private String _businessTel;
-	private String _mobileTel;
-	private String _fax;
-	
-	//Phonebook Name this entry is contained in
-	private String _phoneBookName;
-	
-	//Real Name 
-	private String _name;
-	
-	//unique ID
-	private String _uniqueid;
-	
-	/***
-	 * Creates Entry Object by parsing the Node <contact>
-	 * @param xmlNode
-	 */
-	public PhoneBookEntry() {
-		
-	}
-	
-	/***
-	 * Parses the Object from xml node. 
-	 * @param xmlNode needs to be node with <contact>...</contact>
-	 * @return treu if successfully parsed
-	 */
-	public boolean parseFromNode(Node xmlNode) {
-		boolean success = false;
-		XPath xPath = XPathFactory.newInstance().newXPath();
-		logger.debug(Helper.nodeToString(xmlNode));
-		try {
-			this._name = (String) xPath.evaluate("person/realName", xmlNode, XPathConstants.STRING);
-			this._uniqueid = (String) xPath.evaluate("uniqueid", xmlNode, XPathConstants.STRING);
-			this._businessTel = (String) xPath.evaluate("telephony/number[@type='work']", xmlNode, XPathConstants.STRING);
-			this._privateTel = (String) xPath.evaluate("telephony/number[@type='home']", xmlNode, XPathConstants.STRING);
-			this._mobileTel = (String) xPath.evaluate("telephony/number[@type='mobile']", xmlNode, XPathConstants.STRING);
-			this._fax = (String) xPath.evaluate("telephony/number[@type='fax']", xmlNode, XPathConstants.STRING);
-			// xpath is awesome :)
-			
-		} catch (XPathExpressionException e) {
-			logger.error("Could not parse Phonebook Entry ", e);
-		}
-		//check if id could be parsed as success
-		if(!this._uniqueid.isEmpty()){
-			success = true;
-		}
-		else{
-			logger.warn("Could not parse phone book entry: {}",Helper.nodeToString(xmlNode));
-		}
-		return success;
-	}
-	
-	
-
-
-	public String getPrivateTel() {
-		return _privateTel;
-	}
-
-	public void setPrivateTel(String _privateTel) {
-		this._privateTel = _privateTel;
-	}
-
-	public String getBusinessTel() {
-		return _businessTel;
-	}
-
-	public void setBusinessTel(String _businessTel) {
-		this._businessTel = _businessTel;
-	}
-
-	public String getMobileTel() {
-		return _mobileTel;
-	}
-
-	public void setMobileTel(String _mobileTel) {
-		this._mobileTel = _mobileTel;
-	}
-
-	public String getFax() {
-		return _fax;
-	}
-
-	public void setFax(String _fax) {
-		this._fax = _fax;
-	}
-
-	public String getPhoneBookName() {
-		return _phoneBookName;
-	}
-
-	public void setPhoneBookName(String _phoneBookName) {
-		this._phoneBookName = _phoneBookName;
-	}
-
-	public String getName() {
-		return _name;
-	}
-
-	public void setName(String _name) {
-		this._name = _name;
-	}
-
-	public String getId() {
-		return _uniqueid;
-	}
-
-	public void setId(String _id) {
-		this._uniqueid = _id;
-	}
-	
-
-	
-	
-	
+
+    // default logger
+    private static final Logger logger = LoggerFactory.getLogger(FritzboxTr064Binding.class);
+
+    // Phone numbers
+    private String _privateTel;
+    private String _businessTel;
+    private String _mobileTel;
+    private String _fax;
+
+    // Phonebook Name this entry is contained in
+    private String _phoneBookName;
+
+    // Real Name
+    private String _name;
+
+    // unique ID
+    private String _uniqueid;
+
+    /***
+     * Creates Entry Object by parsing the Node <contact>
+     * 
+     * @param xmlNode
+     */
+    public PhoneBookEntry() {
+
+    }
+
+    /***
+     * Parses the Object from xml node.
+     * 
+     * @param xmlNode needs to be node with <contact>...</contact>
+     * @return treu if successfully parsed
+     */
+    public boolean parseFromNode(Node xmlNode) {
+        boolean success = false;
+        XPath xPath = XPathFactory.newInstance().newXPath();
+        logger.debug(Helper.nodeToString(xmlNode));
+        try {
+            this._name = (String) xPath.evaluate("person/realName", xmlNode, XPathConstants.STRING);
+            this._uniqueid = (String) xPath.evaluate("uniqueid", xmlNode, XPathConstants.STRING);
+            this._businessTel = (String) xPath.evaluate("telephony/number[@type='work']", xmlNode,
+                    XPathConstants.STRING);
+            this._privateTel = (String) xPath.evaluate("telephony/number[@type='home']", xmlNode,
+                    XPathConstants.STRING);
+            this._mobileTel = (String) xPath.evaluate("telephony/number[@type='mobile']", xmlNode,
+                    XPathConstants.STRING);
+            this._fax = (String) xPath.evaluate("telephony/number[@type='fax']", xmlNode, XPathConstants.STRING);
+            // xpath is awesome :)
+
+        } catch (XPathExpressionException e) {
+            logger.error("Could not parse Phonebook Entry ", e);
+        }
+        // check if id could be parsed as success
+        if (!this._uniqueid.isEmpty()) {
+            success = true;
+        } else {
+            logger.warn("Could not parse phone book entry: {}", Helper.nodeToString(xmlNode));
+        }
+        return success;
+    }
+
+    public String getPrivateTel() {
+        return _privateTel;
+    }
+
+    public void setPrivateTel(String _privateTel) {
+        this._privateTel = _privateTel;
+    }
+
+    public String getBusinessTel() {
+        return _businessTel;
+    }
+
+    public void setBusinessTel(String _businessTel) {
+        this._businessTel = _businessTel;
+    }
+
+    public String getMobileTel() {
+        return _mobileTel;
+    }
+
+    public void setMobileTel(String _mobileTel) {
+        this._mobileTel = _mobileTel;
+    }
+
+    public String getFax() {
+        return _fax;
+    }
+
+    public void setFax(String _fax) {
+        this._fax = _fax;
+    }
+
+    public String getPhoneBookName() {
+        return _phoneBookName;
+    }
+
+    public void setPhoneBookName(String _phoneBookName) {
+        this._phoneBookName = _phoneBookName;
+    }
+
+    public String getName() {
+        return _name;
+    }
+
+    public void setName(String _name) {
+        this._name = _name;
+    }
+
+    public String getId() {
+        return _uniqueid;
+    }
+
+    public void setId(String _id) {
+        this._uniqueid = _id;
+    }
+
 }
diff --git a/src/main/java/org/openhab/binding/fritzboxtr064/internal/PhonebookManager.java b/src/main/java/org/openhab/binding/fritzboxtr064/internal/PhonebookManager.java
index eeba098..0f0d965 100644
--- a/src/main/java/org/openhab/binding/fritzboxtr064/internal/PhonebookManager.java
+++ b/src/main/java/org/openhab/binding/fritzboxtr064/internal/PhonebookManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2010-2015, openHAB.org and others.
+ * Copyright (c) 2010-2016, openHAB.org and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,172 +8,144 @@
  */
 package org.openhab.binding.fritzboxtr064.internal;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.sun.org.apache.xml.internal.serialize.OutputFormat;
-import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
-
 /***
- * Class managing all Phonebook related work	
- * 
+ * Class managing all Phonebook related work
+ *
  * @author gitbock
  * @since 1.8.0
  *
  */
 public class PhonebookManager {
-	
-	//object for accessing fbox tr064
-	private Tr064Comm _tr064comm = null;
-	
-	//default logger
-	private static final Logger logger = LoggerFactory.getLogger(FritzboxTr064Binding.class);
-	
-	//all PhonebooksEntries
-	private ArrayList<PhoneBookEntry> _alEntries = null;
-	
-	
-	public PhonebookManager(Tr064Comm tr064comm){
-		this._tr064comm = tr064comm;
-		this._alEntries = new ArrayList<PhoneBookEntry>();
-		
-	}
-	
-		
-	
-	
-	/***
-	 * Looks up name in phone book entries and returns name and type if found
-	 * @param number number to look up name for
-	 * @param compareCount how many characters must match to accept a match
-	 * @return found name or null
-	 */
-	public String getNameFromNumber(String number, int compareCount){
-		logger.info("Trying to resolve number {} to name comparing {} characters",number,compareCount);
-		String name = null;
-		Iterator<PhoneBookEntry> it = _alEntries.iterator();
-		while(it.hasNext()){
-			PhoneBookEntry pbe = it.next();
-			StringBuilder sbAskNumber = new StringBuilder(number);
-			sbAskNumber.reverse(); //to be able to compare numbers from the end
-			String numberToCompare = "";
-			
-			//WORK number
-			StringBuilder sbPhonebookNumber = new StringBuilder(pbe.getBusinessTel());
-			sbPhonebookNumber.reverse();
-			//check if comparing numbers are within entire string range
-			if(compareCount <= sbAskNumber.length()){
-				numberToCompare = sbAskNumber.substring(0, compareCount);
-			}
-			else{
-				numberToCompare = sbAskNumber.substring(0, sbAskNumber.length());
-			}
-			if(sbPhonebookNumber.toString().startsWith(numberToCompare)){
-				logger.info("found name match {} in phonebook by comparing {} with {} ",pbe.getName(),sbPhonebookNumber.toString(),numberToCompare);
-				name = pbe.getName() + " (Work)";
-				break; //no need to cycle through rest of phonebook
-			}
-			
-			//HOME number
-			sbPhonebookNumber = new StringBuilder(pbe.getPrivateTel());
-			sbPhonebookNumber.reverse();
-			//check if comparing numbers are within entire string range
-			if(compareCount <= sbAskNumber.length()){
-				numberToCompare = sbAskNumber.substring(0, compareCount);
-			}
-			else{
-				numberToCompare = sbAskNumber.substring(0, sbAskNumber.length());
-			}
-			if(sbPhonebookNumber.toString().startsWith(numberToCompare)){
-				logger.info("found name match {} in phonebook by comparing {} with {} ",pbe.getName(),sbPhonebookNumber.toString(),numberToCompare);
-				name = pbe.getName() + " (Home)";
-				break; //no need to cycle through rest of phonebook
-			}
-			
-			//MOBILE number
-			sbPhonebookNumber = new StringBuilder(pbe.getMobileTel());
-			sbPhonebookNumber.reverse();
-			//check if comparing numbers are within entire string range
-			if(compareCount <= sbAskNumber.length()){
-				numberToCompare = sbAskNumber.substring(0, compareCount);
-			}
-			else{
-				numberToCompare = sbAskNumber.substring(0, sbAskNumber.length());
-			}
-			if(sbPhonebookNumber.toString().startsWith(numberToCompare)){
-				logger.info("found name match {} in phonebook by comparing {} with {} ",pbe.getName(),sbPhonebookNumber.toString(),numberToCompare);
-				name = pbe.getName() + " (Mobile)";
-				break; //no need to cycle through rest of phonebook
-			}
-		}
-		
-		return name;
-	}
-
-	
-	
-	/***
-	 * 
-	 * @param Phonebook ID to download, can be determined using TR064 GetPhonebookList
-	 * @return XML Document downloaded
-	 */
-	public Document downloadPhonebook(int id){
-		logger.info("Downloading phonebook ID {}",id);
-		String phoneBookUrl = _tr064comm.getTr064Value("phonebook:"+id);
-		Document phoneBook = _tr064comm.getFboxXmlResponse(phoneBookUrl);
-		logger.debug("Downloaded Phonebook:");
-		logger.trace(Helper.documentToString(phoneBook));
-		
-		return phoneBook;
-		
-	}
-	
-
-	/***
-	 * Downloads and parses phonebooks from fbox
-	 */
-	public void downloadPhonebooks() {
-		Document pb = downloadPhonebook(0);
-		if(pb != null){
-			NodeList nlContacts = pb.getElementsByTagName("contact");
-			for(int i=0;i<nlContacts.getLength();i++){
-				PhoneBookEntry pbe = new PhoneBookEntry();
-				Node nContact = nlContacts.item(i);
-				if(pbe.parseFromNode(nContact)){
-					_alEntries.add(pbe);
-				}
-				else{
-					logger.warn("could not parse phonebook entry: {}",nContact.toString());
-				}
-			}
-		}
-		else{
-			logger.error("Could not download phonebook");
-		}
-		
-	}
-	
-
-
-	
-
-
-	
+
+    // object for accessing fbox tr064
+    private Tr064Comm _tr064comm = null;
+
+    // default logger
+    private static final Logger logger = LoggerFactory.getLogger(FritzboxTr064Binding.class);
+
+    // all PhonebooksEntries
+    private ArrayList<PhoneBookEntry> _alEntries = null;
+
+    public PhonebookManager(Tr064Comm tr064comm) {
+        this._tr064comm = tr064comm;
+        this._alEntries = new ArrayList<PhoneBookEntry>();
+
+    }
+
+    /***
+     * Looks up name in phone book entries and returns name and type if found
+     * 
+     * @param number number to look up name for
+     * @param compareCount how many characters must match to accept a match
+     * @return found name or null
+     */
+    public String getNameFromNumber(String number, int compareCount) {
+        logger.info("Trying to resolve number {} to name comparing {} characters", number, compareCount);
+        String name = null;
+        Iterator<PhoneBookEntry> it = _alEntries.iterator();
+        while (it.hasNext()) {
+            PhoneBookEntry pbe = it.next();
+            StringBuilder sbAskNumber = new StringBuilder(number);
+            sbAskNumber.reverse(); // to be able to compare numbers from the end
+            String numberToCompare = "";
+
+            // WORK number
+            StringBuilder sbPhonebookNumber = new StringBuilder(pbe.getBusinessTel());
+            sbPhonebookNumber.reverse();
+            // check if comparing numbers are within entire string range
+            if (compareCount <= sbAskNumber.length()) {
+                numberToCompare = sbAskNumber.substring(0, compareCount);
+            } else {
+                numberToCompare = sbAskNumber.substring(0, sbAskNumber.length());
+            }
+            if (sbPhonebookNumber.toString().startsWith(numberToCompare)) {
+                logger.info("found name match {} in phonebook by comparing {} with {} ", pbe.getName(),
+                        sbPhonebookNumber.toString(), numberToCompare);
+                name = pbe.getName() + " (Work)";
+                break; // no need to cycle through rest of phonebook
+            }
+
+            // HOME number
+            sbPhonebookNumber = new StringBuilder(pbe.getPrivateTel());
+            sbPhonebookNumber.reverse();
+            // check if comparing numbers are within entire string range
+            if (compareCount <= sbAskNumber.length()) {
+                numberToCompare = sbAskNumber.substring(0, compareCount);
+            } else {
+                numberToCompare = sbAskNumber.substring(0, sbAskNumber.length());
+            }
+            if (sbPhonebookNumber.toString().startsWith(numberToCompare)) {
+                logger.info("found name match {} in phonebook by comparing {} with {} ", pbe.getName(),
+                        sbPhonebookNumber.toString(), numberToCompare);
+                name = pbe.getName() + " (Home)";
+                break; // no need to cycle through rest of phonebook
+            }
+
+            // MOBILE number
+            sbPhonebookNumber = new StringBuilder(pbe.getMobileTel());
+            sbPhonebookNumber.reverse();
+            // check if comparing numbers are within entire string range
+            if (compareCount <= sbAskNumber.length()) {
+                numberToCompare = sbAskNumber.substring(0, compareCount);
+            } else {
+                numberToCompare = sbAskNumber.substring(0, sbAskNumber.length());
+            }
+            if (sbPhonebookNumber.toString().startsWith(numberToCompare)) {
+                logger.info("found name match {} in phonebook by comparing {} with {} ", pbe.getName(),
+                        sbPhonebookNumber.toString(), numberToCompare);
+                name = pbe.getName() + " (Mobile)";
+                break; // no need to cycle through rest of phonebook
+            }
+        }
+
+        return name;
+    }
+
+    /***
+     * 
+     * @param Phonebook ID to download, can be determined using TR064 GetPhonebookList
+     * @return XML Document downloaded
+     */
+    public Document downloadPhonebook(int id) {
+        logger.info("Downloading phonebook ID {}", id);
+        String phoneBookUrl = _tr064comm.getTr064Value("phonebook:" + id);
+        Document phoneBook = _tr064comm.getFboxXmlResponse(phoneBookUrl);
+        logger.debug("Downloaded Phonebook:");
+        logger.trace(Helper.documentToString(phoneBook));
+
+        return phoneBook;
+
+    }
+
+    /***
+     * Downloads and parses phonebooks from fbox
+     */
+    public void downloadPhonebooks() {
+        Document pb = downloadPhonebook(0);
+        if (pb != null) {
+            NodeList nlContacts = pb.getElementsByTagName("contact");
+            for (int i = 0; i < nlContacts.getLength(); i++) {
+                PhoneBookEntry pbe = new PhoneBookEntry();
+                Node nContact = nlContacts.item(i);
+                if (pbe.parseFromNode(nContact)) {
+                    _alEntries.add(pbe);
+                } else {
+                    logger.warn("could not parse phonebook entry: {}", nContact.toString());
+                }
+            }
+        } else {
+            logger.error("Could not download phonebook");
+        }
+
+    }
 
 }
diff --git a/src/main/java/org/openhab/binding/fritzboxtr064/internal/SoapValueParser.java b/src/main/java/org/openhab/binding/fritzboxtr064/internal/SoapValueParser.java
index 4e562db..4128687 100644
--- a/src/main/java/org/openhab/binding/fritzboxtr064/internal/SoapValueParser.java
+++ b/src/main/java/org/openhab/binding/fritzboxtr064/internal/SoapValueParser.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2010-2015, openHAB.org and others.
+ * Copyright (c) 2010-2016, openHAB.org and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,20 +11,20 @@
 import javax.xml.soap.SOAPMessage;
 
 /***
- * 
+ *
  * @author gitbock
  * @since 1.8.0
  *
  */
 
 public interface SoapValueParser {
-	/***
-	 * 
-	 * @param sm soap message to parse
-	 * @param mapping itemmap with information about all TR064 parameters
-	 * @param request the raw original request which was used in itemconfig
-	 * @return the value which was parsed from soap message
-	 */
-	String parseValueFromSoapMessage(SOAPMessage sm, ItemMap mapping, String request);
+    /***
+     * 
+     * @param sm soap message to parse
+     * @param mapping itemmap with information about all TR064 parameters
+     * @param request the raw original request which was used in itemconfig
+     * @return the value which was parsed from soap message
+     */
+    String parseValueFromSoapMessage(SOAPMessage sm, ItemMap mapping, String request);
 
 }
diff --git a/src/main/java/org/openhab/binding/fritzboxtr064/internal/Tr064Comm.java b/src/main/java/org/openhab/binding/fritzboxtr064/internal/Tr064Comm.java
index 391223a..33f23ed 100644
--- a/src/main/java/org/openhab/binding/fritzboxtr064/internal/Tr064Comm.java
+++ b/src/main/java/org/openhab/binding/fritzboxtr064/internal/Tr064Comm.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2010-2015, openHAB.org and others.
+ * Copyright (c) 2010-2016, openHAB.org and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -45,6 +45,7 @@
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.CookieStore;
 import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
@@ -70,772 +71,817 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-
 /***
  * Controls communication and parsing for TR064 communication with
  * FritzBox
- * 
+ *
  * @author gitbock
  * @version 1.8.0
  *
  */
 public class Tr064Comm {
-	private static final Logger logger = LoggerFactory.getLogger(FritzboxTr064Binding.class);
-	private static final String DEFAULTUSER = "dslf-config"; //is used when no username is provided.
-	private static final String TR064DOWNLOADFILE = "tr64desc.xml"; //filename of all available TR064 on fbox
-	
-	//access details for fbox
-	private String _url = null;
-	private String _user = null;
-	private String _pw = null;
-	
-	
-	//all services fbox offers 
-	private ArrayList<Tr064Service> _alServices = null;
-	
-	//mappig table for mapping item command to tr064 parameters
-	private ArrayList<ItemMap> _alItemMap = null;
-	
-	
-	//http client object used to communicate with fbox (needed for reading/writing soap requests)
-	private CloseableHttpClient _httpClient = null;
-	private HttpClientContext _httpClientContext = null; //for reusing auth (?)
-	
-	public Tr064Comm(String _url, String user, String pass) { // base URL from config
-		this._url = _url;
-		this._user = user;
-		this._pw = pass;
-		_alServices = new ArrayList<Tr064Service>();
-		_alItemMap = new ArrayList<ItemMap>();
-		init();
-	}
-
-
-	public String getUrl() {
-		return _url;
-	}
-
-
-	public void setUrl(String _url) {
-		this._url = _url;
-	}
-
-
-	public String getUser() {
-		return _user;
-	}
-
-
-	public void setUser(String _user) {
-		this._user = _user;
-	}
-
-
-	public String getPw() {
-		return _pw;
-	}
-
-
-	public void setPw(String _pw) {
-		this._pw = _pw;
-	}
-	
-	/***
-	 * makes sure all values are set properly
-	 * before starting communications
-	 */
-	private void init(){
-		if(_user == null){
-			_user = DEFAULTUSER;  
-		}
-		if(_httpClient == null){
-			_httpClient = createTr064HttpClient(_url); //create http client used for communication
-		}
-		if(_alServices.isEmpty()){ // no services are known yet?
-			readAllServices(); //can be done w/out item mappings and w/out auth
-		}
-		if(_alItemMap.isEmpty()){ // no mappings present yet?
-			generateItemMappings();
-		}
-	}
-	
-	
-	
-
-	/***
-	 * Fetches a specific value from FritzBox
-	 * 	 
-	 * 
-	 * @param request string from config including the command and optional parameters
-	 * @return parsed value
-	 */
-	public String getTr064Value(String request){
-		String value = null;
-		
-		//extract itemCommand from request
-		String[] itemConfig = request.split(":");
-		String itemCommand = itemConfig[0]; //command is always first
-		
-		//search for proper item Mapping
-		ItemMap itemMap = determineItemMappingByItemCommand(itemCommand); 
-		
-		if(itemMap == null){
-			logger.warn("No item mapping found for {}. Function not implemented by your FritzBox (?)",request);
-			return "";
-		}
-		
-		//determine which url etc. to connect to for accessing required value
-		Tr064Service tr064service = determineServiceByItemMapping(itemMap);
-		
-		//construct soap Body which is added to soap msg later
-		SOAPBodyElement bodyData = null; //holds data to be sent to fbox
-		try {
-			MessageFactory mf = MessageFactory.newInstance();
-			SOAPMessage msg = mf.createMessage(); //empty message
-			SOAPBody body = msg.getSOAPBody(); //std. SAOP body
-			QName bodyName = new QName(tr064service.getServiceType(), itemMap.getReadServiceCommand(), "u"); //header for body element
-			bodyData = body.addBodyElement(bodyName);
-			//only if input parameter is present
-			if(itemConfig.length > 1){
-				String dataInValue = itemConfig[1];
-				QName dataNode = new QName(itemMap.getReadDataInName()); //service specific node name
-				SOAPElement beDataNode = bodyData.addChildElement(dataNode);
-				//if input is mac address, replace "-" with ":" as fbox wants
-				if(itemMap.getItemCommand().equals("maconline")){
-					dataInValue = dataInValue.replaceAll("-", ":");
-				}
-				beDataNode.addTextNode(dataInValue); //add data which should be requested from fbox for this service
-			}
-			logger.debug("Raw SOAP Request to be sent to FritzBox: {}", soapToString(msg));
-			
-		} catch (Exception e) {
-			logger.error("Error constructing request SOAP msg for getting parameter. {}", e.getMessage());
-			logger.debug("Request was: {}",request);
-		}
-		
-
-		if (bodyData == null){
-			logger.error("Could not determine data to be sent to FritzBox!");
-			return null;
-		}
-		
-		SOAPMessage smTr064Request = constructTr064Msg(bodyData); //construct entire msg with body element
-		String soapActionHeader = tr064service.getServiceType()+"#"+itemMap.getReadServiceCommand(); //needed to be sent with request (not in body -> header)
-		SOAPMessage response = readSoapResponse(soapActionHeader, smTr064Request, _url+tr064service.getControlUrl());
-		logger.debug("Raw SOAP Response from FritzBox: {}", soapToString(response));
-		if(response == null){
-			logger.error("Error retrieving SOAP response from FritzBox");
-			return null;
-		}
-		
-		//check if special "soap value parser" handler for extracting SOAP value is defined. If yes, use svp
-		if(itemMap.getSoapValueParser() == null){ //extract dataOutName1 as default, no handler used
-			NodeList nlDataOutNodes = response.getSOAPPart().getElementsByTagName(itemMap.getReadDataOutName());
-			if(nlDataOutNodes != null && nlDataOutNodes.getLength() > 0){
-				//extract value from soap response
-				value = nlDataOutNodes.item(0).getTextContent();
-			}
-			else{
-				logger.error("FritzBox returned unexpected response. Could not find expected datavalue {} in response {}",itemMap.getReadDataOutName(), soapToString(response));
-			}
-
-		}
-		else{
-			logger.debug("Parsing response using SOAP value parser in Item map");
-			value = itemMap.getSoapValueParser().parseValueFromSoapMessage(response, itemMap, request); //itemMap is passed for accessing mapping in anonymous method (better way to do??)
-		}
-		return value;
-	}
-	
-	/***
-	 * Sets a parameter in fbox. Called from event bus
-	 * @param request config string from itemconfig
-	 * @param cmd command to set
-	 */
-	
-	public void setTr064Value(String request, Command cmd){
-		//extract itemCommand from request
-		String[] itemConfig = request.split(":");
-		String itemCommand = itemConfig[0]; //command is always first
-		
-		//search for proper item Mapping
-		ItemMap itemMap = determineItemMappingByItemCommand(itemCommand); 
-		
-		//determine which url etc. to connect to for accessing required value
-		Tr064Service tr064service = determineServiceByItemMapping(itemMap);
-		//construct soap Body which is added to soap msg later
-		SOAPBodyElement bodyData = null; //holds data to be sent to fbox
-		try {
-			MessageFactory mf = MessageFactory.newInstance();
-			SOAPMessage msg = mf.createMessage(); //empty message
-			SOAPBody body = msg.getSOAPBody(); //std. SAOP body
-			QName bodyName = new QName(tr064service.getServiceType(), itemMap.getWriteServiceCommand(), "u"); //header for body element
-			bodyData = body.addBodyElement(bodyName);
-			//only if input parameter is present
-			if(itemConfig.length > 1){
-				String dataInValueAdd = itemConfig[1]; //additional parameter to set e.g. id of TAM to set
-				QName dataNode = new QName(itemMap.getWriteDataInNameAdditional()); //name of additional para to set
-				SOAPElement beDataNode = bodyData.addChildElement(dataNode);
-				beDataNode.addTextNode(dataInValueAdd); //add value which should be set
-			}
-			
-			//convert String command into numeric
-			String setDataInValue = cmd.toString().equalsIgnoreCase("on") ? "1" : "0";
-			QName dataNode = new QName(itemMap.getWriteDataInName()); //service specific node name
-			SOAPElement beDataNode = bodyData.addChildElement(dataNode);
-			beDataNode.addTextNode(setDataInValue); //add data which should be requested from fbox for this service
-			logger.debug("SOAP Msg to send to FritzBox for setting data: {}", soapToString(msg));
-			
-		} catch (Exception e) {
-			logger.error("Error constructing request SOAP msg for setting parameter. {}", e.getMessage());
-			logger.debug("Request was: {}. Command was: {}.",request ,cmd.toString());
-		}
-		
-		if (bodyData == null){
-			logger.error("Could not determine data to be sent to FritzBox!");
-			return;
-		}
-		
-		SOAPMessage smTr064Request = constructTr064Msg(bodyData); //construct entire msg with body element
-		String soapActionHeader = tr064service.getServiceType()+"#"+itemMap.getWriteServiceCommand(); //needed to be sent with request (not in body -> header)
-		SOAPMessage response = readSoapResponse(soapActionHeader, smTr064Request, _url+tr064service.getControlUrl());
-		if(response == null){
-			logger.error("Error retrieving SOAP response from FritzBox");
-			return;
-		}
-		logger.debug("SOAP response from FritzBox: {}",soapToString(response));
-		
-		//Check if error received
-		try {
-			if(response.getSOAPBody().getFault()  != null){
-				logger.error("Error received from FritzBox while trying to set parameter");
-				logger.debug("Soap Response was: {}",soapToString(response));
-			}
-		} catch (SOAPException e) {
-			logger.error("Could not parse soap response from FritzBox while setting parameter. {}", e.getMessage());
-			logger.debug("Soap Response was: {}",soapToString(response));
-		}
-
-	}
-	
-	
-	/***
-	 * Creates a apache HTTP Client object, ignoring SSL Exceptions like self signed certificates
-	 * and sets Auth. Scheme to Digest Auth
-	 * @param fboxUrl the URL from config file of fbox to connect to
-	 * @return the ready-to-use httpclient for tr064 requests
-	 */
-	private CloseableHttpClient createTr064HttpClient(String fboxUrl){
-		CloseableHttpClient hc = null;
-		//Convert URL String from config in easy explotable URI object
-		URIBuilder uriFbox = null;
-		try {
-			uriFbox = new URIBuilder(fboxUrl);
-		} catch (URISyntaxException e) {
-			logger.error("Invalid FritzBox URL! {}",e.getMessage());
-			return null;
-		}
-		//Create context of the http client
-		_httpClientContext = HttpClientContext.create();
-		CookieStore cookieStore = new BasicCookieStore();
-		_httpClientContext.setCookieStore(cookieStore);
-		
-		//SETUP AUTH
-		//Auth is specific for this target
-		HttpHost target = new HttpHost(uriFbox.getHost(), uriFbox.getPort(), uriFbox.getScheme());
-        //Add digest authentication with username/pw from global config
-		CredentialsProvider credp = new BasicCredentialsProvider();
-        credp.setCredentials(new AuthScope(target.getHostName(), target.getPort()), new UsernamePasswordCredentials(_user, _pw));
+    private static final Logger logger = LoggerFactory.getLogger(FritzboxTr064Binding.class);
+    private static final String DEFAULTUSER = "dslf-config"; // is used when no username is provided.
+    private static final String TR064DOWNLOADFILE = "tr64desc.xml"; // filename of all available TR064 on fbox
+
+    // access details for fbox
+    private String _url = null;
+    private String _user = null;
+    private String _pw = null;
+
+    // all services fbox offers
+    private ArrayList<Tr064Service> _alServices = null;
+
+    // mappig table for mapping item command to tr064 parameters
+    private ArrayList<ItemMap> _alItemMap = null;
+
+    // http client object used to communicate with fbox (needed for reading/writing soap requests)
+    private CloseableHttpClient _httpClient = null;
+    private HttpClientContext _httpClientContext = null; // for reusing auth (?)
+
+    public Tr064Comm(String _url, String user, String pass) { // base URL from config
+        this._url = _url;
+        this._user = user;
+        this._pw = pass;
+        _alServices = new ArrayList<Tr064Service>();
+        _alItemMap = new ArrayList<ItemMap>();
+        init();
+    }
+
+    public String getUrl() {
+        return _url;
+    }
+
+    public void setUrl(String _url) {
+        this._url = _url;
+    }
+
+    public String getUser() {
+        return _user;
+    }
+
+    public void setUser(String _user) {
+        this._user = _user;
+    }
+
+    public String getPw() {
+        return _pw;
+    }
+
+    public void setPw(String _pw) {
+        this._pw = _pw;
+    }
+
+    /***
+     * makes sure all values are set properly
+     * before starting communications
+     */
+    private void init() {
+        if (_user == null) {
+            _user = DEFAULTUSER;
+        }
+        if (_httpClient == null) {
+            _httpClient = createTr064HttpClient(_url); // create http client used for communication
+        }
+        if (_alServices.isEmpty()) { // no services are known yet?
+            readAllServices(); // can be done w/out item mappings and w/out auth
+        }
+        if (_alItemMap.isEmpty()) { // no mappings present yet?
+            generateItemMappings();
+        }
+    }
+
+    /***
+     * Fetches a specific value from FritzBox
+     *
+     *
+     * @param request string from config including the command and optional parameters
+     * @return parsed value
+     */
+    public String getTr064Value(String request) {
+        String value = null;
+
+        // extract itemCommand from request
+        String[] itemConfig = request.split(":");
+        String itemCommand = itemConfig[0]; // command is always first
+
+        // search for proper item Mapping
+        ItemMap itemMap = determineItemMappingByItemCommand(itemCommand);
+
+        if (itemMap == null) {
+            logger.warn("No item mapping found for {}. Function not implemented by your FritzBox (?)", request);
+            return "";
+        }
+
+        // determine which url etc. to connect to for accessing required value
+        Tr064Service tr064service = determineServiceByItemMapping(itemMap);
+
+        // construct soap Body which is added to soap msg later
+        SOAPBodyElement bodyData = null; // holds data to be sent to fbox
+        try {
+            MessageFactory mf = MessageFactory.newInstance();
+            SOAPMessage msg = mf.createMessage(); // empty message
+            SOAPBody body = msg.getSOAPBody(); // std. SAOP body
+            QName bodyName = new QName(tr064service.getServiceType(), itemMap.getReadServiceCommand(), "u"); // header
+                                                                                                             // for body
+                                                                                                             // element
+            bodyData = body.addBodyElement(bodyName);
+            // only if input parameter is present
+            if (itemConfig.length > 1) {
+                String dataInValue = itemConfig[1];
+                QName dataNode = new QName(itemMap.getReadDataInName()); // service specific node name
+                SOAPElement beDataNode = bodyData.addChildElement(dataNode);
+                // if input is mac address, replace "-" with ":" as fbox wants
+                if (itemMap.getItemCommand().equals("maconline")) {
+                    dataInValue = dataInValue.replaceAll("-", ":");
+                }
+                beDataNode.addTextNode(dataInValue); // add data which should be requested from fbox for this service
+            }
+            logger.debug("Raw SOAP Request to be sent to FritzBox: {}", soapToString(msg));
+
+        } catch (Exception e) {
+            logger.error("Error constructing request SOAP msg for getting parameter. {}", e.getMessage());
+            logger.debug("Request was: {}", request);
+        }
+
+        if (bodyData == null) {
+            logger.error("Could not determine data to be sent to FritzBox!");
+            return null;
+        }
+
+        SOAPMessage smTr064Request = constructTr064Msg(bodyData); // construct entire msg with body element
+        String soapActionHeader = tr064service.getServiceType() + "#" + itemMap.getReadServiceCommand(); // needed to be
+                                                                                                         // sent with
+                                                                                                         // request (not
+                                                                                                         // in body ->
+                                                                                                         // header)
+        SOAPMessage response = readSoapResponse(soapActionHeader, smTr064Request, _url + tr064service.getControlUrl());
+        logger.debug("Raw SOAP Response from FritzBox: {}", soapToString(response));
+        if (response == null) {
+            logger.error("Error retrieving SOAP response from FritzBox");
+            return null;
+        }
+
+        // check if special "soap value parser" handler for extracting SOAP value is defined. If yes, use svp
+        if (itemMap.getSoapValueParser() == null) { // extract dataOutName1 as default, no handler used
+            NodeList nlDataOutNodes = response.getSOAPPart().getElementsByTagName(itemMap.getReadDataOutName());
+            if (nlDataOutNodes != null && nlDataOutNodes.getLength() > 0) {
+                // extract value from soap response
+                value = nlDataOutNodes.item(0).getTextContent();
+            } else {
+                logger.error(
+                        "FritzBox returned unexpected response. Could not find expected datavalue {} in response {}",
+                        itemMap.getReadDataOutName(), soapToString(response));
+            }
+
+        } else {
+            logger.debug("Parsing response using SOAP value parser in Item map");
+            value = itemMap.getSoapValueParser().parseValueFromSoapMessage(response, itemMap, request); // itemMap is
+                                                                                                        // passed for
+                                                                                                        // accessing
+                                                                                                        // mapping in
+                                                                                                        // anonymous
+                                                                                                        // method
+                                                                                                        // (better way
+                                                                                                        // to do??)
+        }
+        return value;
+    }
+
+    /***
+     * Sets a parameter in fbox. Called from event bus
+     *
+     * @param request config string from itemconfig
+     * @param cmd command to set
+     */
+
+    public void setTr064Value(String request, Command cmd) {
+        // extract itemCommand from request
+        String[] itemConfig = request.split(":");
+        String itemCommand = itemConfig[0]; // command is always first
+
+        // search for proper item Mapping
+        ItemMap itemMap = determineItemMappingByItemCommand(itemCommand);
+
+        // determine which url etc. to connect to for accessing required value
+        Tr064Service tr064service = determineServiceByItemMapping(itemMap);
+        // construct soap Body which is added to soap msg later
+        SOAPBodyElement bodyData = null; // holds data to be sent to fbox
+        try {
+            MessageFactory mf = MessageFactory.newInstance();
+            SOAPMessage msg = mf.createMessage(); // empty message
+            SOAPBody body = msg.getSOAPBody(); // std. SAOP body
+            QName bodyName = new QName(tr064service.getServiceType(), itemMap.getWriteServiceCommand(), "u"); // header
+                                                                                                              // for
+                                                                                                              // body
+                                                                                                              // element
+            bodyData = body.addBodyElement(bodyName);
+            // only if input parameter is present
+            if (itemConfig.length > 1) {
+                String dataInValueAdd = itemConfig[1]; // additional parameter to set e.g. id of TAM to set
+                QName dataNode = new QName(itemMap.getWriteDataInNameAdditional()); // name of additional para to set
+                SOAPElement beDataNode = bodyData.addChildElement(dataNode);
+                beDataNode.addTextNode(dataInValueAdd); // add value which should be set
+            }
+
+            // convert String command into numeric
+            String setDataInValue = cmd.toString().equalsIgnoreCase("on") ? "1" : "0";
+            QName dataNode = new QName(itemMap.getWriteDataInName()); // service specific node name
+            SOAPElement beDataNode = bodyData.addChildElement(dataNode);
+            beDataNode.addTextNode(setDataInValue); // add data which should be requested from fbox for this service
+            logger.debug("SOAP Msg to send to FritzBox for setting data: {}", soapToString(msg));
+
+        } catch (Exception e) {
+            logger.error("Error constructing request SOAP msg for setting parameter. {}", e.getMessage());
+            logger.debug("Request was: {}. Command was: {}.", request, cmd.toString());
+        }
+
+        if (bodyData == null) {
+            logger.error("Could not determine data to be sent to FritzBox!");
+            return;
+        }
+
+        SOAPMessage smTr064Request = constructTr064Msg(bodyData); // construct entire msg with body element
+        String soapActionHeader = tr064service.getServiceType() + "#" + itemMap.getWriteServiceCommand(); // needed to
+                                                                                                          // be sent
+                                                                                                          // with
+                                                                                                          // request
+                                                                                                          // (not in
+                                                                                                          // body ->
+                                                                                                          // header)
+        SOAPMessage response = readSoapResponse(soapActionHeader, smTr064Request, _url + tr064service.getControlUrl());
+        if (response == null) {
+            logger.error("Error retrieving SOAP response from FritzBox");
+            return;
+        }
+        logger.debug("SOAP response from FritzBox: {}", soapToString(response));
+
+        // Check if error received
+        try {
+            if (response.getSOAPBody().getFault() != null) {
+                logger.error("Error received from FritzBox while trying to set parameter");
+                logger.debug("Soap Response was: {}", soapToString(response));
+            }
+        } catch (SOAPException e) {
+            logger.error("Could not parse soap response from FritzBox while setting parameter. {}", e.getMessage());
+            logger.debug("Soap Response was: {}", soapToString(response));
+        }
+
+    }
+
+    /***
+     * Creates a apache HTTP Client object, ignoring SSL Exceptions like self signed certificates
+     * and sets Auth. Scheme to Digest Auth
+     *
+     * @param fboxUrl the URL from config file of fbox to connect to
+     * @return the ready-to-use httpclient for tr064 requests
+     */
+    private CloseableHttpClient createTr064HttpClient(String fboxUrl) {
+        CloseableHttpClient hc = null;
+        // Convert URL String from config in easy explotable URI object
+        URIBuilder uriFbox = null;
+        try {
+            uriFbox = new URIBuilder(fboxUrl);
+        } catch (URISyntaxException e) {
+            logger.error("Invalid FritzBox URL! {}", e.getMessage());
+            return null;
+        }
+        // Create context of the http client
+        _httpClientContext = HttpClientContext.create();
+        CookieStore cookieStore = new BasicCookieStore();
+        _httpClientContext.setCookieStore(cookieStore);
+
+        // SETUP AUTH
+        // Auth is specific for this target
+        HttpHost target = new HttpHost(uriFbox.getHost(), uriFbox.getPort(), uriFbox.getScheme());
+        // Add digest authentication with username/pw from global config
+        CredentialsProvider credp = new BasicCredentialsProvider();
+        credp.setCredentials(new AuthScope(target.getHostName(), target.getPort()),
+                new UsernamePasswordCredentials(_user, _pw));
         // Create AuthCache instance. Manages authentication based on server response
         AuthCache authCache = new BasicAuthCache();
-        // Generate DIGEST scheme object, initialize it and add it to the local auth cache. Digeste is standard for fbox auth SOAP
+        // Generate DIGEST scheme object, initialize it and add it to the local auth cache. Digeste is standard for fbox
+        // auth SOAP
         DigestScheme digestAuth = new DigestScheme();
-        digestAuth.overrideParamter("realm", "HTTPS Access"); //known from fbox specification
-        digestAuth.overrideParamter("nonce", ""); //never known at first request
+        digestAuth.overrideParamter("realm", "HTTPS Access"); // known from fbox specification
+        digestAuth.overrideParamter("nonce", ""); // never known at first request
         authCache.put(target, digestAuth);
         // Add AuthCache to the execution context
         _httpClientContext.setAuthCache(authCache);
-        
-        //SETUP SSL TRUST
+
+        // SETUP SSL TRUST
         SSLContextBuilder sslContextBuilder = new SSLContextBuilder();
         SSLConnectionSocketFactory sslsf = null;
         try {
-			sslContextBuilder.loadTrustMaterial(null, new TrustSelfSignedStrategy()); //accept self signed certs
-			sslsf = new SSLConnectionSocketFactory(sslContextBuilder.build(), null, null, new NoopHostnameVerifier()); //dont verify hostname against cert CN 
-		} catch (Exception ex) {
-			logger.error(ex.getMessage());
-		}
-        
-        //BUILDER
-        //setup builder with parameters defined before
-        hc = HttpClientBuilder.create()
-        .setSSLSocketFactory(sslsf) //set the SSL options which trust every self signed cert
-        .setDefaultCredentialsProvider(credp) // set auth options using digest
-		.build();
+            sslContextBuilder.loadTrustMaterial(null, new TrustSelfSignedStrategy()); // accept self signed certs
+            sslsf = new SSLConnectionSocketFactory(sslContextBuilder.build(), null, null, new NoopHostnameVerifier()); // dont
+                                                                                                                       // verify
+                                                                                                                       // hostname
+                                                                                                                       // against
+                                                                                                                       // cert
+                                                                                                                       // CN
+        } catch (Exception ex) {
+            logger.error(ex.getMessage());
+        }
+
+        // Set timeout values
+        RequestConfig rc = RequestConfig.copy(RequestConfig.DEFAULT).setSocketTimeout(4000).setConnectTimeout(4000)
+                .setConnectionRequestTimeout(4000).build();
+
+        // BUILDER
+        // setup builder with parameters defined before
+        hc = HttpClientBuilder.create().setSSLSocketFactory(sslsf) // set the SSL options which trust every self signed
+                                                                   // cert
+                .setDefaultCredentialsProvider(credp) // set auth options using digest
+                .setDefaultRequestConfig(rc) // set the request config specifying timeout
+                .build();
 
         return hc;
-	}
-	
-	/***
-	 * converts SOAP msg into string
-	 * @param sm
-	 * @return
-	 */
-	private String soapToString(SOAPMessage sm){
-		String strMsg ="";
-		try {
-			ByteArrayOutputStream xmlStream = new ByteArrayOutputStream();
-			sm.writeTo(xmlStream);
-			strMsg = new String(xmlStream.toByteArray());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return strMsg;
-	}
-	
-	
-	
-	/***
-	 * 
-	 * @param soapActionHeader String in HTTP Header. specific for each TR064 service
-	 * @param request the SOAPMEssage Object to send to fbox as request
-	 * @param serviceUrl URL to sent the SOAP Message to (service specific)
-	 * @return
-	 */
-	private SOAPMessage readSoapResponse(String soapActionHeader, SOAPMessage request, String serviceUrl){
-		SOAPMessage response = null;
-		
-        //Soap Body to post
-        HttpPost postSoap = new HttpPost(serviceUrl); //url is service specific
-        postSoap.addHeader("SOAPAction", soapActionHeader); //add the Header specific for this request
+    }
+
+    /***
+     * converts SOAP msg into string
+     *
+     * @param sm
+     * @return
+     */
+    private String soapToString(SOAPMessage sm) {
+        String strMsg = "";
+        try {
+            ByteArrayOutputStream xmlStream = new ByteArrayOutputStream();
+            sm.writeTo(xmlStream);
+            strMsg = new String(xmlStream.toByteArray());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return strMsg;
+    }
+
+    /***
+     *
+     * @param soapActionHeader String in HTTP Header. specific for each TR064 service
+     * @param request the SOAPMEssage Object to send to fbox as request
+     * @param serviceUrl URL to sent the SOAP Message to (service specific)
+     * @return
+     */
+    private SOAPMessage readSoapResponse(String soapActionHeader, SOAPMessage request, String serviceUrl) {
+        SOAPMessage response = null;
+
+        // Soap Body to post
+        HttpPost postSoap = new HttpPost(serviceUrl); // url is service specific
+        postSoap.addHeader("SOAPAction", soapActionHeader); // add the Header specific for this request
         HttpEntity entBody = null;
-        HttpResponse resp = null; //stores raw response from fbox
-		try {
-			entBody = new StringEntity(soapToString(request), ContentType.create("text/xml", "UTF-8")); //add body
-			postSoap.setEntity(entBody);
-			resp = _httpClient.execute(postSoap,_httpClientContext);
-			
-			//Fetch content data
-			StatusLine slResponse = resp.getStatusLine();
-			HttpEntity heResponse = resp.getEntity();
-			
-			//Check for (auth-) error
-			if(slResponse.getStatusCode() == 401){
-				logger.error("Could not read response from FritzBox. Unauthorized! Check User/PW in config. Create user for tr064 requests");
-				return null;
-			}
-			
-			//Parse response into SOAP Message
-			response = MessageFactory.newInstance().createMessage(null, heResponse.getContent());
-			
-		} catch (UnsupportedEncodingException e) {
-			logger.error("Encoding not supported: {}",e.getMessage().toString());
-			return null;
-		} catch (ClientProtocolException e) {
-			logger.error("Client Protocol not supported: {}",e.getMessage().toString());
-			return null;
-		} catch (IOException e) {
-			logger.error("Cannot send/receive: {}",e.getMessage().toString());
-			return null;
-		} catch (UnsupportedOperationException e) {
-			logger.error("Operation unsupported: {}",e.getMessage().toString());
-			return null;
-		} catch (SOAPException e) {
-			logger.error("SOAP Error: {}",e.getMessage().toString());
-			return null;
-		}
-        
+        HttpResponse resp = null; // stores raw response from fbox
+        boolean exceptionOccurred = false;
+        try {
+            entBody = new StringEntity(soapToString(request), ContentType.create("text/xml", "UTF-8")); // add body
+            postSoap.setEntity(entBody);
+            resp = _httpClient.execute(postSoap, _httpClientContext);
+
+            // Fetch content data
+            StatusLine slResponse = resp.getStatusLine();
+            HttpEntity heResponse = resp.getEntity();
+
+            // Check for (auth-) error
+            if (slResponse.getStatusCode() == 401) {
+                logger.error(
+                        "Could not read response from FritzBox. Unauthorized! Check User/PW in config. Create user for tr064 requests");
+                return null;
+            }
+
+            // Parse response into SOAP Message
+            response = MessageFactory.newInstance().createMessage(null, heResponse.getContent());
+
+        } catch (UnsupportedEncodingException e) {
+            logger.error("Encoding not supported: {}", e.getMessage().toString());
+            response = null;
+            exceptionOccurred = true;
+        } catch (ClientProtocolException e) {
+            logger.error("Client Protocol not supported: {}", e.getMessage().toString());
+            response = null;
+            exceptionOccurred = true;
+        } catch (IOException e) {
+            logger.error("Cannot send/receive: {}", e.getMessage().toString());
+            response = null;
+            exceptionOccurred = true;
+        } catch (UnsupportedOperationException e) {
+            logger.error("Operation unsupported: {}", e.getMessage().toString());
+            response = null;
+            exceptionOccurred = true;
+        } catch (SOAPException e) {
+            logger.error("SOAP Error: {}", e.getMessage().toString());
+            response = null;
+            exceptionOccurred = true;
+        } finally {
+            // Make sure connection is released. If error occurred make sure to print in log
+            if (exceptionOccurred) {
+                logger.error("Releasing connection to FritzBox because of error!");
+            } else {
+                logger.debug("Releasing connection");
+            }
+            postSoap.releaseConnection();
+        }
+
         return response;
-		
-	}
-	
-	
-	/***
-	 * sets all required namespaces and prepares the SOAP message to send
-	 * creates skeleton + body data
-	 * @param bodyData is attached to skeleton to form entire SOAP message
-	 * @return ready to send SOAP message
-	 */
-	private SOAPMessage constructTr064Msg(SOAPBodyElement bodyData){
-		SOAPMessage soapMsg = null;
-		
-		try {
-			MessageFactory msgFac;
-			msgFac = MessageFactory.newInstance();
-			soapMsg = msgFac.createMessage();
-			soapMsg.setProperty(SOAPMessage.WRITE_XML_DECLARATION, "true");
-			soapMsg.setProperty(SOAPMessage.CHARACTER_SET_ENCODING,"UTF-8");
-			SOAPPart part = soapMsg.getSOAPPart();
-			
-			//valid for entire SOAP msg
-			String namespace = "s";
-
-	
-			//create suitable fbox envelope
-			SOAPEnvelope envelope = part.getEnvelope();
-			envelope.setPrefix(namespace);
-			envelope.removeNamespaceDeclaration("SOAP-ENV"); //delete standard namespace which was already set
-			envelope.addNamespaceDeclaration(namespace, "http://schemas.xmlsoap.org/soap/envelope/");
-			Name nEncoding = envelope.createName("encodingStyle", namespace, "http://schemas.xmlsoap.org/soap/encoding/");
-			envelope.addAttribute(nEncoding, "http://schemas.xmlsoap.org/soap/encoding/");
-			
-			//create empty header
-			SOAPHeader header = envelope.getHeader();
-			header.setPrefix(namespace);
-			
-			//create body with command based on parameter
-			SOAPBody body = envelope.getBody();
-			body.setPrefix(namespace);
-			body.addChildElement(bodyData); //bodyData already prepared. Needs only be added
-			
-		} catch (Exception e) {
-			logger.error("Error creating SOAP message for fbox request with data {}",bodyData);
-			e.printStackTrace();
-		}
-		
-		
-		return soapMsg;
-		
-	}
-	
-	
-	/***
-	 * looks for the proper item mapping for the item command given from item file
-	 * @param itemCommand String item command
-	 * @return found itemMap object if found, or null
-	 */
-	private ItemMap determineItemMappingByItemCommand(String itemCommand){
-		ItemMap foundMapping = null;
-		
-		//iterate over all itemMappings to find proper mapping for requested item command
-		Iterator<ItemMap> itMap = _alItemMap.iterator();
-		while(itMap.hasNext()){
-			ItemMap currentMap = itMap.next();
-			if(itemCommand.equals(currentMap.getItemCommand())){
-				foundMapping = currentMap;
-				break;
-			}
-		}
-		if(foundMapping == null){
-			logger.error("No mapping found for item command {}",itemCommand);
-		}
-		return foundMapping;
-	}
-	
-	
-	
-	/***
-	 * determines Service including which URL to connect to for value request
-	 * @param the itemmap for which the service is searched
-	 * @return the found service or null
-	 */
-	private Tr064Service determineServiceByItemMapping(ItemMap mapping) {
-		Tr064Service foundService = null;
-		
-		//search which service matches the item mapping
-		Iterator<Tr064Service> it = _alServices.iterator();
-		while(it.hasNext()){
-			Tr064Service currentService = it.next();
-			if(currentService.getServiceId().contains(mapping.getServiceId())){
-				foundService = currentService;
-				break;
-			}
-		}
-		if(foundService == null){
-			logger.error("No tr064 service found for service id {}",mapping.getServiceId());
-		}
-		return foundService;
-	}
-	
-	/***
-	 * Connects to fbox service xml to get a list of all services
-	 *  which are offered by TR064. Saves it into local list
-	 */
-	private void readAllServices(){
-		Document xml = getFboxXmlResponse(_url+"/"+TR064DOWNLOADFILE);
-		if(xml == null){
-			logger.error("Could not read xml response services");
-			return;
-		}
-		NodeList nlServices = xml.getElementsByTagName("service"); //get all service nodes
-		Node currentNode = null;
-		XPath xPath = XPathFactory.newInstance().newXPath();
-		for(int i=0; i < nlServices.getLength(); i++){ // iterate over all services fbox offered us 
-			currentNode = nlServices.item(i);
-            Tr064Service trS = new Tr064Service(); 
-			try {
-            	trS.setControlUrl((String) xPath.evaluate("controlURL", currentNode, XPathConstants.STRING));
-				trS.setEventSubUrl((String) xPath.evaluate("eventSubURL", currentNode, XPathConstants.STRING));
-            	trS.setScpdurl((String) xPath.evaluate("SCPDURL", currentNode, XPathConstants.STRING));
-            	trS.setServiceId((String) xPath.evaluate("serviceId", currentNode, XPathConstants.STRING));
-            	trS.setServiceType((String) xPath.evaluate("serviceType", currentNode, XPathConstants.STRING));
-			} catch (XPathExpressionException e) {
-				logger.debug("Could not parse service {}", currentNode.getTextContent());
-				e.printStackTrace();
-			}
-			_alServices.add(trS);
-		}
-	}
-	
-	/***
-	 * populates local static mapping table
-	 * todo: refactore to read from config file later?
-	 * sets the parser based on the itemcommand -> soap value parser "svp" anonymous method
-	 * for each mapping
-	 * 
-	 */
-	private void generateItemMappings(){
-		//services available from fbox. Needed for e.g. wifi select 5GHz/Guest Wifi
-		if(_alServices.isEmpty()){ // no services are known yet?
-			readAllServices();
-		}
-		
-		//Mac Online Checker
-		ItemMap imMacOnline = new ItemMap("maconline", "GetSpecificHostEntry", "LanDeviceHosts-com:serviceId:Hosts1", "NewMACAddress", "NewActive");
-		imMacOnline.setSoapValueParser(new SoapValueParser() {
-			
-			@Override
-			public String parseValueFromSoapMessage(SOAPMessage sm, ItemMap mapping, String request) {
-				logger.debug("Parsing FritzBox response for maconline");
-				String value = "";
-				//maconline: if fault is present could also indicate not a fault but MAC is not known
-				try {
-					SOAPBody sbResponse = sm.getSOAPBody();
-					if(sbResponse.hasFault()){
-						SOAPFault sf = sbResponse.getFault();
-						Detail detail = sf.getDetail();
-						if(detail != null){
-							NodeList nlErrorCode = detail.getElementsByTagName("errorCode");
-							Node nErrorCode = nlErrorCode.item(0);
-							String errorCode = nErrorCode.getTextContent();
-							if(errorCode.equals("714")){
-								value = "MAC not known to FritzBox!";
-								logger.debug(value);
-							}
-							else{
-								logger.error("Error received from FritzBox: {}. SOAP request was: {}", soapToString(sm), request);
-								value = "ERROR";
-							}
-						}
-					}
-					else{
-						SOAPBody sb = sm.getSOAPBody();
-						//parameter name to extract is taken from mapping
-						NodeList nlActive = sb.getElementsByTagName(mapping.getReadDataOutName());
-						if(nlActive.getLength() > 0){
-							Node nActive = nlActive.item(0);
-							value = nActive.getTextContent();
-							logger.debug("parsed as {}",value);
-						}
-					}
-				} catch (SOAPException e) {
-					logger.error("Error parsing SOAP response from FritzBox: {}", e.getMessage());
-				}
-				return value;
-			}
-		});
-		_alItemMap.add(imMacOnline);
-		
-		
-		_alItemMap.add(new ItemMap("modelName", "GetInfo", "DeviceInfo-com:serviceId:DeviceInfo1", "", "NewModelName"));
-		_alItemMap.add(new ItemMap("wanip", "GetExternalIPAddress", "urn:WANPPPConnection-com:serviceId:WANPPPConnection1", "", "NewExternalIPAddress"));
-		
-		//Wifi 2,4GHz
-		ItemMap imWifi24Switch = new ItemMap("wifi24Switch", "GetInfo", "urn:WLANConfiguration-com:serviceId:WLANConfiguration1", "", "NewEnable");
-		imWifi24Switch.setWriteServiceCommand("SetEnable");
-		imWifi24Switch.setWriteDataInName("NewEnable");
-		_alItemMap.add(imWifi24Switch);
-		
-		//wifi 5GHz
-		ItemMap imWifi50Switch = new ItemMap("wifi50Switch", "GetInfo", "urn:WLANConfiguration-com:serviceId:WLANConfiguration2", "", "NewEnable");
-		imWifi50Switch.setWriteServiceCommand("SetEnable");
-		imWifi50Switch.setWriteDataInName("NewEnable");
-				
-		//guest wifi
-		ItemMap imWifiGuestSwitch = new ItemMap("wifiGuestSwitch", "GetInfo", "urn:WLANConfiguration-com:serviceId:WLANConfiguration3", "", "NewEnable");
-		imWifiGuestSwitch.setWriteServiceCommand("SetEnable");
-		imWifiGuestSwitch.setWriteDataInName("NewEnable");
-				
-		//check if 5GHz wifi and/or guest wifi is available. 
-		Tr064Service svc5GHzWifi = determineServiceByItemMapping(imWifi50Switch);
-		Tr064Service svcGuestWifi = determineServiceByItemMapping(imWifiGuestSwitch);
-		
-		if(svc5GHzWifi != null && svcGuestWifi != null){ //WLANConfiguration3+2 present -> guest wifi + 5Ghz present
-			//prepared properly, only needs to be added
-			_alItemMap.add(imWifi50Switch);			
-			_alItemMap.add(imWifiGuestSwitch);
-			logger.debug("Found 2,4 Ghz, 5Ghz and Guest Wifi");
-		}
-		
-		if(svc5GHzWifi != null && svcGuestWifi == null){ //WLANConfiguration3 not present but 2 -> no 5Ghz Wifi available but Guest Wifi
-			//remap itemMap for Guest Wifi from 3 to 2
-			imWifiGuestSwitch.setServiceId("urn:WLANConfiguration-com:serviceId:WLANConfiguration2");
-			_alItemMap.add(imWifiGuestSwitch);//only add guest wifi, no 5Ghz
-			logger.debug("Found 2,4 Ghz and Guest Wifi");
-		}
-		if(svc5GHzWifi == null && svcGuestWifi == null){ //WLANConfiguration3+2 not present > no 5Ghz Wifi or Guest Wifi
-			logger.debug("Found 2,4 Ghz Wifi");
-		}
-		
-		//Phonebook Download
-		// itemcommand is dummy: not a real item
-		ItemMap imPhonebook = new ItemMap("phonebook", "GetPhonebook", "urn:X_AVM-DE_OnTel-com:serviceId:X_AVM-DE_OnTel1", "NewPhonebookID", "NewPhonebookURL");
-		_alItemMap.add(imPhonebook);
-		
-		//TAM (telephone answering machine) Switch
-		ItemMap imTamSwitch = new ItemMap("tamSwitch", "GetInfo", "urn:X_AVM-DE_TAM-com:serviceId:X_AVM-DE_TAM1", "NewIndex", "NewEnable");
-		imTamSwitch.setWriteServiceCommand("SetEnable");
-		imTamSwitch.setWriteDataInName("NewEnable");
-		imTamSwitch.setWriteDataInNameAdditional("NewIndex"); //additional Parameter to set
-		_alItemMap.add(imTamSwitch);
-		
-		//New Messages per TAM ID
-		// two requests needed: First gets URL to download tam info from, 2nd contains info of messages
-		ItemMap imTamNewMessages = new ItemMap("tamNewMessages", "GetMessageList", "urn:X_AVM-DE_TAM-com:serviceId:X_AVM-DE_TAM1", "NewIndex", "NewURL");
-		//SVP fetches desired infos
-		imTamNewMessages.setSoapValueParser(new SoapValueParser() {
-			
-			@Override
-			public String parseValueFromSoapMessage(SOAPMessage sm, ItemMap mapping, String request) {
-				String value = "";
-				logger.debug("Parsing FritzBox response for TAM messages: {}",soapToString(sm));
-				try {
-					SOAPBody sbResponse = sm.getSOAPBody();
-					if(sbResponse.hasFault()){
-						SOAPFault sf = sbResponse.getFault();
-						Detail detail = sf.getDetail();
-						if(detail != null){
-							logger.error("Error received from fbox while parsing TAM message info: {}. ",soapToString(sm));
-							value = "ERROR";
-						}
-					}
-					else{
-						NodeList nlDataOutNodes = sm.getSOAPPart().getElementsByTagName(mapping.getReadDataOutName()); //URL
-						if(nlDataOutNodes != null && nlDataOutNodes.getLength() > 0){
-							//extract URL from soap response
-							String url = nlDataOutNodes.item(0).getTextContent();
-							Document xmlTamInfo = getFboxXmlResponse(url);
-							logger.debug("Parsing xml message TAM info {}",Helper.documentToString(xmlTamInfo));
-							NodeList nlNews = xmlTamInfo.getElementsByTagName("New"); //get all Nodes containing "new", indicating message was not listened to
-							
-							//When <new> contains 1 -> message is new, when 0, message not new -> Counting 1s
-							int newMessages = 0;
-							for(int i=0;i<nlNews.getLength();i++){
-								if(nlNews.item(i).getTextContent().equals("1")){
-									newMessages++;
-								}
-							}
-							value = Integer.toString(newMessages);
-							logger.debug("Parsed new messages as: {}",value);
-						}
-						else{
-							logger.error("FritzBox returned unexpected response. Could not find expected datavalue {} in response {}",mapping.getReadDataOutName(),soapToString(sm));
-						}
-					}
-				} catch (SOAPException e) {
-					logger.error("Error parsing SOAP response from FritzBox");
-					e.printStackTrace();
-				}
-				
-				return value;
-			}
-		});
-		_alItemMap.add(imTamNewMessages);
-		
-		
-		//Missed calls
-		//two requests: 1st fetches URL to download call list, 2nd fetches xml call list
-		ItemMap imMissedCalls = new ItemMap("missedCallsInDays", "GetCallList", "urn:X_AVM-DE_OnTel-com:serviceId:X_AVM-DE_OnTel1", "NewDays", "NewCallListURL");
-		//svp for downloading call list from received URL
-		imMissedCalls.setSoapValueParser(new SoapValueParser() {
-			
-			@Override
-			public String parseValueFromSoapMessage(SOAPMessage sm, ItemMap mapping, String request) {
-				String value = "";
-				logger.debug("Parsing FritzBox response for call list: {}",soapToString(sm));
-				
-				//extract how many days of call list should be examined for missed calls
-				String days = "3"; //default
-				String[] itemConfig = request.split(":");
-				if(itemConfig.length == 2){
-					days = itemConfig[1]; //set the days as defined in item config. Otherwise default value of 3 is used
-				}
-				
-				try {
-					SOAPBody sbResponse = sm.getSOAPBody();
-					if(sbResponse.hasFault()){
-						SOAPFault sf = sbResponse.getFault();
-						Detail detail = sf.getDetail();
-						if(detail != null){
-							logger.error("Error received from FritzBox while parsing call list: {}",soapToString(sm));
-							value = "ERROR";
-						}
-					}
-					else{
-						NodeList nlDataOutNodes = sm.getSOAPPart().getElementsByTagName(mapping.getReadDataOutName()); //URL
-						if(nlDataOutNodes != null && nlDataOutNodes.getLength() > 0){
-							//extract URL from soap response
-							String url = nlDataOutNodes.item(0).getTextContent();
-							// only get missed calls of the last x days
-							url = url + "&days="+days;
-							logger.debug("Downloading call list using url {}",url);
-							Document xmlTamInfo = getFboxXmlResponse(url); //download call list
-							logger.debug("Parsing xml message call list info {}",Helper.documentToString(xmlTamInfo));
-							NodeList nlTypes = xmlTamInfo.getElementsByTagName("Type"); //get all Nodes containing "Type". Type 2 => missed
-							
-							//When <type> contains 2 -> call was missed -> Counting only 2 entries
-							int missedCalls = 0;
-							for(int i=0;i<nlTypes.getLength();i++){
-								if(nlTypes.item(i).getTextContent().equals("2")){
-									missedCalls++;
-								}
-							}
-							value = Integer.toString(missedCalls);
-							logger.debug("Parsed new messages as: {}",value);
-						}
-						else{
-							logger.error("FritzBox returned unexpected response. Could not find expected datavalue {} in response {}",mapping.getReadDataOutName(),soapToString(sm));
-						}
-					}
-				} catch (SOAPException e) {
-					logger.error("Error parsing SOAP response from FritzBox: {}", e.getMessage());
-				}
-				
-				return value;
-			}
-		});
-		_alItemMap.add(imMissedCalls);
-	
-	}
-	
-
-	/***
-	 * sets up a raw http(s) connection to Fbox and gets xml response
-	 * as XML Document, ready for parsing
-	 * @return
-	 */
-	public Document getFboxXmlResponse(String url){
-		Document tr064response = null;
-		HttpGet httpGet = new HttpGet(url);
-		try {
-			CloseableHttpResponse resp = _httpClient.execute(httpGet, _httpClientContext);
-			int responseCode = resp.getStatusLine().getStatusCode();
-			if(responseCode == 200){
-				HttpEntity entity = resp.getEntity();
-				DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-				DocumentBuilder db = dbf.newDocumentBuilder();
-				tr064response = db.parse(entity.getContent());
-				EntityUtils.consume(entity);
-			}
-			else{
-				logger.error("Failed to receive valid response from httpGet");
-			}
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-			logger.error("Failed to receive valid response from httpGet");
-		}
-		return tr064response;
-	}
-}
 
+    }
+
+    /***
+     * sets all required namespaces and prepares the SOAP message to send
+     * creates skeleton + body data
+     *
+     * @param bodyData is attached to skeleton to form entire SOAP message
+     * @return ready to send SOAP message
+     */
+    private SOAPMessage constructTr064Msg(SOAPBodyElement bodyData) {
+        SOAPMessage soapMsg = null;
+
+        try {
+            MessageFactory msgFac;
+            msgFac = MessageFactory.newInstance();
+            soapMsg = msgFac.createMessage();
+            soapMsg.setProperty(SOAPMessage.WRITE_XML_DECLARATION, "true");
+            soapMsg.setProperty(SOAPMessage.CHARACTER_SET_ENCODING, "UTF-8");
+            SOAPPart part = soapMsg.getSOAPPart();
+
+            // valid for entire SOAP msg
+            String namespace = "s";
+
+            // create suitable fbox envelope
+            SOAPEnvelope envelope = part.getEnvelope();
+            envelope.setPrefix(namespace);
+            envelope.removeNamespaceDeclaration("SOAP-ENV"); // delete standard namespace which was already set
+            envelope.addNamespaceDeclaration(namespace, "http://schemas.xmlsoap.org/soap/envelope/");
+            Name nEncoding = envelope.createName("encodingStyle", namespace,
+                    "http://schemas.xmlsoap.org/soap/encoding/");
+            envelope.addAttribute(nEncoding, "http://schemas.xmlsoap.org/soap/encoding/");
+
+            // create empty header
+            SOAPHeader header = envelope.getHeader();
+            header.setPrefix(namespace);
+
+            // create body with command based on parameter
+            SOAPBody body = envelope.getBody();
+            body.setPrefix(namespace);
+            body.addChildElement(bodyData); // bodyData already prepared. Needs only be added
+
+        } catch (Exception e) {
+            logger.error("Error creating SOAP message for fbox request with data {}", bodyData);
+            e.printStackTrace();
+        }
+
+        return soapMsg;
+
+    }
+
+    /***
+     * looks for the proper item mapping for the item command given from item file
+     *
+     * @param itemCommand String item command
+     * @return found itemMap object if found, or null
+     */
+    private ItemMap determineItemMappingByItemCommand(String itemCommand) {
+        ItemMap foundMapping = null;
+
+        // iterate over all itemMappings to find proper mapping for requested item command
+        Iterator<ItemMap> itMap = _alItemMap.iterator();
+        while (itMap.hasNext()) {
+            ItemMap currentMap = itMap.next();
+            if (itemCommand.equals(currentMap.getItemCommand())) {
+                foundMapping = currentMap;
+                break;
+            }
+        }
+        if (foundMapping == null) {
+            logger.error("No mapping found for item command {}", itemCommand);
+        }
+        return foundMapping;
+    }
+
+    /***
+     * determines Service including which URL to connect to for value request
+     *
+     * @param the itemmap for which the service is searched
+     * @return the found service or null
+     */
+    private Tr064Service determineServiceByItemMapping(ItemMap mapping) {
+        Tr064Service foundService = null;
+
+        // search which service matches the item mapping
+        Iterator<Tr064Service> it = _alServices.iterator();
+        while (it.hasNext()) {
+            Tr064Service currentService = it.next();
+            if (currentService.getServiceId().contains(mapping.getServiceId())) {
+                foundService = currentService;
+                break;
+            }
+        }
+        if (foundService == null) {
+            logger.warn("No tr064 service found for service id {}", mapping.getServiceId());
+        }
+        return foundService;
+    }
+
+    /***
+     * Connects to fbox service xml to get a list of all services
+     * which are offered by TR064. Saves it into local list
+     */
+    private void readAllServices() {
+        Document xml = getFboxXmlResponse(_url + "/" + TR064DOWNLOADFILE);
+        if (xml == null) {
+            logger.error("Could not read xml response services");
+            return;
+        }
+        NodeList nlServices = xml.getElementsByTagName("service"); // get all service nodes
+        Node currentNode = null;
+        XPath xPath = XPathFactory.newInstance().newXPath();
+        for (int i = 0; i < nlServices.getLength(); i++) { // iterate over all services fbox offered us
+            currentNode = nlServices.item(i);
+            Tr064Service trS = new Tr064Service();
+            try {
+                trS.setControlUrl((String) xPath.evaluate("controlURL", currentNode, XPathConstants.STRING));
+                trS.setEventSubUrl((String) xPath.evaluate("eventSubURL", currentNode, XPathConstants.STRING));
+                trS.setScpdurl((String) xPath.evaluate("SCPDURL", currentNode, XPathConstants.STRING));
+                trS.setServiceId((String) xPath.evaluate("serviceId", currentNode, XPathConstants.STRING));
+                trS.setServiceType((String) xPath.evaluate("serviceType", currentNode, XPathConstants.STRING));
+            } catch (XPathExpressionException e) {
+                logger.debug("Could not parse service {}", currentNode.getTextContent());
+                e.printStackTrace();
+            }
+            _alServices.add(trS);
+        }
+    }
+
+    /***
+     * populates local static mapping table
+     * todo: refactore to read from config file later?
+     * sets the parser based on the itemcommand -> soap value parser "svp" anonymous method
+     * for each mapping
+     *
+     */
+    private void generateItemMappings() {
+        // services available from fbox. Needed for e.g. wifi select 5GHz/Guest Wifi
+        if (_alServices.isEmpty()) { // no services are known yet?
+            readAllServices();
+        }
+
+        // Mac Online Checker
+        ItemMap imMacOnline = new ItemMap("maconline", "GetSpecificHostEntry", "LanDeviceHosts-com:serviceId:Hosts1",
+                "NewMACAddress", "NewActive");
+        imMacOnline.setSoapValueParser(new SoapValueParser() {
+
+            @Override
+            public String parseValueFromSoapMessage(SOAPMessage sm, ItemMap mapping, String request) {
+                logger.debug("Parsing FritzBox response for maconline");
+                String value = "";
+                // maconline: if fault is present could also indicate not a fault but MAC is not known
+                try {
+                    SOAPBody sbResponse = sm.getSOAPBody();
+                    if (sbResponse.hasFault()) {
+                        SOAPFault sf = sbResponse.getFault();
+                        Detail detail = sf.getDetail();
+                        if (detail != null) {
+                            NodeList nlErrorCode = detail.getElementsByTagName("errorCode");
+                            Node nErrorCode = nlErrorCode.item(0);
+                            String errorCode = nErrorCode.getTextContent();
+                            if (errorCode.equals("714")) {
+                                value = "MAC not known to FritzBox!";
+                                logger.debug(value);
+                            } else {
+                                logger.error("Error received from FritzBox: {}. SOAP request was: {}", soapToString(sm),
+                                        request);
+                                value = "ERROR";
+                            }
+                        }
+                    } else {
+                        SOAPBody sb = sm.getSOAPBody();
+                        // parameter name to extract is taken from mapping
+                        NodeList nlActive = sb.getElementsByTagName(mapping.getReadDataOutName());
+                        if (nlActive.getLength() > 0) {
+                            Node nActive = nlActive.item(0);
+                            value = nActive.getTextContent();
+                            logger.debug("parsed as {}", value);
+                        }
+                    }
+                } catch (SOAPException e) {
+                    logger.error("Error parsing SOAP response from FritzBox: {}", e.getMessage());
+                }
+                return value;
+            }
+        });
+        _alItemMap.add(imMacOnline);
+
+        _alItemMap.add(new ItemMap("modelName", "GetInfo", "DeviceInfo-com:serviceId:DeviceInfo1", "", "NewModelName"));
+        _alItemMap.add(new ItemMap("wanip", "GetExternalIPAddress",
+                "urn:WANPPPConnection-com:serviceId:WANPPPConnection1", "", "NewExternalIPAddress"));
+
+        // Wifi 2,4GHz
+        ItemMap imWifi24Switch = new ItemMap("wifi24Switch", "GetInfo",
+                "urn:WLANConfiguration-com:serviceId:WLANConfiguration1", "", "NewEnable");
+        imWifi24Switch.setWriteServiceCommand("SetEnable");
+        imWifi24Switch.setWriteDataInName("NewEnable");
+        _alItemMap.add(imWifi24Switch);
+
+        // wifi 5GHz
+        ItemMap imWifi50Switch = new ItemMap("wifi50Switch", "GetInfo",
+                "urn:WLANConfiguration-com:serviceId:WLANConfiguration2", "", "NewEnable");
+        imWifi50Switch.setWriteServiceCommand("SetEnable");
+        imWifi50Switch.setWriteDataInName("NewEnable");
+
+        // guest wifi
+        ItemMap imWifiGuestSwitch = new ItemMap("wifiGuestSwitch", "GetInfo",
+                "urn:WLANConfiguration-com:serviceId:WLANConfiguration3", "", "NewEnable");
+        imWifiGuestSwitch.setWriteServiceCommand("SetEnable");
+        imWifiGuestSwitch.setWriteDataInName("NewEnable");
+
+        // check if 5GHz wifi and/or guest wifi is available.
+        Tr064Service svc5GHzWifi = determineServiceByItemMapping(imWifi50Switch);
+        Tr064Service svcGuestWifi = determineServiceByItemMapping(imWifiGuestSwitch);
+
+        if (svc5GHzWifi != null && svcGuestWifi != null) { // WLANConfiguration3+2 present -> guest wifi + 5Ghz present
+            // prepared properly, only needs to be added
+            _alItemMap.add(imWifi50Switch);
+            _alItemMap.add(imWifiGuestSwitch);
+            logger.debug("Found 2,4 Ghz, 5Ghz and Guest Wifi");
+        }
+
+        if (svc5GHzWifi != null && svcGuestWifi == null) { // WLANConfiguration3 not present but 2 -> no 5Ghz Wifi
+                                                           // available but Guest Wifi
+            // remap itemMap for Guest Wifi from 3 to 2
+            imWifiGuestSwitch.setServiceId("urn:WLANConfiguration-com:serviceId:WLANConfiguration2");
+            _alItemMap.add(imWifiGuestSwitch);// only add guest wifi, no 5Ghz
+            logger.debug("Found 2,4 Ghz and Guest Wifi");
+        }
+        if (svc5GHzWifi == null && svcGuestWifi == null) { // WLANConfiguration3+2 not present > no 5Ghz Wifi or Guest
+                                                           // Wifi
+            logger.debug("Found 2,4 Ghz Wifi");
+        }
+
+        // Phonebook Download
+        // itemcommand is dummy: not a real item
+        ItemMap imPhonebook = new ItemMap("phonebook", "GetPhonebook",
+                "urn:X_AVM-DE_OnTel-com:serviceId:X_AVM-DE_OnTel1", "NewPhonebookID", "NewPhonebookURL");
+        _alItemMap.add(imPhonebook);
+
+        // TAM (telephone answering machine) Switch
+        ItemMap imTamSwitch = new ItemMap("tamSwitch", "GetInfo", "urn:X_AVM-DE_TAM-com:serviceId:X_AVM-DE_TAM1",
+                "NewIndex", "NewEnable");
+        imTamSwitch.setWriteServiceCommand("SetEnable");
+        imTamSwitch.setWriteDataInName("NewEnable");
+        imTamSwitch.setWriteDataInNameAdditional("NewIndex"); // additional Parameter to set
+        _alItemMap.add(imTamSwitch);
+
+        // New Messages per TAM ID
+        // two requests needed: First gets URL to download tam info from, 2nd contains info of messages
+        ItemMap imTamNewMessages = new ItemMap("tamNewMessages", "GetMessageList",
+                "urn:X_AVM-DE_TAM-com:serviceId:X_AVM-DE_TAM1", "NewIndex", "NewURL");
+        // SVP fetches desired infos
+        imTamNewMessages.setSoapValueParser(new SoapValueParser() {
+
+            @Override
+            public String parseValueFromSoapMessage(SOAPMessage sm, ItemMap mapping, String request) {
+                String value = "";
+                logger.debug("Parsing FritzBox response for TAM messages: {}", soapToString(sm));
+                try {
+                    SOAPBody sbResponse = sm.getSOAPBody();
+                    if (sbResponse.hasFault()) {
+                        SOAPFault sf = sbResponse.getFault();
+                        Detail detail = sf.getDetail();
+                        if (detail != null) {
+                            logger.error("Error received from fbox while parsing TAM message info: {}. ",
+                                    soapToString(sm));
+                            value = "ERROR";
+                        }
+                    } else {
+                        NodeList nlDataOutNodes = sm.getSOAPPart().getElementsByTagName(mapping.getReadDataOutName()); // URL
+                        if (nlDataOutNodes != null && nlDataOutNodes.getLength() > 0) {
+                            // extract URL from soap response
+                            String url = nlDataOutNodes.item(0).getTextContent();
+                            Document xmlTamInfo = getFboxXmlResponse(url);
+                            logger.debug("Parsing xml message TAM info {}", Helper.documentToString(xmlTamInfo));
+                            NodeList nlNews = xmlTamInfo.getElementsByTagName("New"); // get all Nodes containing "new",
+                                                                                      // indicating message was not
+                                                                                      // listened to
+
+                            // When <new> contains 1 -> message is new, when 0, message not new -> Counting 1s
+                            int newMessages = 0;
+                            for (int i = 0; i < nlNews.getLength(); i++) {
+                                if (nlNews.item(i).getTextContent().equals("1")) {
+                                    newMessages++;
+                                }
+                            }
+                            value = Integer.toString(newMessages);
+                            logger.debug("Parsed new messages as: {}", value);
+                        } else {
+                            logger.error(
+                                    "FritzBox returned unexpected response. Could not find expected datavalue {} in response {}",
+                                    mapping.getReadDataOutName(), soapToString(sm));
+                        }
+                    }
+                } catch (SOAPException e) {
+                    logger.error("Error parsing SOAP response from FritzBox");
+                    e.printStackTrace();
+                }
+
+                return value;
+            }
+        });
+        _alItemMap.add(imTamNewMessages);
+
+        // Missed calls
+        // two requests: 1st fetches URL to download call list, 2nd fetches xml call list
+        ItemMap imMissedCalls = new ItemMap("missedCallsInDays", "GetCallList",
+                "urn:X_AVM-DE_OnTel-com:serviceId:X_AVM-DE_OnTel1", "NewDays", "NewCallListURL");
+        // svp for downloading call list from received URL
+        imMissedCalls.setSoapValueParser(new SoapValueParser() {
+
+            @Override
+            public String parseValueFromSoapMessage(SOAPMessage sm, ItemMap mapping, String request) {
+                String value = "";
+                logger.debug("Parsing FritzBox response for call list: {}", soapToString(sm));
+
+                // extract how many days of call list should be examined for missed calls
+                String days = "3"; // default
+                String[] itemConfig = request.split(":");
+                if (itemConfig.length == 2) {
+                    days = itemConfig[1]; // set the days as defined in item config. Otherwise default value of 3 is
+                                          // used
+                }
+
+                try {
+                    SOAPBody sbResponse = sm.getSOAPBody();
+                    if (sbResponse.hasFault()) {
+                        SOAPFault sf = sbResponse.getFault();
+                        Detail detail = sf.getDetail();
+                        if (detail != null) {
+                            logger.error("Error received from FritzBox while parsing call list: {}", soapToString(sm));
+                            value = "ERROR";
+                        }
+                    } else {
+                        NodeList nlDataOutNodes = sm.getSOAPPart().getElementsByTagName(mapping.getReadDataOutName()); // URL
+                        if (nlDataOutNodes != null && nlDataOutNodes.getLength() > 0) {
+                            // extract URL from soap response
+                            String url = nlDataOutNodes.item(0).getTextContent();
+                            // only get missed calls of the last x days
+                            url = url + "&days=" + days;
+                            logger.debug("Downloading call list using url {}", url);
+                            Document xmlTamInfo = getFboxXmlResponse(url); // download call list
+                            logger.debug("Parsing xml message call list info {}", Helper.documentToString(xmlTamInfo));
+                            NodeList nlTypes = xmlTamInfo.getElementsByTagName("Type"); // get all Nodes containing
+                                                                                        // "Type". Type 2 => missed
+
+                            // When <type> contains 2 -> call was missed -> Counting only 2 entries
+                            int missedCalls = 0;
+                            for (int i = 0; i < nlTypes.getLength(); i++) {
+                                if (nlTypes.item(i).getTextContent().equals("2")) {
+                                    missedCalls++;
+                                }
+                            }
+                            value = Integer.toString(missedCalls);
+                            logger.debug("Parsed new messages as: {}", value);
+                        } else {
+                            logger.error(
+                                    "FritzBox returned unexpected response. Could not find expected datavalue {} in response {}",
+                                    mapping.getReadDataOutName(), soapToString(sm));
+                        }
+                    }
+                } catch (SOAPException e) {
+                    logger.error("Error parsing SOAP response from FritzBox: {}", e.getMessage());
+                }
+
+                return value;
+            }
+        });
+        _alItemMap.add(imMissedCalls);
+
+    }
+
+    /***
+     * sets up a raw http(s) connection to Fbox and gets xml response
+     * as XML Document, ready for parsing
+     *
+     * @return
+     */
+    public Document getFboxXmlResponse(String url) {
+        Document tr064response = null;
+        HttpGet httpGet = new HttpGet(url);
+        try {
+            CloseableHttpResponse resp = _httpClient.execute(httpGet, _httpClientContext);
+            int responseCode = resp.getStatusLine().getStatusCode();
+            if (responseCode == 200) {
+                HttpEntity entity = resp.getEntity();
+                DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+                DocumentBuilder db = dbf.newDocumentBuilder();
+                tr064response = db.parse(entity.getContent());
+                EntityUtils.consume(entity);
+            } else {
+                logger.error("Failed to receive valid response from httpGet");
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("Failed to receive valid response from httpGet");
+        }
+        return tr064response;
+    }
+}
diff --git a/src/main/java/org/openhab/binding/fritzboxtr064/internal/Tr064Service.java b/src/main/java/org/openhab/binding/fritzboxtr064/internal/Tr064Service.java
index aafd05b..853b838 100644
--- a/src/main/java/org/openhab/binding/fritzboxtr064/internal/Tr064Service.java
+++ b/src/main/java/org/openhab/binding/fritzboxtr064/internal/Tr064Service.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2010-2016, openHAB.org and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
 
 /**
  * Copyright (c) 2010-2015, openHAB.org and others.
@@ -9,79 +17,70 @@
  */
 package org.openhab.binding.fritzboxtr064.internal;
 
-
 /***
  * Each TR064 service object represents a service offered by fritzbox
  * can be read from tr64desc.xml on fbox
+ * 
  * @author gitbock
  * @since 1.8.0
  */
 public class Tr064Service {
-	
-	//Service Parameters
-	private String _serviceType;
-	private String _serviceId;
-	private String _controlUrl;
-	private String _eventSubUrl;
-	private String _scpdurl; 
-	
-	public Tr064Service() {
-		
-	}
-
-	public String getServiceType() {
-		return _serviceType;
-	}
-
-	public void setServiceType(String _serviceType) {
-		this._serviceType = _serviceType;
-	}
-
-	public String getServiceId() {
-		return _serviceId;
-	}
-
-	public void setServiceId(String _serviceId) {
-		this._serviceId = _serviceId;
-	}
-
-	public String getControlUrl() {
-		return _controlUrl;
-	}
-
-	public void setControlUrl(String _controlUrl) {
-		this._controlUrl = _controlUrl;
-	}
-
-	public String getEventSubUrl() {
-		return _eventSubUrl;
-	}
-
-	public void setEventSubUrl(String _eventSubUrl) {
-		this._eventSubUrl = _eventSubUrl;
-	}
-
-	public String getScpdurl() {
-		return _scpdurl;
-	}
-
-	public void setScpdurl(String _scpdurl) {
-		this._scpdurl = _scpdurl;
-	}
-
-	
-
-	@Override
-	public String toString() {
-		return "Tr064Service [_serviceType=" + _serviceType + ", _serviceId="
-				+ _serviceId + ", _controlUrl=" + _controlUrl
-				+ ", _eventSubUrl=" + _eventSubUrl + ", _scpdurl=" + _scpdurl+"]";
-	}
-
-	
-	
-	
-	
-	
+
+    // Service Parameters
+    private String _serviceType;
+    private String _serviceId;
+    private String _controlUrl;
+    private String _eventSubUrl;
+    private String _scpdurl;
+
+    public Tr064Service() {
+
+    }
+
+    public String getServiceType() {
+        return _serviceType;
+    }
+
+    public void setServiceType(String _serviceType) {
+        this._serviceType = _serviceType;
+    }
+
+    public String getServiceId() {
+        return _serviceId;
+    }
+
+    public void setServiceId(String _serviceId) {
+        this._serviceId = _serviceId;
+    }
+
+    public String getControlUrl() {
+        return _controlUrl;
+    }
+
+    public void setControlUrl(String _controlUrl) {
+        this._controlUrl = _controlUrl;
+    }
+
+    public String getEventSubUrl() {
+        return _eventSubUrl;
+    }
+
+    public void setEventSubUrl(String _eventSubUrl) {
+        this._eventSubUrl = _eventSubUrl;
+    }
+
+    public String getScpdurl() {
+        return _scpdurl;
+    }
+
+    public void setScpdurl(String _scpdurl) {
+        this._scpdurl = _scpdurl;
+    }
+
+    @Override
+    public String toString() {
+        return "Tr064Service [_serviceType=" + _serviceType + ", _serviceId=" + _serviceId + ", _controlUrl="
+                + _controlUrl + ", _eventSubUrl=" + _eventSubUrl + ", _scpdurl=" + _scpdurl + "]";
+    }
 
 }
diff --git a/target/MANIFEST.MF b/target/MANIFEST.MF
new file mode 100644
index 0000000..132fe31
--- /dev/null
+++ b/target/MANIFEST.MF
@@ -0,0 +1,28 @@
+Manifest-Version: 1.0
+Bundle-Description: This is the FritzboxTr064 binding of the open Home
+  Automation Bus (openHAB)
+Bundle-License: http://www.eclipse.org/legal/epl-v10.html
+Bundle-SymbolicName: org.openhab.binding.fritzboxtr064
+Bundle-ManifestVersion: 2
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-Vendor: openHAB.org
+Bundle-DocURL: http://www.openhab.org
+Import-Package: javax.net.ssl,org.apache.commons.httpclient.params;ver
+ sion="3.1.0",org.apache.commons.lang,org.openhab.core.binding,org.ope
+ nhab.core.events,org.openhab.core.items,org.openhab.core.library.item
+ s,org.openhab.core.library.types,org.openhab.core.types,org.openhab.l
+ ibrary.tel.types,org.openhab.model.item.binding,org.osgi.framework,or
+ g.osgi.service.component,org.osgi.service.event,org.quartz,org.quartz
+ .impl,org.slf4j
+Service-Component: OSGI-INF/binding.xml, OSGI-INF/genericbindingprovid
+ er.xml
+Export-Package: org.openhab.binding.fritzboxtr064
+Bundle-Name: openHAB FritzboxTr064 Binding
+Bundle-Version: 1.9.0.201604211943
+Bundle-ClassPath: lib/httpclient-4.4.1.jar,lib/httpcore-4.4.1.jar,lib/
+ commons-codec-1.9.jar,lib/commons-logging-1.2.jar,lib/fluent-hc-4.4.1
+ .jar,lib/httpclient-cache-4.4.1.jar,lib/httpclient-win-4.4.1.jar,lib/
+ httpmime-4.4.1.jar,lib/jna-4.1.0.jar,lib/jna-platform-4.1.0.jar,.
+Private-Package: org.openhab.binding.fritzboxtr064.internal
+Ignore-Package: org.openhab.binding.fritzboxtr064.internal
+
diff --git a/target/classes/org/openhab/binding/fritzboxtr064/FritzboxTr064BindingProvider.class b/target/classes/org/openhab/binding/fritzboxtr064/FritzboxTr064BindingProvider.class
index 797f517..a7022aa 100644
Binary files a/target/classes/org/openhab/binding/fritzboxtr064/FritzboxTr064BindingProvider.class and b/target/classes/org/openhab/binding/fritzboxtr064/FritzboxTr064BindingProvider.class differ
diff --git a/target/classes/org/openhab/binding/fritzboxtr064/internal/FritzboxTr064Binding.class b/target/classes/org/openhab/binding/fritzboxtr064/internal/FritzboxTr064Binding.class
index c74279f..039d0ef 100644
Binary files a/target/classes/org/openhab/binding/fritzboxtr064/internal/FritzboxTr064Binding.class and b/target/classes/org/openhab/binding/fritzboxtr064/internal/FritzboxTr064Binding.class differ
diff --git a/target/classes/org/openhab/binding/fritzboxtr064/internal/FritzboxTr064GenericBindingProvider$FritzboxTr064BindingConfig.class b/target/classes/org/openhab/binding/fritzboxtr064/internal/FritzboxTr064GenericBindingProvider$FritzboxTr064BindingConfig.class
index 85e4b8b..46f10d5 100644
Binary files a/target/classes/org/openhab/binding/fritzboxtr064/internal/FritzboxTr064GenericBindingProvider$FritzboxTr064BindingConfig.class and b/target/classes/org/openhab/binding/fritzboxtr064/internal/FritzboxTr064GenericBindingProvider$FritzboxTr064BindingConfig.class differ
diff --git a/target/classes/org/openhab/binding/fritzboxtr064/internal/FritzboxTr064GenericBindingProvider.class b/target/classes/org/openhab/binding/fritzboxtr064/internal/FritzboxTr064GenericBindingProvider.class
index 90aa50a..53884a8 100644
Binary files a/target/classes/org/openhab/binding/fritzboxtr064/internal/FritzboxTr064GenericBindingProvider.class and b/target/classes/org/openhab/binding/fritzboxtr064/internal/FritzboxTr064GenericBindingProvider.class differ
diff --git a/target/classes/org/openhab/binding/fritzboxtr064/internal/ItemMap.class b/target/classes/org/openhab/binding/fritzboxtr064/internal/ItemMap.class
index d3f378d..b22c610 100644
Binary files a/target/classes/org/openhab/binding/fritzboxtr064/internal/ItemMap.class and b/target/classes/org/openhab/binding/fritzboxtr064/internal/ItemMap.class differ
diff --git a/target/classes/org/openhab/binding/fritzboxtr064/internal/SoapValueParser.class b/target/classes/org/openhab/binding/fritzboxtr064/internal/SoapValueParser.class
index 7c295b2..b4df01b 100644
Binary files a/target/classes/org/openhab/binding/fritzboxtr064/internal/SoapValueParser.class and b/target/classes/org/openhab/binding/fritzboxtr064/internal/SoapValueParser.class differ
diff --git a/target/classes/org/openhab/binding/fritzboxtr064/internal/Tr064Comm$1.class b/target/classes/org/openhab/binding/fritzboxtr064/internal/Tr064Comm$1.class
index ddbb99e..0226349 100644
Binary files a/target/classes/org/openhab/binding/fritzboxtr064/internal/Tr064Comm$1.class and b/target/classes/org/openhab/binding/fritzboxtr064/internal/Tr064Comm$1.class differ
diff --git a/target/classes/org/openhab/binding/fritzboxtr064/internal/Tr064Comm.class b/target/classes/org/openhab/binding/fritzboxtr064/internal/Tr064Comm.class
index 3cb3aa6..04c2280 100644
Binary files a/target/classes/org/openhab/binding/fritzboxtr064/internal/Tr064Comm.class and b/target/classes/org/openhab/binding/fritzboxtr064/internal/Tr064Comm.class differ
diff --git a/target/classes/org/openhab/binding/fritzboxtr064/internal/Tr064Service.class b/target/classes/org/openhab/binding/fritzboxtr064/internal/Tr064Service.class
index 1539bdd..7966699 100644
Binary files a/target/classes/org/openhab/binding/fritzboxtr064/internal/Tr064Service.class and b/target/classes/org/openhab/binding/fritzboxtr064/internal/Tr064Service.class differ
diff --git a/target/local-artifacts.properties b/target/local-artifacts.properties
new file mode 100644
index 0000000..e74dca1
--- /dev/null
+++ b/target/local-artifacts.properties
@@ -0,0 +1,4 @@
+#Thu Apr 21 21:43:44 CEST 2016
+artifact.attached.p2metadata=/home/bocbor/openhab2-master/git/openhab/bundles/binding/org.openhab.binding.fritzboxtr064/target/p2content.xml
+artifact.main=/home/bocbor/openhab2-master/git/openhab/bundles/binding/org.openhab.binding.fritzboxtr064/target/org.openhab.binding.fritzboxtr064-1.9.0-SNAPSHOT.jar
+artifact.attached.p2artifacts=/home/bocbor/openhab2-master/git/openhab/bundles/binding/org.openhab.binding.fritzboxtr064/target/p2artifacts.xml
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..2d49a78
--- /dev/null
+++ b/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Thu Apr 21 21:43:43 CEST 2016
+version=1.9.0-SNAPSHOT
+groupId=org.openhab.binding
+artifactId=org.openhab.binding.fritzboxtr064
diff --git a/target/org.openhab.binding.fritzboxtr064-1.9.0-SNAPSHOT.jar b/target/org.openhab.binding.fritzboxtr064-1.9.0-SNAPSHOT.jar
new file mode 100644
index 0000000..a971113
Binary files /dev/null and b/target/org.openhab.binding.fritzboxtr064-1.9.0-SNAPSHOT.jar differ
diff --git a/target/p2artifacts.xml b/target/p2artifacts.xml
new file mode 100644
index 0000000..d784047
--- /dev/null
+++ b/target/p2artifacts.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?artifactRepository version='1.1.0'?>
+<artifacts size='1'>
+  <artifact classifier='osgi.bundle' id='org.openhab.binding.fritzboxtr064' version='1.9.0.201604211943'>
+    <properties size='5'>
+      <property name='artifact.size' value='6735710'/>
+      <property name='download.size' value='6735710'/>
+      <property name='maven-groupId' value='org.openhab.binding'/>
+      <property name='maven-artifactId' value='org.openhab.binding.fritzboxtr064'/>
+      <property name='maven-version' value='1.9.0-SNAPSHOT'/>
+    </properties>
+  </artifact>
+</artifacts>
diff --git a/target/p2content.xml b/target/p2content.xml
new file mode 100644
index 0000000..7f64acf
--- /dev/null
+++ b/target/p2content.xml
@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<units size='1'>
+  <unit id='org.openhab.binding.fritzboxtr064' version='1.9.0.201604211943' singleton='false'>
+    <update id='org.openhab.binding.fritzboxtr064' range='[0.0.0,1.9.0.201604211943)' severity='0'/>
+    <properties size='7'>
+      <property name='org.eclipse.equinox.p2.name' value='openHAB FritzboxTr064 Binding'/>
+      <property name='org.eclipse.equinox.p2.description' value='This is the FritzboxTr064 binding of the open Home Automation Bus (openHAB)'/>
+      <property name='org.eclipse.equinox.p2.provider' value='openHAB.org'/>
+      <property name='org.eclipse.equinox.p2.doc.url' value='http://www.openhab.org'/>
+      <property name='maven-groupId' value='org.openhab.binding'/>
+      <property name='maven-artifactId' value='org.openhab.binding.fritzboxtr064'/>
+      <property name='maven-version' value='1.9.0-SNAPSHOT'/>
+    </properties>
+    <provides size='4'>
+      <provided namespace='org.eclipse.equinox.p2.iu' name='org.openhab.binding.fritzboxtr064' version='1.9.0.201604211943'/>
+      <provided namespace='osgi.bundle' name='org.openhab.binding.fritzboxtr064' version='1.9.0.201604211943'/>
+      <provided namespace='java.package' name='org.openhab.binding.fritzboxtr064' version='0.0.0'/>
+      <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+    </provides>
+    <requires size='17'>
+      <required namespace='java.package' name='javax.net.ssl' range='0.0.0'/>
+      <required namespace='java.package' name='org.apache.commons.httpclient.params' range='3.1.0'/>
+      <required namespace='java.package' name='org.apache.commons.lang' range='0.0.0'/>
+      <required namespace='java.package' name='org.openhab.core.binding' range='0.0.0'/>
+      <required namespace='java.package' name='org.openhab.core.events' range='0.0.0'/>
+      <required namespace='java.package' name='org.openhab.core.items' range='0.0.0'/>
+      <required namespace='java.package' name='org.openhab.core.library.items' range='0.0.0'/>
+      <required namespace='java.package' name='org.openhab.core.library.types' range='0.0.0'/>
+      <required namespace='java.package' name='org.openhab.core.types' range='0.0.0'/>
+      <required namespace='java.package' name='org.openhab.library.tel.types' range='0.0.0'/>
+      <required namespace='java.package' name='org.openhab.model.item.binding' range='0.0.0'/>
+      <required namespace='java.package' name='org.osgi.framework' range='0.0.0'/>
+      <required namespace='java.package' name='org.osgi.service.component' range='0.0.0'/>
+      <required namespace='java.package' name='org.osgi.service.event' range='0.0.0'/>
+      <required namespace='java.package' name='org.quartz' range='0.0.0'/>
+      <required namespace='java.package' name='org.quartz.impl' range='0.0.0'/>
+      <required namespace='java.package' name='org.slf4j' range='0.0.0'/>
+    </requires>
+    <artifacts size='1'>
+      <artifact classifier='osgi.bundle' id='org.openhab.binding.fritzboxtr064' version='1.9.0.201604211943'/>
+    </artifacts>
+    <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+    <touchpointData size='1'>
+      <instructions size='1'>
+        <instruction key='manifest'>
+          Bundle-SymbolicName: org.openhab.binding.fritzboxtr064&#xA;Bundle-Version: 1.9.0.201604211943&#xA;
+        </instruction>
+      </instructions>
+    </touchpointData>
+  </unit>
+</units>