Safe changes to ModelBase.cs