Added additional question types