Add support for UUID generation