Argument parsing is added