Changed class for connection, separate debug tool