DB adapter improvements