Improved classes and Update Javadoc