Should we pass the service in here as well?