[RFC] Future audit changes