Updated data model and removed some fkeys from schema