Updated UML class diagrams and javadoc