Adjust to support ember-data style api