Added argument recognition