Changed angelloModel to a service