Changed relationships to reflect foreign keys