PolyModelType final commit