Updated for Ember 1.0