Renamed the db-wrapper again