Updating to cater for Object Returns rather than strings.