Updated connection/disconnection and init