updated database model
changed structure