CommandHandler
CommandHAndler fixes