Use correct type in request/response