Nullable boxing fixed
Nullable unboxing fixed
Fields mapping