Modified main architecture and class diagram.