Added some sweetening to response definitions