Added and simplified indexing.