adds empty collections support