Updated foreign keys relationships