models and schema updated