Fix #10 (model updates)