Model and converter improvements.