Support more question types