Updated indexer scripts