Added more to the database class