Refactoring: Moved from the original mod to core mod.