Improved threads in Constraint.map - it is not yet working for AND