Added Javadoc comments