Polymorphed the core for more visibility and better expansion possibilities.