Added argument handler