Removed hard-coded foreign key fields