This will need to switch to the sharedef UUID generator