Update the Database class because the previous implementation didn't really make any sense.