Removed early string generation in identifier
Fixed error in contract check
Matchers will use concurrent dictionary to cache data.
Merged with remote master