Added support for the helper match module