Added save/restore of vertices