Try to improve javadoc generation