Updated Data API Client