Handle existing args format