Improved argument handling