Updated to use the new canonical form of uuid from cppcomponents