Refactored core services