adding support for uuid