Continued work on IndexProvider (dnc)