Adding option to return full response object