updated models and schema