integrated default scopes and added additional refactoring