New database class, mild updates