Added functionality for SMATCH