Changes in C-UHD wrapper