Remove data-indexer and reflection dependency