Moved Context functionality into URL and Resolver.