Clarify conditional logic
Allow ModelInstance constructors to work