Updated vertex and polygon infrastructure