Changed CommandListener to CommandHandler