Improvement/3.0/javadoc