Updated Javadoc to the latest