Added CommandHandler.