Add basic argument support