Last of OCL constraints
More violation examples
Refactor and regen