Changed client and handleCommand