Changed from using services to resource