Further work on the UUID portion