Update to new Page API with separate correct_answer