Adding Data API wrapper, helpers