Refactored part of the core components.