Refactor index methods