user mapping and validation changes