Continuing to refactor collector