UML and javadoc added