Use field definition map in RangeAttributeDefinition