Added backwards-compatible support for avs_response