Refactored to collector