Lots of porting work on Index ns