Added DBClient logic