Making envelopes optional and allowing connection to multiple servers.