In Progress

Review and check database model