Adding argument support