18 audit optional params

Merge for v0.4.0.pre release