More model rework
Merge remote-tracking branch 'origin/add_translation' into add_translation