Adding support for UUID