Added option to add a scope to the RP, if no scope uses default scope