Support for multiple indexes, and one-to-one indexes