Updated Javadoc for version 2.0