Changes for workflow
Use of ConstraintOrderedCollection