Modifying argument parsing