Added some more support for UUIDs.