Added indexer so we don't depend on s3 listing