Extended the data entity model and tables