Add constraint support