modelbase class revised