Add checkArgs and set timeout