Corrected model relationships and id's