Redo Model + DB => set relationship for EF