Adding argument parsing