Update to work with ember-cli