Updated to use custom ember data