Changed indices to support legacy CNX users