Updated javadoc comments