Changes to make the db load properly