Merge "Use collector specific helper classes"