Adding arguments support.