Redefined the design of the core components