Updating model builder to build proper syntax for foreign key