Added more case/when scenarios for various response objects