- Use extended state for breaking models (#3086)