Added setting of indicies