Add remaining question types