Updated to use the new database.