Further extended javadocs