Updated mappings to AD properties