Added core components