Added argument parsing code