Decided to change the database structure.