Extended javadocs