Fix #3 - Move Service to a Provider