Issue #161 - Add support for generalized matching fixes