Feature/switch back to angular resource