Support new scrubber export mechanism