Replace OptionParser with new ArgumentParser