diff --git a/lib/msf/core/post/windows.rb b/lib/msf/core/post/windows.rb
index a504e65670..678bfe0d0e 100644
--- a/lib/msf/core/post/windows.rb
+++ b/lib/msf/core/post/windows.rb
@@ -1,5 +1,6 @@
 
 module Msf::Post::Windows
+  require 'msf/core/post/windows/extapi'
   require 'msf/core/post/windows/accounts'
   require 'msf/core/post/windows/cli_parse'
   require 'msf/core/post/windows/eventlog'
@@ -12,4 +13,5 @@ module Msf::Post::Windows
   require 'msf/core/post/windows/services'
   require 'msf/core/post/windows/shadowcopy'
   require 'msf/core/post/windows/user_profiles'
+  require 'msf/core/post/windows/wmic'
 end
diff --git a/lib/msf/core/post/windows/extapi.rb b/lib/msf/core/post/windows/extapi.rb
new file mode 100644
index 0000000000..b0ca55822a
--- /dev/null
+++ b/lib/msf/core/post/windows/extapi.rb
@@ -0,0 +1,25 @@
+# -*- coding: binary -*-
+
+module Msf
+class Post
+module Windows
+
+module ExtAPI
+
+  def load_extapi
+    if session.extapi
+      return true
+    else
+      begin
+        return session.core.use("extapi")
+      rescue Errno::ENOENT
+        print_error("Unable to load Extended API.")
+        return false
+      end
+    end
+  end
+
+end # ExtAPI
+end # Windows
+end # Post
+end # Msf
diff --git a/lib/msf/core/post/windows/services.rb b/lib/msf/core/post/windows/services.rb
index 2893e9b640..2d8187863e 100644
--- a/lib/msf/core/post/windows/services.rb
+++ b/lib/msf/core/post/windows/services.rb
@@ -23,6 +23,7 @@ end
 #
 module Services
 
+  include ::Msf::Post::Windows::ExtAPI
   include ::Msf::Post::Windows::Registry
 
   #