Changed the DB structure