Add core components