More Javadoc comments