Added Fields to Questions/Choices