renames resolver to provider
adds includes with comprehensions