Add handling of nil values for collection attributes