r1895: updated with-database