adjustments to Model and schema handling