added simple matching support