WP-2354 Added new uuid field