Second try on models structure