Comply with the new Service model