Change Indexer methods to static