Added value constraints
Added test