Better class diagram and some more state diagrams