Refactored populator class