Added many tables, manytomany and choice implemented.
Made section (choice) code more compact