Updates for new argument parsing