updated models to include relations