Added argument matching as a feature