Refact for annotorious API changes.

This is due to the fact, that ShapeSelectors now store and use the index property.