Add range queries and key lookups for index