Updated to use _Unified class names