WP-2361 Updated to have latest fields (document uuid)