Introduced scope class to change architecture to support scopes