Use argument parsing