Added foreign keys on models