fixed models and schema