Scope Refactor

Enhanced Scope refactor with spec