Model and converter changes