Added new tables and some other fixes