added Question and Choice field