Add the ability to specify scope