adopt to new response class