New model updates from @krzysk