Did some reordering in the project
Validated model states where missed