Added multiple arguments support