Include more information in the javadoc