updated data model
data structure for postgresql