Change args to options