Now uses java.util.UUID.randomUUID()