Added a separate component for dealing with vertex reindexing