update model and Javadoc comment for packages