Update CommandHandler