Change from Response to WSResponse