Improve in the service example