Refactored Core