Updated class diagrams and made base classes consistent