Update to new QM spec