store: Some model updates