Added support for UUIDs.