Connect/disconnect are now public