removed constraint class - use directly the matcher