Updated schema and model