Refactor and add more dummy data population.