added extra option for auto adding parameters