Accepts scopes with parameters
Merge branch 'scopes-with-parameters'