Make adjustments for new ember-data version