Changed State component to conform to UML