Refactored RequestScopeFeature