Redesign the tables