Updated class diagram, added attributes