Added support for compound indices.