Added validation of constraints