Better collection handling for Entities, Overlays, and Sensors