diff --git a/Swagger.Net.WebAPI/App_Start/SwaggerNet.cs b/Swagger.Net.WebAPI/App_Start/SwaggerNet.cs
index 82043f3..75d988a 100644
--- a/Swagger.Net.WebAPI/App_Start/SwaggerNet.cs
+++ b/Swagger.Net.WebAPI/App_Start/SwaggerNet.cs
@@ -14,18 +14,17 @@ public static class SwaggerNet
     {
         public static void PreStart()
         {
-            RouteTable.Routes.MapHttpRoute(
-                name: "SwaggerResourceList",
-                routeTemplate: "apidocs/swagger",
-                defaults: new { swagger = true, controller = "Swagger", action = "GetResourceList" }
-            );
-            RouteTable.Routes.MapHttpRoute(
-                name: "SwaggerApiDeclaration",
-                routeTemplate: "apidocs/{controllerName}",
-                defaults: new { swagger = true, controller = "Swagger", action = "GetApiDeclaration" }
-            );
+            //RouteTable.Routes.MapHttpRoute(
+            //    name: "SwaggerResourceList",
+            //    routeTemplate: "api/swagger",
+            //    defaults: new { swagger = true, controller = "Swagger", action = "GetResourceList" }
+            //);
+            //RouteTable.Routes.MapHttpRoute(
+            //    name: "SwaggerApiDeclaration",
+            //    routeTemplate: "apidocs/{controllerName}",
+            //    defaults: new { swagger = true, controller = "Swagger", action = "GetApiDeclaration" }
+            //);
 
-            SwaggerConfiguration.DefaultConfiguration = SwaggerConfiguration.CreateDefaultConfig(GlobalConfiguration.Configuration);
         }
     }
 }
\ No newline at end of file
diff --git a/Swagger.Net.WebAPI/Controllers/BlogPostsController.cs b/Swagger.Net.WebAPI/Controllers/BlogPostsController.cs
index 9aa22ae..a08ced0 100644
--- a/Swagger.Net.WebAPI/Controllers/BlogPostsController.cs
+++ b/Swagger.Net.WebAPI/Controllers/BlogPostsController.cs
@@ -7,6 +7,12 @@
 
 namespace Swagger.Net.WebApi.Controllers
 {
+    /// <summary>
+    /// This is blog posts controller summary
+    /// </summary>
+    /// <remarks>
+    /// This is blog posts controller remarks
+    /// </remarks>
     public class BlogPostsController : ApiController
     {
         // GET api/blogposts
diff --git a/Swagger.Net.WebAPI/Global.asax.cs b/Swagger.Net.WebAPI/Global.asax.cs
index 9f40d87..0dc5d0d 100644
--- a/Swagger.Net.WebAPI/Global.asax.cs
+++ b/Swagger.Net.WebAPI/Global.asax.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Web;
 using System.Web.Http;
+using System.Web.Http.Description;
 using System.Web.Mvc;
 using System.Web.Optimization;
 using System.Web.Routing;
@@ -22,6 +24,11 @@ protected void Application_Start()
             FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
             RouteConfig.RegisterRoutes(RouteTable.Routes);
             BundleConfig.RegisterBundles(BundleTable.Bundles);
+
+            var baseType = HttpContext.Current.ApplicationInstance.GetType().BaseType;
+            var assemblyname = Assembly.GetAssembly(baseType).GetName().Name;
+            var path = HttpContext.Current.Server.MapPath("~/bin/" + assemblyname + ".xml");
+            GlobalConfiguration.Configuration.Services.Replace(typeof(IDocumentationProvider),new XmlCommentDocumentationProvider(path));
         }
     }
 }
\ No newline at end of file
diff --git a/Swagger.Net.WebAPI/Views/Home/Index.cshtml b/Swagger.Net.WebAPI/Views/Home/Index.cshtml
index 38ebf05..0af07e6 100644
--- a/Swagger.Net.WebAPI/Views/Home/Index.cshtml
+++ b/Swagger.Net.WebAPI/Views/Home/Index.cshtml
@@ -1,4 +1,4 @@
 <h1>Welcome to ASP.NET Web API!</h1>
 Navigate to <a href="/docs">/docs</a> for the Swagger UI docs.  These are not included in the NuGet package.<br />
-Navigate to <a href="/apidocs/swagger">/api/swagger</a> to see the JSON specification emitted.<br />
+Navigate to <a href="/api/swagger">/api/swagger</a> to see the JSON specification emitted.<br />
 You may then navigate to each api path to see the JSON documentation for each ApiController individually.
\ No newline at end of file
diff --git a/Swagger.Net.WebAPI/Web.config b/Swagger.Net.WebAPI/Web.config
index c42c5ff..1b529f2 100644
--- a/Swagger.Net.WebAPI/Web.config
+++ b/Swagger.Net.WebAPI/Web.config
@@ -12,6 +12,7 @@
     <add name="DefaultConnection" providerName="System.Data.SqlClient" connectionString="Data Source=(LocalDb)\v11.0;Initial Catalog=aspnet-Swagger.Net.WebApi-20120826143632;Integrated Security=SSPI;AttachDBFilename=|DataDirectory|\aspnet-Swagger.Net.WebApi-20120826143632.mdf" />
   </connectionStrings>
   <appSettings>
+    <add key="document_controller_alias" value="api" />
     <add key="webpages:Version" value="2.0.0.0" />
     <add key="webpages:Enabled" value="false" />
     <add key="PreserveLoginUrl" value="true" />
diff --git a/Swagger.Net.WebAPI/docs/index.html b/Swagger.Net.WebAPI/docs/index.html
index 361a9c5..d7bf7c7 100644
--- a/Swagger.Net.WebAPI/docs/index.html
+++ b/Swagger.Net.WebAPI/docs/index.html
@@ -42,7 +42,7 @@
     <script type="text/javascript">
         $(function () {
             window.swaggerUi = new SwaggerUi({
-                discoveryUrl: "/apidocs/swagger",
+                discoveryUrl: "/api/swagger",
                 apiKey: "",
                 dom_id:"swagger-ui-container",
                 supportHeaderParams: false,
diff --git a/Swagger.Net/Factories/ResourceListingFactory.cs b/Swagger.Net/Factories/ResourceListingFactory.cs
new file mode 100644
index 0000000..4bca57a
--- /dev/null
+++ b/Swagger.Net/Factories/ResourceListingFactory.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Web.Http.Description;
+using Swagger.Net.Models;
+
+namespace Swagger.Net.Factories
+{
+    public class ResourceListingFactory
+    {
+        public ResourceListing Create(SwaggerConfiguration config)
+        {
+            var apis = GetApis(config.ApiDescriptions, config.DocumentControllerAlias);
+            var resourceListing = new ResourceListing
+            {
+                apiVersion = config.ApiVersion,
+                swaggerVersion = config.SwaggerVersion,
+                basePath = config.HttpContext.Request.Url.AbsoluteUri,
+                apis = apis
+            };
+            return resourceListing;
+        }
+
+        public IEnumerable<ResourceListing.ResourceListingApi> GetApis(Collection<ApiDescription> apiDescriptions, string documentControllerAlias)
+        {
+            var uniqueControllers = apiDescriptions
+                .Select(api => api.ActionDescriptor.ControllerDescriptor.ControllerName)
+                .Distinct();
+
+            var rtn = new List<ResourceListing.ResourceListingApi>();
+
+            foreach (var controllerName in uniqueControllers)
+            {
+                // todo: get real docs from Documentation Provider.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          
+                string name = controllerName;
+                var desc = apiDescriptions.Where(api => api.ActionDescriptor.ControllerDescriptor.ControllerName == name).Select(api => api.Documentation).FirstOrDefault();
+                
+                var listingItem = CreateListingApi(name, desc, documentControllerAlias);
+                rtn.Add(listingItem);
+            }
+
+            return rtn;
+        }
+
+        public ResourceListing.ResourceListingApi CreateListingApi(string name, string description, string documentControllerAlias)
+        {
+            return new ResourceListing.ResourceListingApi
+            {
+                path =  "/" + name,
+                description = description
+            };
+
+        }
+    }
+}
diff --git a/Swagger.Net/Swagger.Net.csproj b/Swagger.Net/Swagger.Net.csproj
index 52e70fa..27bcf49 100644
--- a/Swagger.Net/Swagger.Net.csproj
+++ b/Swagger.Net/Swagger.Net.csproj
@@ -38,6 +38,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.Entity" />
     <Reference Include="System.Net.Http" />
@@ -53,6 +54,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Factories\ResourceListingFactory.cs" />
     <Compile Include="Models\Api.cs" />
     <Compile Include="Models\ApiDeclaration.cs" />
     <Compile Include="Models\ApiErrorResponse.cs" />
diff --git a/Swagger.Net/SwaggerConfiguration.cs b/Swagger.Net/SwaggerConfiguration.cs
index e6a41c0..3693afe 100644
--- a/Swagger.Net/SwaggerConfiguration.cs
+++ b/Swagger.Net/SwaggerConfiguration.cs
@@ -1,41 +1,60 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Configuration;
+using System.Dynamic;
 using System.Linq;
 using System.Text;
 using System.Web;
 using System.Web.Http;
+using System.Web.Http.Description;
 
 namespace Swagger.Net
 {
+
     public class SwaggerConfiguration
     {
-        /// <summary>
-        /// Static instance used by default
-        /// </summary>
-        public static SwaggerConfiguration DefaultConfiguration { get; set; }
-
-        /// <summary>
-        /// The API version of your application
-        /// </summary>
-        public virtual string ApiVersion { get; set; }
+        private static SwaggerConfiguration _instance;
 
-        /// <summary>
-        /// Swagger-spec version
-        /// </summary>
+        private HttpContext _context;
+        private Collection<ApiDescription> _apiDescriptions;
+        
+        public virtual string ApiVersion { get; set; }
         public virtual string SwaggerVersion { get; set; }
+        public virtual string DocumentControllerAlias { get; set; }
 
 
-        public virtual System.Web.Http.Description.IApiExplorer ApiExplorer { get; set; }
+        public Collection<ApiDescription> ApiDescriptions
+        {
+            get { return _apiDescriptions ?? GlobalConfiguration.Configuration.Services.GetApiExplorer().ApiDescriptions; }
+            set { _apiDescriptions = value; }
+        }
 
-        public static SwaggerConfiguration CreateDefaultConfig(HttpConfiguration httpConfig) {
+        public HttpContext HttpContext
+        {
+            get { return _context ?? HttpContext.Current; }
+            set { _context = value; }
+        }
+
+        // Singleton
+        public static SwaggerConfiguration Instance
+        {
+            get { return _instance ?? (_instance = CreateDefaultInstance()); }
+            set { _instance = value; }
+        }
+
+
+        public static SwaggerConfiguration CreateDefaultInstance()
+        {
+            // todo: fetch from web.config
+            var alias = ConfigurationManager.AppSettings["document_controller_alias"] ?? "api";
             return new SwaggerConfiguration()
             {
                 SwaggerVersion = "1.1",
-                ApiVersion = System.Reflection.Assembly.GetCallingAssembly().GetType().Assembly.GetName().Version.ToString(),
-                ApiExplorer = httpConfig.Services.GetApiExplorer()
+                ApiVersion = System.Reflection.Assembly.GetCallingAssembly().GetName().Version.ToString(),
+                DocumentControllerAlias = alias,
             };
         }
 
-        
     }
 }
diff --git a/Swagger.Net/SwaggerController.cs b/Swagger.Net/SwaggerController.cs
index 81fb632..9b13633 100644
--- a/Swagger.Net/SwaggerController.cs
+++ b/Swagger.Net/SwaggerController.cs
@@ -6,6 +6,7 @@
 using System.Web.Http;
 using System.Linq;
 using System.Text.RegularExpressions;
+using Swagger.Net.Factories;
 
 namespace Swagger.Net
 {
@@ -22,23 +23,14 @@ public class SwaggerController : ApiController
         /// <returns>JSON document representing structure of API</returns>
         public HttpResponseMessage GetResourceList()
         {
-            var config = SwaggerConfig ?? SwaggerConfiguration.DefaultConfiguration;
-            var httpContext = new HttpContextWrapper(HttpContext.Current);  // TODO: testable way to pass context
-            
-            var resourceListing = new Models.ResourceListing()
-            {
-                apiVersion = config.ApiVersion,
-                basePath = ResolveServerUrl("~", httpContext),
-                swaggerVersion = config.SwaggerVersion,
-                apis = from d in config.ApiExplorer.ApiDescriptions
-                       where d.ActionDescriptor.ControllerDescriptor.ControllerType != this.GetType()
-                       group d by d.ActionDescriptor.ControllerDescriptor.ControllerName into g
-                       select new Models.ResourceListing.ResourceListingApi()
-                       {
-                           path = "/apidocs/" + g.Key 
-                       }
-            };
+            // Arrange
+            var config = SwaggerConfig ?? SwaggerConfiguration.Instance;
+            var factory = new ResourceListingFactory();
+
+            // Act
+            var resourceListing = factory.Create(config);
 
+            // Answer
             return new HttpResponseMessage()
             {
                 Content = new ObjectContent<Models.ResourceListing>(resourceListing, ControllerContext.Configuration.Formatters.JsonFormatter)
@@ -46,11 +38,11 @@ group d by d.ActionDescriptor.ControllerDescriptor.ControllerName into g
         }
 
         /// <summary>
-	/// Get the API Declaration for a particular controller
-	/// </summary>
-        public Models.ApiDeclaration GetApiDeclaration(string controllerName)
+        /// Get the API Declaration for a particular controller
+        /// </summary>
+        public Models.ApiDeclaration GetApiDeclaration(string id)
         {
-            var config = SwaggerConfig ?? SwaggerConfiguration.DefaultConfiguration;
+            var config = SwaggerConfig ?? SwaggerConfiguration.Instance;
             var httpContext = new HttpContextWrapper(HttpContext.Current);  // TODO: testable way to pass context
 
             return new Models.ApiDeclaration()
@@ -58,8 +50,8 @@ public Models.ApiDeclaration GetApiDeclaration(string controllerName)
                 apiVersion = config.ApiVersion,
                 swaggerVersion = config.SwaggerVersion,
                 basePath = ResolveServerUrl("~", httpContext),
-                apis = from d in config.ApiExplorer.ApiDescriptions
-                       where d.ActionDescriptor.ControllerDescriptor.ControllerName == controllerName
+                apis = from d in config.ApiDescriptions
+                       where d.ActionDescriptor.ControllerDescriptor.ControllerName == id
                        group d by d.RelativePath into paths
                        select new Models.Api()
                        {
@@ -76,8 +68,8 @@ group d by d.RelativePath into paths
         }
 
         private static string ResolveServerUrl(string relativeUrl, HttpContextWrapper httpContext)
-	    {
+        {
             return httpContext.Request.Url.GetLeftPart(UriPartial.Authority) + VirtualPathUtility.ToAbsolute(relativeUrl);
-	    }
+        }
     }
 }
diff --git a/Swagger.Net/Utilities/XmlCommentDocumentationReader.cs b/Swagger.Net/Utilities/XmlCommentDocumentationReader.cs
index b2fc7f4..0f40a52 100644
--- a/Swagger.Net/Utilities/XmlCommentDocumentationReader.cs
+++ b/Swagger.Net/Utilities/XmlCommentDocumentationReader.cs
@@ -1,111 +1,137 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Xml.XPath;
-using System.Linq;
 using System.Reflection;
+using System.Text;
 using System.Text.RegularExpressions;
+using System.Web.Http.Controllers;
+using System.Web.Http.Description;
+using System.Xml.XPath;
+using Swagger.Net.Models;
 
-namespace Swagger.Net.Utilities
+namespace Swagger.Net
 {
-    public class XmlCommentDocumentationReader
+    /// <summary>
+    /// Accesses the XML doc blocks written in code to further document the API.
+    /// All credit goes to: <see cref="http://blogs.msdn.com/b/yaohuang1/archive/2012/05/21/asp-net-web-api-generating-a-web-api-help-page-using-apiexplorer.aspx"/>
+    /// </summary>
+    public class XmlCommentDocumentationProvider : IDocumentationProvider
     {
-        XPathNavigator _documentNavigator;
-        private const string _methodExpression = "/doc/members/member[@name='M:{0}']";
-        private static Regex nullableTypeNameRegex = new Regex(@"(.*\.Nullable)" + Regex.Escape("`1[[") + "([^,]*),.*");
+        #region --- fields & ctors ---
+
+        const string METHOD_EXPRESSION = "/doc/members/member[@name='M:{0}']";
+        const string TYPE_EXPRESSION = "/doc/members/member[@name='T:{0}']";
+        const string TYPE_MEMBERS_EXPRESSION = "/doc/members/member[contains(@name,'P:{0}')]";
 
-        public XmlCommentDocumentationReader(string documentPath)
+        readonly XPathNavigator _documentNavigator;
+        static readonly Regex NullableTypeNameRegex = new Regex(@"(.*\.Nullable)" + Regex.Escape("`1[[") + "([^,]*),.*");
+
+
+        public XmlCommentDocumentationProvider(string documentPath)
         {
-            XPathDocument xpath = new XPathDocument(documentPath);
+            var xpath = new XPathDocument(documentPath);
             _documentNavigator = xpath.CreateNavigator();
         }
 
-        public virtual string GetSummary(MethodInfo method)
+        #endregion --- fields & ctors ---
+
+        public virtual string GetDocumentation(HttpParameterDescriptor parameterDescriptor)
         {
-            XPathNavigator memberNode = GetMemberNode(method);
+            var parameterName = parameterDescriptor.ParameterName;
+            var memberNode = GetMemberNode(parameterDescriptor.ActionDescriptor);
             if (memberNode != null)
             {
-                XPathNavigator summaryNode = memberNode.SelectSingleNode("summary");
-                if (summaryNode != null)
+                var parameterNode = memberNode.SelectSingleNode(string.Format("param[@name='{0}']", parameterName));
+                if (parameterNode != null)
                 {
-                    return ToHtml(summaryNode).Trim();
+                    return parameterNode.Value.Trim();
                 }
             }
 
-            return null;
+            return "No Documentation Found.";
         }
 
-        public virtual string GetRemarks(MethodInfo method)
+
+        public virtual string GetDocumentation(HttpActionDescriptor actionDescriptor)
         {
-            XPathNavigator memberNode = GetMemberNode(method);
+            var memberNode = GetMemberNode(actionDescriptor);
             if (memberNode != null)
             {
-                XPathNavigator summaryNode = memberNode.SelectSingleNode("remarks");
+                var summaryNode = memberNode.SelectSingleNode("summary");
                 if (summaryNode != null)
                 {
-                    return ToHtml(summaryNode).Trim();
+                    return summaryNode.Value.Trim();
                 }
             }
 
-            return null;
+            return "No Documentation Found.";
         }
 
-        public virtual string GetReturns(MethodInfo method)
+
+
+
+        public virtual string GetRemarks(HttpActionDescriptor actionDescriptor)
         {
-            XPathNavigator memberNode = GetMemberNode(method);
+            var memberNode = GetMemberNode(actionDescriptor);
             if (memberNode != null)
             {
-                XPathNavigator summaryNode = memberNode.SelectSingleNode("returns");
+                var summaryNode = memberNode.SelectSingleNode("remarks");
                 if (summaryNode != null)
                 {
-                    return ToHtml(summaryNode).Trim();
+                    return summaryNode.Value.Trim();
                 }
             }
 
-            return null;
+            return "No Documentation Found.";
         }
-        public virtual IDictionary<string, string> GetParameters(MethodInfo method)
+
+        public virtual string GetResponseClass(HttpActionDescriptor actionDescriptor)
         {
-            XPathNavigator memberNode = GetMemberNode(method);
-            if (memberNode != null)
+            var reflectedActionDescriptor = actionDescriptor as ReflectedHttpActionDescriptor;
+            if (reflectedActionDescriptor != null)
             {
-                return (from XPathNavigator node in memberNode.SelectChildren("param", string.Empty)
-                        select node).ToDictionary(
-                            key => key.GetAttribute("name", string.Empty),
-                            val => val.Value);
-                //new KeyValuePair<string, string>(node.GetAttribute("name",string.Empty), node.Value);
-
+                if (reflectedActionDescriptor.MethodInfo.ReturnType.IsGenericType)
+                {
+                    var sb = new StringBuilder(reflectedActionDescriptor.MethodInfo.ReturnParameter.ParameterType.Name);
+                    sb.Append("<");
+                    Type[] types = reflectedActionDescriptor.MethodInfo.ReturnParameter.ParameterType.GetGenericArguments();
+                    for (int i = 0; i < types.Length; i++)
+                    {
+                        sb.Append(types[i].Name);
+                        if (i != (types.Length - 1)) sb.Append(", ");
+                    }
+                    sb.Append(">");
+                    return sb.Replace("`1", "").ToString();
+                }
+                else
+                    return reflectedActionDescriptor.MethodInfo.ReturnType.Name;
             }
 
-            return null;
+            return "void";
         }
 
-
-        public virtual string GetParameterDocs(MethodInfo method, string parameterName)
+        public virtual string GetNickname(HttpActionDescriptor actionDescriptor)
         {
-            XPathNavigator memberNode = GetMemberNode(method);
-            if (memberNode != null)
+            var reflectedActionDescriptor = actionDescriptor as ReflectedHttpActionDescriptor;
+            if (reflectedActionDescriptor != null)
             {
-                XPathNavigator parameterNode = memberNode.SelectSingleNode(string.Format("param[@name='{0}']", parameterName));
-                if (parameterNode != null)
-                {
-                    return ToHtml(parameterNode).Trim();
-                }
+                return reflectedActionDescriptor.MethodInfo.Name;
             }
 
-            return null;
+            return "NicknameNotFound";
         }
 
-
-
-        private XPathNavigator GetMemberNode(MethodInfo method)
+        private XPathNavigator GetMemberNode(HttpActionDescriptor actionDescriptor)
         {
-            string selectExpression = string.Format(_methodExpression, GetMemberName(method));
-            XPathNavigator node = _documentNavigator.SelectSingleNode(selectExpression);
-            if (node != null)
+            var reflectedActionDescriptor = actionDescriptor as ReflectedHttpActionDescriptor;
+            if (reflectedActionDescriptor != null)
             {
-                return node;
+                string selectExpression = string.Format(METHOD_EXPRESSION, GetMemberName(reflectedActionDescriptor.MethodInfo));
+                var node = _documentNavigator.SelectSingleNode(selectExpression);
+                if (node != null)
+                {
+                    return node;
+                }
             }
 
             return null;
@@ -117,45 +143,43 @@ private static string GetMemberName(MethodInfo method)
             var parameters = method.GetParameters();
             if (parameters.Length != 0)
             {
-                string[] parameterTypeNames = parameters.Select(param => getTypeName(param.ParameterType)).ToArray();
+                string[] parameterTypeNames = parameters.Select(param => ProcessTypeName(param.ParameterType.FullName)).ToArray();
                 name += string.Format("({0})", string.Join(",", parameterTypeNames));
             }
 
             return name;
         }
 
-        private static string getTypeName(Type type)
+        private static string ProcessTypeName(string typeName)
         {
             //handle nullable
-            var result = nullableTypeNameRegex.Match(type.FullName);
+            var result = NullableTypeNameRegex.Match(typeName);
             if (result.Success)
             {
                 return string.Format("{0}{{{1}}}", result.Groups[1].Value, result.Groups[2].Value);
             }
+            return typeName;
+        }
 
-            // handle array types
-            //var innerType = type.FindEnumerableType();
-            //if (innerType != null) return getTypeName(innerType);
 
-            //return type.FriendlyName();
-            return type.Name;
-        }
 
-        /// <summary>
-        /// Converts XML docs to HTML version
-        /// </summary>
-        /// <param name="element"></param>
-        /// <returns></returns>
-        private string ToHtml(XPathNavigator element)
+        private XPathNavigator GetTypeNode(string typeName)
         {
-            // some very ghetto conversions here, this can be much better but i'm going for fast PoC here..
-            return Regex.Replace(
-                element.InnerXml.Replace("<code>", "<pre>").Replace("</code>", "</pre>"),
-                "\\r\\n\\s*\\r\\n", "<br/>\r\n<br/>\r\n" // replace two newlines with two <br>'s
-            ); 
+            var selectExpression = string.Format(TYPE_EXPRESSION, typeName);
+            var node = _documentNavigator.SelectSingleNode(selectExpression);
+
+            return node;
+
         }
 
+        private XPathNodeIterator GetTypeMemberNodes(string typeName)
+        {
+            var selectExpression = string.Format(TYPE_MEMBERS_EXPRESSION, typeName);
+            var node = _documentNavigator.Select(selectExpression);
+
+            return node;
+
+        }
 
     }
-       
-}
+}
\ No newline at end of file