Added extended db adapter