Updated to the new UUID format