Potential improvement to UUID handling