Rewritten index/reindex methods