Add DistributionConstraint and MultiSeparationConstraint