more work on uuid support