Maybe consider using PropertiesAttributeDefinition#unwrap(context,model)