Add first code that allow foreign key fill of fields