And a few changes to the db table structure