Issue 76 : Add fix for mappings to properties with same name