[FIX] models: reorganize model instantiation, which was broken when adding custom...