Added some more indexes

And a transformer