model base class improvements