[#68826700] Extend model as required to fix crash bug.