Splitting of addParameter functions (addString, addEmail, addSubscription, addGroups) for less complexity.
More fixes for Scrutinizer