Updated class diagram, added Activity and State