Added auditable support