Expanded on ContextsMap and DirectoryContextIndex