Add more message for audit