Added audit handling