Improvements on Constraints

Signed-off-by: Matthias Stevens <matthias.stevens@gmail.com>