changed mappings not to use identity
Nullability changes