Additional javadocs