diff --git a/lib/metasploit/credential.rb b/lib/metasploit/credential.rb
index 2748c8e..db01d6d 100644
--- a/lib/metasploit/credential.rb
+++ b/lib/metasploit/credential.rb
@@ -10,7 +10,8 @@
 require 'metasploit/concern'
 require 'metasploit_data_models'
 require 'metasploit/model'
-require 'zip'
+
+autoload :Zip, 'zip'
 
 #
 # Project
diff --git a/lib/metasploit/credential/creation.rb b/lib/metasploit/credential/creation.rb
index 55c0b7d..e63174f 100644
--- a/lib/metasploit/credential/creation.rb
+++ b/lib/metasploit/credential/creation.rb
@@ -1,4 +1,6 @@
-require 'rex/socket'
+module Rex
+  autoload :Socket, 'rex/socket'
+end
 
 # Implements a set of "convenience methods" for creating credentials and related portions of the object graph.  Creates
 # {Metasploit::Credential::Core} objects and their attendant relationships as well as {Metasploit::Credential::Login}