Update to work with Ember CLI