Add more question types and a method for selection