Updated for latest service output fields