Simply question and survey questions

* No more polymorphism