Data types for attributes now match the mappings