Add support for the R and Q constraints.