Added argv parsing