Added answer choices to templates