Updated to use ember-data