Added smtp and pop3 checks