Added support to manage connection states
Fixed conflicts