Add support for non-* indices