MEDIUM / Fixed many issues raised after model slot refactoring