Add support for new qvar format