Better names
Refactored to allow properties of response to be passed back.