Added support for UUID-s