Enhancements to sweeper to better support Gobblin data