Updated the basic data-api changes
Ahhh maybe not