Handle more question types