Changed class diagram and activity - arrows structure