Updated for uuid enhancement (0.2.8)