diff --git a/src/MMLib.SwaggerForOcelot/DependencyInjection/ServiceCollectionExtensions.cs b/src/MMLib.SwaggerForOcelot/DependencyInjection/ServiceCollectionExtensions.cs
index 76a9300..9084d0b 100644
--- a/src/MMLib.SwaggerForOcelot/DependencyInjection/ServiceCollectionExtensions.cs
+++ b/src/MMLib.SwaggerForOcelot/DependencyInjection/ServiceCollectionExtensions.cs
@@ -12,6 +12,7 @@
 using MMLib.SwaggerForOcelot.Aggregates;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
+using MMLib.SwaggerForOcelot.Repositories.EndPointValidators;
 using MMLib.SwaggerForOcelot.ServiceDiscovery.ConsulServiceDiscoveries;
 using Ocelot.Configuration;
 using Ocelot.Configuration.Creator;
@@ -47,6 +48,8 @@ public static IServiceCollection AddSwaggerForOcelot(
         {
             services
                 .AddSingleton<IConsulServiceDiscovery, ConsulServiceDisvovery>()
+                .AddSingleton<ISwaggerEndpointsMonitor, SwaggerEndpointsMonitor>()
+                .AddSingleton<IEndPointValidator, EndPointValidator>()
                 .AddTransient<IRoutesDocumentationProvider, RoutesDocumentationProvider>()
                 .AddTransient<IDownstreamSwaggerDocsRepository, DownstreamSwaggerDocsRepository>()
                 .AddTransient<ISwaggerServiceDiscoveryProvider, SwaggerServiceDiscoveryProvider>()
@@ -62,7 +65,11 @@ public static IServiceCollection AddSwaggerForOcelot(
             if (conf?.Type is ("Consul" or "PollConsul"))
             {
                 services.AddConsulClient(conf);
+
+                services.AddSingleton<IConsulEndpointOptionsMonitor, ConsulEndpointOptionsMonitor>();
+                services.AddSingleton<ISwaggerEndpointsMonitor, ConsulSwaggerEndpointsMonitor>();
                 services.AddTransient<ISwaggerEndPointProvider, ConsulSwaggerEndpointProvider>();
+                services.AddSingleton<IEndPointValidator, ConsulEndPointValidator>();
             }
 
             services.AddHttpClient(IgnoreSslCertificate, c =>
diff --git a/src/MMLib.SwaggerForOcelot/Middleware/BuilderExtensions.cs b/src/MMLib.SwaggerForOcelot/Middleware/BuilderExtensions.cs
index f5560a0..926defb 100644
--- a/src/MMLib.SwaggerForOcelot/Middleware/BuilderExtensions.cs
+++ b/src/MMLib.SwaggerForOcelot/Middleware/BuilderExtensions.cs
@@ -7,6 +7,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using MMLib.SwaggerForOcelot.Repositories;
+using MMLib.SwaggerForOcelot.Repositories.EndPointValidators;
 
 namespace Microsoft.AspNetCore.Builder
 {
@@ -41,7 +42,7 @@ public static IApplicationBuilder UseSwaggerForOcelotUI(
                     .ApplicationServices.GetService<ISwaggerEndPointProvider>().GetAll();
 
                 ChangeDetection(app, c, options);
-                AddSwaggerEndPoints(c, endPoints, options.DownstreamSwaggerEndPointBasePath);
+                AddSwaggerEndPoints(app, c, endPoints, options.DownstreamSwaggerEndPointBasePath);
             });
 
             return app;
@@ -50,14 +51,14 @@ public static IApplicationBuilder UseSwaggerForOcelotUI(
         private static void ChangeDetection(IApplicationBuilder app, SwaggerUIOptions c,
             SwaggerForOcelotUIOptions options)
         {
-            IOptionsMonitor<List<SwaggerEndPointOptions>> endpointsChangeMonitor =
-                app.ApplicationServices.GetService<IOptionsMonitor<List<SwaggerEndPointOptions>>>();
+            var endpointsChangeMonitor =
+                app.ApplicationServices.GetService<ISwaggerEndpointsMonitor>();
 
-            endpointsChangeMonitor.OnChange((newEndpoints) =>
+            endpointsChangeMonitor.OptionsChanged += (s, newEndpoints) =>
             {
                 c.ConfigObject.Urls = null;
-                AddSwaggerEndPoints(c, newEndpoints, options.DownstreamSwaggerEndPointBasePath);
-            });
+                AddSwaggerEndPoints(app, c, newEndpoints, options.DownstreamSwaggerEndPointBasePath);
+            };
         }
 
         /// <inheritdoc cref="UseSwaggerForOcelotUI(IApplicationBuilder,Action{SwaggerForOcelotUIOptions})"/>
@@ -79,25 +80,23 @@ private static void UseSwaggerForOcelot(IApplicationBuilder app, SwaggerForOcelo
             => app.Map(options.PathToSwaggerGenerator,
                 builder => builder.UseMiddleware<SwaggerForOcelotMiddleware>(options));
 
-        private static void AddSwaggerEndPoints(
-            SwaggerUIOptions c,
+        private static void AddSwaggerEndPoints(IApplicationBuilder app,
+            SwaggerUIOptions swaggerOptions,
             IReadOnlyList<SwaggerEndPointOptions> endPoints,
             string basePath)
         {
             static string GetDescription(SwaggerEndPointConfig config)
                 => config.IsGatewayItSelf ? config.Name : $"{config.Name} - {config.Version}";
 
-            // if (endPoints is null || endPoints.Count == 0)
-            // {
-            //     throw new InvalidOperationException(
-            //         $"{SwaggerEndPointOptions.ConfigurationSectionName} configuration section is missing or empty.");
-            // }
+            var validator = app.ApplicationServices.GetRequiredService<IEndPointValidator>();
+            validator.Validate(endPoints);
 
             foreach (SwaggerEndPointOptions endPoint in endPoints)
             {
                 foreach (SwaggerEndPointConfig config in endPoint.Config)
                 {
-                    c.SwaggerEndpoint($"{basePath}/{config.Version}/{endPoint.KeyToPath}", GetDescription(config));
+                    swaggerOptions.SwaggerEndpoint($"{basePath}/{config.Version}/{endPoint.KeyToPath}",
+                        GetDescription(config));
                 }
             }
         }
diff --git a/src/MMLib.SwaggerForOcelot/Repositories/ConsulSwaggerEndpointProvider.cs b/src/MMLib.SwaggerForOcelot/Repositories/EndPointProviders/ConsulSwaggerEndpointProvider.cs
similarity index 96%
rename from src/MMLib.SwaggerForOcelot/Repositories/ConsulSwaggerEndpointProvider.cs
rename to src/MMLib.SwaggerForOcelot/Repositories/EndPointProviders/ConsulSwaggerEndpointProvider.cs
index 57c0c12..cbbc50e 100644
--- a/src/MMLib.SwaggerForOcelot/Repositories/ConsulSwaggerEndpointProvider.cs
+++ b/src/MMLib.SwaggerForOcelot/Repositories/EndPointProviders/ConsulSwaggerEndpointProvider.cs
@@ -14,7 +14,7 @@ public class ConsulSwaggerEndpointProvider : ISwaggerEndPointProvider
     /// <summary>
     ///
     /// </summary>
-    public IConsulServiceDiscovery _service { get; set; }
+    private IConsulServiceDiscovery _service;
 
     /// <summary>
     ///
diff --git a/src/MMLib.SwaggerForOcelot/Repositories/ISwaggerEndPointProvider.cs b/src/MMLib.SwaggerForOcelot/Repositories/EndPointProviders/ISwaggerEndPointProvider.cs
similarity index 100%
rename from src/MMLib.SwaggerForOcelot/Repositories/ISwaggerEndPointProvider.cs
rename to src/MMLib.SwaggerForOcelot/Repositories/EndPointProviders/ISwaggerEndPointProvider.cs
diff --git a/src/MMLib.SwaggerForOcelot/Repositories/SwaggerEndPointProvider.cs b/src/MMLib.SwaggerForOcelot/Repositories/EndPointProviders/SwaggerEndPointProvider.cs
similarity index 100%
rename from src/MMLib.SwaggerForOcelot/Repositories/SwaggerEndPointProvider.cs
rename to src/MMLib.SwaggerForOcelot/Repositories/EndPointProviders/SwaggerEndPointProvider.cs
diff --git a/src/MMLib.SwaggerForOcelot/Repositories/EndPointValidators/ConsulEndPointValidator.cs b/src/MMLib.SwaggerForOcelot/Repositories/EndPointValidators/ConsulEndPointValidator.cs
new file mode 100644
index 0000000..912a76c
--- /dev/null
+++ b/src/MMLib.SwaggerForOcelot/Repositories/EndPointValidators/ConsulEndPointValidator.cs
@@ -0,0 +1,18 @@
+using MMLib.SwaggerForOcelot.Configuration;
+using System.Collections.Generic;
+
+namespace MMLib.SwaggerForOcelot.Repositories.EndPointValidators;
+
+/// <summary>
+///
+/// </summary>
+public class ConsulEndPointValidator : IEndPointValidator
+{
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="endPoints"></param>
+    public void Validate(IReadOnlyList<SwaggerEndPointOptions> endPoints)
+    {
+    }
+}
diff --git a/src/MMLib.SwaggerForOcelot/Repositories/EndPointValidators/EndPointValidator.cs b/src/MMLib.SwaggerForOcelot/Repositories/EndPointValidators/EndPointValidator.cs
new file mode 100644
index 0000000..e1669b9
--- /dev/null
+++ b/src/MMLib.SwaggerForOcelot/Repositories/EndPointValidators/EndPointValidator.cs
@@ -0,0 +1,24 @@
+using MMLib.SwaggerForOcelot.Configuration;
+using System;
+using System.Collections.Generic;
+
+namespace MMLib.SwaggerForOcelot.Repositories.EndPointValidators;
+
+/// <summary>
+///
+/// </summary>
+public class EndPointValidator : IEndPointValidator
+{
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="endPoints"></param>
+    public void Validate(IReadOnlyList<SwaggerEndPointOptions> endPoints)
+    {
+        if (endPoints is null || endPoints.Count == 0)
+        {
+            throw new InvalidOperationException(
+                $"{SwaggerEndPointOptions.ConfigurationSectionName} configuration section is missing or empty.");
+        }
+    }
+}
diff --git a/src/MMLib.SwaggerForOcelot/Repositories/EndPointValidators/IEndPointValidator.cs b/src/MMLib.SwaggerForOcelot/Repositories/EndPointValidators/IEndPointValidator.cs
new file mode 100644
index 0000000..22a6817
--- /dev/null
+++ b/src/MMLib.SwaggerForOcelot/Repositories/EndPointValidators/IEndPointValidator.cs
@@ -0,0 +1,16 @@
+using MMLib.SwaggerForOcelot.Configuration;
+using System.Collections.Generic;
+
+namespace MMLib.SwaggerForOcelot.Repositories.EndPointValidators;
+
+/// <summary>
+///
+/// </summary>
+public interface IEndPointValidator
+{
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="endPoints"></param>
+    void Validate(IReadOnlyList<SwaggerEndPointOptions> endPoints);
+}
diff --git a/src/MMLib.SwaggerForOcelot/Repositories/EndPointsMonitor/ConsulSwaggerEndpointsMonitor.cs b/src/MMLib.SwaggerForOcelot/Repositories/EndPointsMonitor/ConsulSwaggerEndpointsMonitor.cs
new file mode 100644
index 0000000..8605453
--- /dev/null
+++ b/src/MMLib.SwaggerForOcelot/Repositories/EndPointsMonitor/ConsulSwaggerEndpointsMonitor.cs
@@ -0,0 +1,79 @@
+#nullable enable
+using Microsoft.Extensions.Options;
+using MMLib.SwaggerForOcelot.Configuration;
+using Swashbuckle.AspNetCore.Swagger;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace MMLib.SwaggerForOcelot.Repositories;
+
+/// <summary>
+///
+/// </summary>
+public class ConsulSwaggerEndpointsMonitor : ISwaggerEndpointsMonitor
+{
+    /// <summary>
+    ///
+    /// </summary>
+    private readonly IOptionsMonitor<List<SwaggerEndPointOptions>> _optionsMonitor;
+
+    /// <summary>
+    ///
+    /// </summary>
+    private readonly IConsulEndpointOptionsMonitor _consulOptionsMonitor;
+
+    /// <summary>
+    ///
+    /// </summary>
+    public event EventHandler<List<SwaggerEndPointOptions>> OptionsChanged;
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="optionsMonitor"></param>
+    /// <param name="consulOptionsMonitor"></param>
+    public ConsulSwaggerEndpointsMonitor(IOptionsMonitor<List<SwaggerEndPointOptions>> optionsMonitor,
+        IConsulEndpointOptionsMonitor consulOptionsMonitor)
+    {
+        _optionsMonitor = optionsMonitor;
+        _consulOptionsMonitor = consulOptionsMonitor;
+        _optionsMonitor.OnChange(ConfigChanged);
+        _consulOptionsMonitor.OptionsChanged +=(s,e) => ConfigChanged(e);
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="configOptions"></param>
+    /// <returns></returns>
+    private void ConfigChanged(List<SwaggerEndPointOptions> configOptions)
+    {
+        var options = ConcatOptions(_optionsMonitor.CurrentValue, _consulOptionsMonitor.CurrentValue);
+        CallOptionsChanged(options);
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="configOptions"></param>
+    /// <param name="localOptions"></param>
+    /// <returns></returns>
+    protected virtual List<SwaggerEndPointOptions> ConcatOptions(List<SwaggerEndPointOptions> configOptions,
+        List<SwaggerEndPointOptions> localOptions)
+    {
+        return configOptions
+            .Concat(localOptions)
+            .DistinctBy(s => s.Key)
+            .ToList();
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="options"></param>
+    protected virtual void CallOptionsChanged(List<SwaggerEndPointOptions> options)
+    {
+        OptionsChanged?.Invoke(this, options);
+    }
+}
diff --git a/src/MMLib.SwaggerForOcelot/Repositories/EndPointsMonitor/ISwaggerEndpointsMonitor.cs b/src/MMLib.SwaggerForOcelot/Repositories/EndPointsMonitor/ISwaggerEndpointsMonitor.cs
new file mode 100644
index 0000000..ee34f3f
--- /dev/null
+++ b/src/MMLib.SwaggerForOcelot/Repositories/EndPointsMonitor/ISwaggerEndpointsMonitor.cs
@@ -0,0 +1,16 @@
+using MMLib.SwaggerForOcelot.Configuration;
+using System;
+using System.Collections.Generic;
+
+namespace MMLib.SwaggerForOcelot.Repositories;
+
+/// <summary>
+///
+/// </summary>
+public interface ISwaggerEndpointsMonitor
+{
+    /// <summary>
+    ///
+    /// </summary>
+    event EventHandler<List<SwaggerEndPointOptions>> OptionsChanged;
+}
diff --git a/src/MMLib.SwaggerForOcelot/Repositories/EndPointsMonitor/SwaggerEndpointsMonitor.cs b/src/MMLib.SwaggerForOcelot/Repositories/EndPointsMonitor/SwaggerEndpointsMonitor.cs
new file mode 100644
index 0000000..08cb277
--- /dev/null
+++ b/src/MMLib.SwaggerForOcelot/Repositories/EndPointsMonitor/SwaggerEndpointsMonitor.cs
@@ -0,0 +1,52 @@
+#nullable enable
+using Microsoft.Extensions.Options;
+using MMLib.SwaggerForOcelot.Configuration;
+using System;
+using System.Collections.Generic;
+
+namespace MMLib.SwaggerForOcelot.Repositories;
+
+/// <summary>
+///
+/// </summary>
+public class SwaggerEndpointsMonitor : ISwaggerEndpointsMonitor
+{
+    /// <summary>
+    ///
+    /// </summary>
+    private readonly IOptionsMonitor<List<SwaggerEndPointOptions>> _optionsMonitor;
+
+    /// <summary>
+    ///
+    /// </summary>
+    public event EventHandler<List<SwaggerEndPointOptions>> OptionsChanged;
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="optionsMonitor"></param>
+    public SwaggerEndpointsMonitor(IOptionsMonitor<List<SwaggerEndPointOptions>> optionsMonitor)
+    {
+        _optionsMonitor = optionsMonitor;
+        _optionsMonitor.OnChange(ConfigChanged);
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="configOptions"></param>
+    /// <returns></returns>
+    private void ConfigChanged(List<SwaggerEndPointOptions> configOptions)
+    {
+        CallOptionsChanged(_optionsMonitor.CurrentValue);
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="options"></param>
+    protected virtual void CallOptionsChanged(List<SwaggerEndPointOptions> options)
+    {
+        OptionsChanged?.Invoke(this, options);
+    }
+}
diff --git a/src/MMLib.SwaggerForOcelot/Repositories/OptionsMonitor/ConsulEndpointOptionsMonitor.cs b/src/MMLib.SwaggerForOcelot/Repositories/OptionsMonitor/ConsulEndpointOptionsMonitor.cs
new file mode 100644
index 0000000..a97eea7
--- /dev/null
+++ b/src/MMLib.SwaggerForOcelot/Repositories/OptionsMonitor/ConsulEndpointOptionsMonitor.cs
@@ -0,0 +1,116 @@
+using MMLib.SwaggerForOcelot.Configuration;
+using MMLib.SwaggerForOcelot.ServiceDiscovery.ConsulServiceDiscoveries;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Timers;
+
+namespace MMLib.SwaggerForOcelot.Repositories;
+
+/// <summary>
+///
+/// </summary>
+public class ConsulEndpointOptionsMonitor : IConsulEndpointOptionsMonitor
+{
+    /// <summary>
+    ///
+    /// </summary>
+    private readonly IConsulServiceDiscovery _service;
+
+    /// <summary>
+    ///
+    /// </summary>
+    private readonly Timer _timer;
+
+    /// <summary>
+    ///
+    /// </summary>
+    public event EventHandler<List<SwaggerEndPointOptions>> OptionsChanged;
+
+    /// <summary>
+    ///
+    /// </summary>
+    public List<SwaggerEndPointOptions> CurrentValue { get; private set; } = new();
+
+    /// <summary>
+    ///
+    /// </summary>
+    public ConsulEndpointOptionsMonitor(IConsulServiceDiscovery service)
+    {
+        _service = service;
+        _timer = new Timer(300);
+        _timer.Elapsed += (s, e) => TimerElapsed();
+        _timer.Start();
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    private void TimerElapsed()
+    {
+        try
+        {
+            TryGetConsulOptions();
+        }
+        catch (Exception ex)
+        {
+            _timer.Start();
+        }
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    private void TryGetConsulOptions()
+    {
+        _timer.Stop();
+
+        var services = _service
+            .GetServicesAsync()
+            .GetAwaiter()
+            .GetResult();
+
+        if (!IsOptionsChanged(services))
+        {
+            _timer.Start();
+            return;
+        }
+
+        CurrentValue = services;
+        OptionsChanged?.Invoke(this, CurrentValue);
+        _timer.Start();
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="services"></param>
+    /// <returns></returns>
+    private bool IsOptionsChanged(List<SwaggerEndPointOptions> services)
+    {
+        var newValues = services.ToList();
+        var oldValues = CurrentValue.ToList();
+        if (newValues.Count != oldValues.Count)
+            return true;
+
+        if (oldValues.Any(a => newValues.All(c => c.Key != a.Key)))
+            return true;
+
+        return oldValues.Any(a => IsConfigChanged(a, newValues));
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="endpoint"></param>
+    /// <param name="newValues"></param>
+    /// <returns></returns>
+    private bool IsConfigChanged(SwaggerEndPointOptions endpoint, List<SwaggerEndPointOptions> newValues)
+    {
+        var newEndpoint = newValues.FirstOrDefault(f => f.Key == endpoint.Key);
+        if (newEndpoint is null)
+            return true;
+
+        return endpoint.Config.Any(a => newEndpoint.Config.All(c => c.Name != a.Name || c.Version != a.Version));
+    }
+}
diff --git a/src/MMLib.SwaggerForOcelot/Repositories/OptionsMonitor/IConsulEndpointOptionsMonitor.cs b/src/MMLib.SwaggerForOcelot/Repositories/OptionsMonitor/IConsulEndpointOptionsMonitor.cs
new file mode 100644
index 0000000..8d5b0f5
--- /dev/null
+++ b/src/MMLib.SwaggerForOcelot/Repositories/OptionsMonitor/IConsulEndpointOptionsMonitor.cs
@@ -0,0 +1,21 @@
+using MMLib.SwaggerForOcelot.Configuration;
+using System;
+using System.Collections.Generic;
+
+namespace MMLib.SwaggerForOcelot.Repositories;
+
+/// <summary>
+///
+/// </summary>
+public interface IConsulEndpointOptionsMonitor
+{
+    /// <summary>
+    ///
+    /// </summary>
+    event EventHandler<List<SwaggerEndPointOptions>> OptionsChanged;
+
+    /// <summary>
+    ///
+    /// </summary>
+    List<SwaggerEndPointOptions> CurrentValue { get; }
+}
diff --git a/src/MMLib.SwaggerForOcelot/Repositories/DownstreamSwaggerDocsRepository.cs b/src/MMLib.SwaggerForOcelot/Repositories/SwaggerDocs/DownstreamSwaggerDocsRepository.cs
similarity index 100%
rename from src/MMLib.SwaggerForOcelot/Repositories/DownstreamSwaggerDocsRepository.cs
rename to src/MMLib.SwaggerForOcelot/Repositories/SwaggerDocs/DownstreamSwaggerDocsRepository.cs
diff --git a/src/MMLib.SwaggerForOcelot/Repositories/IDownstreamSwaggerDocsRepository.cs b/src/MMLib.SwaggerForOcelot/Repositories/SwaggerDocs/IDownstreamSwaggerDocsRepository.cs
similarity index 100%
rename from src/MMLib.SwaggerForOcelot/Repositories/IDownstreamSwaggerDocsRepository.cs
rename to src/MMLib.SwaggerForOcelot/Repositories/SwaggerDocs/IDownstreamSwaggerDocsRepository.cs
diff --git a/src/MMLib.SwaggerForOcelot/ServiceDiscovery/ConsulServiceDiscoveries/ConsulServiceDisvovery.cs b/src/MMLib.SwaggerForOcelot/ServiceDiscovery/ConsulServiceDiscoveries/ConsulServiceDisvovery.cs
index 0680259..e8fbb54 100644
--- a/src/MMLib.SwaggerForOcelot/ServiceDiscovery/ConsulServiceDiscoveries/ConsulServiceDisvovery.cs
+++ b/src/MMLib.SwaggerForOcelot/ServiceDiscovery/ConsulServiceDiscoveries/ConsulServiceDisvovery.cs
@@ -54,24 +54,61 @@ private async Task<List<SwaggerEndPointOptions>> GetConsulServices()
     {
         var services = await _consulClient.Agent.Services();
 
-        var endpoints = services.Response
-            .Select(service => new SwaggerEndPointOptions
-            {
-                Key = service.Key,
-                TransformByOcelotConfig = false,
-                Config = service.Value.Meta
-                    .Where(w => w.Key.StartsWith("swagger"))
-                    .Select(swagger => new SwaggerEndPointConfig
-                    {
-                        Name = $"{service.Value.Service} API",
-                        Version = swagger.Value,
-                        Service = new SwaggerService
-                        {
-                            Name = service.Value.Service, Path = $"swagger/{swagger.Value}/swagger.json"
-                        }
-                    }).ToList()
-            }).ToList();
+        return services.Response
+            .Select(s => ConvertToOption(s.Key, s.Value))
+            .ToList();
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="key"></param>
+    /// <param name="service"></param>
+    /// <returns></returns>
+    private SwaggerEndPointOptions ConvertToOption(string key, AgentService service)
+    {
+        var option = new SwaggerEndPointOptions();
+        option.Key = key;
+        option.TransformByOcelotConfig = false;
+        option.Config = service.Meta
+            .Where(w => w.Key.StartsWith("swagger"))
+            .Select(swagger => ConvertToConfig(swagger, service))
+            .ToList();
+
+        if (option.Config.Count == 0)
+            option.Config.Add(DefaultConfig(service));
+
+        return option;
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="swagger"></param>
+    /// <param name="service"></param>
+    /// <returns></returns>
+    private SwaggerEndPointConfig ConvertToConfig(KeyValuePair<string, string> swagger, AgentService service)
+    {
+        var config = new SwaggerEndPointConfig();
+        config.Name = $"{service.Service} API";
+        config.Version = swagger.Value;
+        config.Service = new SwaggerService { Name = service.Service, Path = $"swagger/{swagger.Value}/swagger.json" };
+
+        return config;
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="service"></param>
+    /// <returns></returns>
+    private SwaggerEndPointConfig DefaultConfig(AgentService service)
+    {
+        var config = new SwaggerEndPointConfig();
+        config.Name = $"{service.Service} API";
+        config.Version = "v1";
+        config.Service = new SwaggerService { Name = service.Service, Path = $"swagger/{config.Version}/swagger.json" };
 
-        return endpoints;
+        return config;
     }
 }