Change value_name to a property