Adding part-key lookups