Move the UUID generation to success!