Add indexed-relations support