Added javadoc comments