Redesign the database