Added argument parsing