Adapt to changes on master.
Refactor and generalize code to be able to re-use the quiz related code.