Refactored collectors