toRaw() -> rawValue changes