Debug DCP 189 and simplify model manufacturing.