Add support for persistence of multiple choice, single choices and tables
Bugfixing and Refactoring