Refactor
Added new responses