Add support for UUID fields