Added javadocs