Updated models | added missing foreign key relations