Switch to argument parser