Update for new default scope format