improved DbFunctions 2