Better Metasploit handling