Modified to work with Ember 1.9