Updated ApigeeDataClient