Fix for UUID integration