VictorL - Updated some models with Nullable type.