Model.Types moved
Type check implemented