Weave broader scope into core structure