Updated  UUID, List corrections