Added IndexSpace, again