Latest changes for UUID