Added new constraint types