Modified indexing import