SCDM-5: Distinguish constrained and unconstrained

Issue-Ref: 5