Updated to ember v1