Use new constraints field for cluster assignment
#462
Merged
constraints field for cluster assignment
#462