Improved handling of multiple args