Some fix, gonna working on CommandHandler fix.