adding more core components