Change argument parse method