Added commandHandler class