UCS-specific changes