Add support for tup variants