Removed dependency on LimitedScope