Adding support for constraints