Added argument parser