Remade the CommandHandler