Update scopes and default_scope that they use lambdas