Added foreign keys for named associations