Add support for UUID