got rid of Application subclass, and modified UML