Redesign the database - firstly only the core