MDV update: adapt toolkit to use latest MDV version; adapt to new Model api and template element changes.