Refactored core systems