Adjust to changes needed to more easily support projects via the new