Added yaml support and Question object to Survey