Adjust to new ServiceCall interface