Data API modified