Add args support