Adjust argument parsing