added support for OneShot Quiz