Refactored data population