Add listing scopes

I applied suggested changes. Thanks!