Normalize your modelInterface and modelState

May be you have wish one day to retrieve all your modelStates for your modelInterface