Add in more audit statements