Made audit optional