Update polymorphic variant support, add clopen poly var support