Updating to work with all the downstream scenarios identified