Feature/connectionmonitor