Refactoring out corecomponents population