Added code to generate UUIDs