CBX-403 - Fix validation on create model