added support for connection validation and drop functionality