Made parameters optional - if null, nothing optinal is added.