Change initial connection and command handling