Added CommandHandler to clean up onCommand(). Added menuservice.list