Add contraints handling