Changes to the database class