Refactored CoreElement