Issue #4 - Create a populator - Refactoring...