More javadocs