Adding new matching support to BuiltIn