More javadoc comments