Refactoring: Moved to core mod.