Check in changes to MAIndexer