Updated CommandHandler.