Added search constraints class.
Added Match attributes
Merge remote-tracking branch 'choose_remote_name/master'