tdbc related code changes