Refactor
New response class