Adding UUID generation support