Refactored index import.