Adjusted the db structure