Refactoring changes to core setup.