Add support of args