diff --git a/CredWrite/Main.cpp b/CredWrite/Main.cpp
index 7c9ac49..a07b148 100644
--- a/CredWrite/Main.cpp
+++ b/CredWrite/Main.cpp
@@ -23,7 +23,7 @@
 using namespace std;
 using namespace winstd;
 
-eap::peer_base<eap::config_method_pap, eap::credentials_pap, void, void> g_module(eap_type_undefined);
+eap::module g_module;
 
 
 static int CredWrite()
diff --git a/lib/EAPBase/include/Module.h b/lib/EAPBase/include/Module.h
index edb8991..a683c00 100644
--- a/lib/EAPBase/include/Module.h
+++ b/lib/EAPBase/include/Module.h
@@ -66,7 +66,9 @@ namespace eap
         ///
         /// Constructs a module for the given EAP type
         ///
-        module(_In_ winstd::eap_type_t eap_method);
+        /// \param[in] eap_method  EAP method type ID
+        ///
+        module(_In_ winstd::eap_type_t eap_method = winstd::eap_type_undefined);
 
         ///
         /// Destructs the module
@@ -99,7 +101,7 @@ namespace eap
         ///
         /// Makes a new method config for the given method type
         ///
-        virtual config_method* make_config_method() = 0;
+        virtual config_method* make_config_method();
 
         /// @}
 
@@ -685,6 +687,8 @@ namespace eap
         ///
         /// Constructs a EAP peer module for the given EAP type
         ///
+        /// \param[in] eap_method  EAP method type ID
+        ///
         peer_base(_In_ winstd::eap_type_t eap_method) : module(eap_method) {}
 
         ///
@@ -704,6 +708,8 @@ namespace eap
         ///
         /// Constructs a EAP peer module for the given EAP type
         ///
+        /// \param[in] eap_method  EAP method type ID
+        ///
         peer(_In_ winstd::eap_type_t eap_method) : peer_base<_Tmeth, _Tcred, _Tint, _Tintres>(eap_method) {}
 
         ///
diff --git a/lib/EAPBase/src/Module.cpp b/lib/EAPBase/src/Module.cpp
index b8266cd..97bde77 100644
--- a/lib/EAPBase/src/Module.cpp
+++ b/lib/EAPBase/src/Module.cpp
@@ -128,6 +128,12 @@ void eap::module::log_error(_In_ const EAP_ERROR *err) const
 }
 
 
+eap::config_method* eap::module::make_config_method()
+{
+    return NULL;
+}
+
+
 bool eap::module::encrypt(_In_ HCRYPTPROV hProv, _In_bytecount_(size) const void *data, _In_ size_t size, _Out_ std::vector<unsigned char> &enc, _Out_ EAP_ERROR **ppEapError, _Out_opt_ HCRYPTHASH hHash) const
 {
     assert(ppEapError);
diff --git a/lib/EAPBase_UI/include/Module.h b/lib/EAPBase_UI/include/Module.h
index 9195c96..9642258 100644
--- a/lib/EAPBase_UI/include/Module.h
+++ b/lib/EAPBase_UI/include/Module.h
@@ -42,6 +42,8 @@ namespace eap
         ///
         /// Constructs a EAP UI peer module for the given EAP type
         ///
+        /// \param[in] eap_method  EAP method type ID
+        ///
         peer_ui(_In_ winstd::eap_type_t eap_method) : peer_base<_Tmeth, _Tcred, _Tint, _Tintres>(eap_method) {}
 
         ///