correct some mapping with new Contact structure