Updated class diagrams and javadoc.