[TASK] Simplify command
[TASK] Add CommandHandler annotation support