Use a Writer argument for the response instead of returning one; update to master