Added javadocuments