Added some more indices