Updated javadoc accordingly