Updated Javadoc comments