Refactoring classes and populate.