CAPEDWARF-145 - Proper RawValue implementation