Update proxy writer for issue 372