Added javadocs comments