Updated to make it Ember 1.0.0 compatible