Updated Collector to Match Spec