Added new tables and removed old data