--Modification to relationp fields for mapping