Refactored Scope with enum