update data model based on entity diagram
javadoc updated.