Added model classes for javadoc generation