Mostly changes to the database layout.