Added CommandHandler class