Added ability to add more command classes and added EventHandler annotation