Loop separately for addSingleScaffold and makeSingleFacet