diff --git a/reinforcement_learning/rlclientlib/azure_factories.cc b/reinforcement_learning/rlclientlib/azure_factories.cc
new file mode 100644
index 00000000000..596fa6dd08e
--- /dev/null
+++ b/reinforcement_learning/rlclientlib/azure_factories.cc
@@ -0,0 +1,64 @@
+#include "factory_resolver.h"
+#include "constants.h"
+#include "model_mgmt/restapi_data_transport.h"
+#include "logger/event_logger.h"
+
+namespace reinforcement_learning {
+  namespace m = model_management;
+  namespace u = utility;
+
+  int restapi_data_tranport_create(m::i_data_transport** retval, const u::configuration& config, i_trace* trace_logger, api_status* status);
+  int vw_model_create(m::i_model** retval, const u::configuration&, i_trace* trace_logger, api_status* status);
+  int observation_sender_create(i_sender** retval, const u::configuration&, error_callback_fn*, i_trace* trace_logger, api_status* status);
+  int interaction_sender_create(i_sender** retval, const u::configuration&, error_callback_fn*, i_trace* trace_logger, api_status* status);
+  int null_tracer_create(i_trace** retval, const u::configuration&, i_trace* trace_logger, api_status* status);
+  int console_tracer_create(i_trace** retval, const u::configuration&, i_trace* trace_logger, api_status* status);
+
+  void register_azure_factories() {
+    data_transport_factory.register_type(value::AZURE_STORAGE_BLOB, restapi_data_tranport_create);
+    sender_factory.register_type(value::OBSERVATION_EH_SENDER, observation_sender_create);
+    sender_factory.register_type(value::INTERACTION_EH_SENDER, interaction_sender_create);
+  }
+
+  int restapi_data_tranport_create(m::i_data_transport** retval, const u::configuration& config, i_trace* trace_logger, api_status* status) {
+    const auto uri = config.get(name::MODEL_BLOB_URI, nullptr);
+    if (uri == nullptr) {
+      api_status::try_update(status, error_code::http_uri_not_provided, error_code::http_uri_not_provided_s);
+      return error_code::http_uri_not_provided;
+    }
+    auto pret = new m::restapi_data_tranport(uri, trace_logger);
+    const auto scode = pret->check(status);
+    if (scode != error_code::success) {
+      delete pret;
+      return scode;
+    }
+    *retval = pret;
+    return error_code::success;
+  }
+
+  int observation_sender_create(i_sender** retval, const u::configuration& cfg, error_callback_fn* _error_cb, i_trace* trace_logger, api_status* status) {
+    *retval = new eventhub_client(
+      cfg.get(name::OBSERVATION_EH_HOST, "localhost:8080"),
+      cfg.get(name::OBSERVATION_EH_KEY_NAME, ""),
+      cfg.get(name::OBSERVATION_EH_KEY, ""),
+      cfg.get(name::OBSERVATION_EH_NAME, "observation"),
+      cfg.get_int(name::OBSERVATION_EH_TASKS_LIMIT, 16),
+      trace_logger,
+      _error_cb,
+      cfg.get_bool(name::EH_TEST, false));
+    return error_code::success;
+  }
+
+  int interaction_sender_create(i_sender** retval, const u::configuration& cfg, error_callback_fn* _error_cb, i_trace* trace_logger, api_status* status) {
+    *retval = new eventhub_client(
+      cfg.get(name::INTERACTION_EH_HOST, "localhost:8080"),
+      cfg.get(name::INTERACTION_EH_KEY_NAME, ""),
+      cfg.get(name::INTERACTION_EH_KEY, ""),
+      cfg.get(name::INTERACTION_EH_NAME, "interaction"),
+      cfg.get_int(name::INTERACTION_EH_TASKS_LIMIT, 16),
+      trace_logger,
+      _error_cb,
+      cfg.get_bool(name::EH_TEST, false));
+    return error_code::success;
+  }
+}
diff --git a/reinforcement_learning/rlclientlib/azure_factories.h b/reinforcement_learning/rlclientlib/azure_factories.h
new file mode 100644
index 00000000000..f310aef1d75
--- /dev/null
+++ b/reinforcement_learning/rlclientlib/azure_factories.h
@@ -0,0 +1,5 @@
+#pragma once
+
+namespace reinforcement_learning {
+  void register_azure_factories();
+}
diff --git a/reinforcement_learning/rlclientlib/rlclientlib.vcxproj b/reinforcement_learning/rlclientlib/rlclientlib.vcxproj
index 8b5bd78977b..37be347fb77 100644
--- a/reinforcement_learning/rlclientlib/rlclientlib.vcxproj
+++ b/reinforcement_learning/rlclientlib/rlclientlib.vcxproj
@@ -1,219 +1,221 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C40E3263-B6FF-46D5-92F7-D67E6F9FCEDD}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>rlclientlib</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-    <ProjectName>rlclientlib</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\rapidjson\include;$(SolutionDir)..\reinforcement_learning\rlclientlib;$(SolutionDir)..\reinforcement_learning\include;$(SolutionDir)..\explore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\reinforcement_learning\ext_libs;$(SolutionDir)..\rapidjson\include;$(SolutionDir)..\reinforcement_learning\rlclientlib;$(SolutionDir)..\reinforcement_learning\include;$(SolutionDir)..\explore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\rapidjson\include;$(SolutionDir)..\reinforcement_learning\rlclientlib;$(SolutionDir)..\reinforcement_learning\include;$(SolutionDir)..\explore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\reinforcement_learning\ext_libs;$(SolutionDir)..\rapidjson\include;$(SolutionDir)..\reinforcement_learning\rlclientlib;$(SolutionDir)..\reinforcement_learning\include;$(SolutionDir)..\explore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <Text Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\api_status.h" />
-    <ClInclude Include="..\include\configuration.h" />
-    <ClInclude Include="..\include\live_model.h" />
-    <ClInclude Include="..\include\sender.h" />
-    <ClInclude Include="..\include\object_factory.h" />
-    <ClInclude Include="..\include\personalization.h" />
-    <ClInclude Include="..\include\ranking_response.h" />
-    <ClInclude Include="..\include\config_utility.h" />
-    <ClInclude Include="..\include\constants.h" />
-    <ClInclude Include="..\include\err_constants.h" />
-    <ClInclude Include="..\include\factory_resolver.h" />
-    <ClInclude Include="..\include\model_mgmt.h" />
-    <ClInclude Include="..\include\str_util.h" />
-    <ClInclude Include="..\include\trace_logger.h" />
-    <ClInclude Include="console_tracer.h" />
-    <ClInclude Include="logger\event_logger.h" />
-    <ClInclude Include="moving_queue.h" />
-    <ClInclude Include="utility\context_helper.h" />
-    <ClInclude Include="utility\data_buffer.h" />
-    <ClInclude Include="utility\interruptable_sleeper.h" />
-    <ClInclude Include="utility\periodic_background_proc.h" />
-    <ClInclude Include="utility\object_pool.h" />
-    <ClCompile Include="async_batcher.cc" />
-    <ClCompile Include="console_tracer.cc" />
-    <ClCompile Include="logger\event_logger.cc" />
-    <ClCompile Include="trace_logger.cc" />
-    <ClCompile Include="utility\data_buffer.cc" />
-    <ClCompile Include="utility\http_helper.h" />
-    <ClInclude Include="model_mgmt\model_downloader.h" />
-    <ClInclude Include="model_mgmt\data_callback_fn.h" />
-    <ClInclude Include="model_mgmt\restapi_data_transport.h" />
-    <ClInclude Include="logger\async_batcher.h" />
-    <ClInclude Include="logger\event_queue.h" />
-    <ClInclude Include="logger\eventhub_client.h" />
-    <ClInclude Include="utility\watchdog.h" />
-    <ClInclude Include="vw_model\vw_model.h" />
-    <ClInclude Include="vw_model\safe_vw.h" />
-    <ClInclude Include="live_model_impl.h" />
-    <ClInclude Include="error_callback_fn.h" />
-    <ClInclude Include="ranking_event.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="model_mgmt\model_downloader.cc" />
-    <ClCompile Include="model_mgmt\restapi_data_transport.cc" />
-    <ClCompile Include="model_mgmt\data_callback_fn.cc" />
-    <ClCompile Include="model_mgmt\model_mgmt.cc" />
-    <ClCompile Include="logger\eventhub_client.cc" />
-    <ClCompile Include="utility\config_utility.cc" />
-    <ClCompile Include="utility\str_util.cc" />
-    <ClCompile Include="utility\context_helper.cc" />
-    <ClCompile Include="utility\configuration.cc" />
-    <ClCompile Include="utility\watchdog.cc" />
-    <ClCompile Include="vw_model\vw_model.cc" />
-    <ClCompile Include="vw_model\safe_vw.cc" />
-    <ClCompile Include="factory_resolver.cc" />
-    <ClCompile Include="live_model_impl.cc" />
-    <ClCompile Include="error_callback_fn.cc" />
-    <ClCompile Include="api_status.cc" />
-    <ClCompile Include="live_model.cc" />
-    <ClCompile Include="ranking_event.cc" />
-    <ClCompile Include="ranking_response.cc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\vowpalwabbit\vw_core.vcxproj">
-      <Project>{1e205806-7f80-47dd-a38d-fc08083f3593}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\vowpalwabbit\packages\boost.1.63.0.0\build\native\boost.targets" Condition="Exists('..\..\vowpalwabbit\packages\boost.1.63.0.0\build\native\boost.targets')" />
-  </ImportGroup>
-  <Import Project="$(VcpkgIntegration)" Condition="Exists('$(VcpkgIntegration)')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\vowpalwabbit\packages\boost.1.63.0.0\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\vowpalwabbit\packages\boost.1.63.0.0\build\native\boost.targets'))" />
-  </Target>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C40E3263-B6FF-46D5-92F7-D67E6F9FCEDD}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>rlclientlib</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <ProjectName>rlclientlib</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\rapidjson\include;$(SolutionDir)..\reinforcement_learning\rlclientlib;$(SolutionDir)..\reinforcement_learning\include;$(SolutionDir)..\explore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\reinforcement_learning\ext_libs;$(SolutionDir)..\rapidjson\include;$(SolutionDir)..\reinforcement_learning\rlclientlib;$(SolutionDir)..\reinforcement_learning\include;$(SolutionDir)..\explore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\rapidjson\include;$(SolutionDir)..\reinforcement_learning\rlclientlib;$(SolutionDir)..\reinforcement_learning\include;$(SolutionDir)..\explore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\reinforcement_learning\ext_libs;$(SolutionDir)..\rapidjson\include;$(SolutionDir)..\reinforcement_learning\rlclientlib;$(SolutionDir)..\reinforcement_learning\include;$(SolutionDir)..\explore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\include\api_status.h" />
+    <ClInclude Include="..\include\configuration.h" />
+    <ClInclude Include="..\include\live_model.h" />
+    <ClInclude Include="..\include\sender.h" />
+    <ClInclude Include="..\include\object_factory.h" />
+    <ClInclude Include="..\include\personalization.h" />
+    <ClInclude Include="..\include\ranking_response.h" />
+    <ClInclude Include="..\include\config_utility.h" />
+    <ClInclude Include="..\include\constants.h" />
+    <ClInclude Include="..\include\err_constants.h" />
+    <ClInclude Include="..\include\factory_resolver.h" />
+    <ClInclude Include="..\include\model_mgmt.h" />
+    <ClInclude Include="..\include\str_util.h" />
+    <ClInclude Include="..\include\trace_logger.h" />
+    <ClInclude Include="azure_factories.h" />
+    <ClInclude Include="console_tracer.h" />
+    <ClInclude Include="logger\event_logger.h" />
+    <ClInclude Include="moving_queue.h" />
+    <ClInclude Include="utility\context_helper.h" />
+    <ClInclude Include="utility\data_buffer.h" />
+    <ClInclude Include="utility\interruptable_sleeper.h" />
+    <ClInclude Include="utility\periodic_background_proc.h" />
+    <ClInclude Include="utility\object_pool.h" />
+    <ClCompile Include="async_batcher.cc" />
+    <ClCompile Include="azure_factories.cc" />
+    <ClCompile Include="console_tracer.cc" />
+    <ClCompile Include="logger\event_logger.cc" />
+    <ClCompile Include="trace_logger.cc" />
+    <ClCompile Include="utility\data_buffer.cc" />
+    <ClCompile Include="utility\http_helper.h" />
+    <ClInclude Include="model_mgmt\model_downloader.h" />
+    <ClInclude Include="model_mgmt\data_callback_fn.h" />
+    <ClInclude Include="model_mgmt\restapi_data_transport.h" />
+    <ClInclude Include="logger\async_batcher.h" />
+    <ClInclude Include="logger\event_queue.h" />
+    <ClInclude Include="logger\eventhub_client.h" />
+    <ClInclude Include="utility\watchdog.h" />
+    <ClInclude Include="vw_model\vw_model.h" />
+    <ClInclude Include="vw_model\safe_vw.h" />
+    <ClInclude Include="live_model_impl.h" />
+    <ClInclude Include="error_callback_fn.h" />
+    <ClInclude Include="ranking_event.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="model_mgmt\model_downloader.cc" />
+    <ClCompile Include="model_mgmt\restapi_data_transport.cc" />
+    <ClCompile Include="model_mgmt\data_callback_fn.cc" />
+    <ClCompile Include="model_mgmt\model_mgmt.cc" />
+    <ClCompile Include="logger\eventhub_client.cc" />
+    <ClCompile Include="utility\config_utility.cc" />
+    <ClCompile Include="utility\str_util.cc" />
+    <ClCompile Include="utility\context_helper.cc" />
+    <ClCompile Include="utility\configuration.cc" />
+    <ClCompile Include="utility\watchdog.cc" />
+    <ClCompile Include="vw_model\vw_model.cc" />
+    <ClCompile Include="vw_model\safe_vw.cc" />
+    <ClCompile Include="factory_resolver.cc" />
+    <ClCompile Include="live_model_impl.cc" />
+    <ClCompile Include="error_callback_fn.cc" />
+    <ClCompile Include="api_status.cc" />
+    <ClCompile Include="live_model.cc" />
+    <ClCompile Include="ranking_event.cc" />
+    <ClCompile Include="ranking_response.cc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\vowpalwabbit\vw_core.vcxproj">
+      <Project>{1e205806-7f80-47dd-a38d-fc08083f3593}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\vowpalwabbit\packages\boost.1.63.0.0\build\native\boost.targets" Condition="Exists('..\..\vowpalwabbit\packages\boost.1.63.0.0\build\native\boost.targets')" />
+  </ImportGroup>
+  <Import Project="$(VcpkgIntegration)" Condition="Exists('$(VcpkgIntegration)')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\vowpalwabbit\packages\boost.1.63.0.0\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\vowpalwabbit\packages\boost.1.63.0.0\build\native\boost.targets'))" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/reinforcement_learning/rlclientlib/rlclientlib.vcxproj.filters b/reinforcement_learning/rlclientlib/rlclientlib.vcxproj.filters
index e462d8011da..ca52d1695d7 100644
--- a/reinforcement_learning/rlclientlib/rlclientlib.vcxproj.filters
+++ b/reinforcement_learning/rlclientlib/rlclientlib.vcxproj.filters
@@ -25,6 +25,7 @@
     <ClCompile Include="utility\watchdog.cc" />
     <ClCompile Include="console_tracer.cc" />
     <ClCompile Include="trace_logger.cc" />
+    <ClCompile Include="azure_factories.cc" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\api_status.h" />
@@ -61,6 +62,7 @@
     <ClInclude Include="moving_queue.h" />
     <ClInclude Include="..\include\trace_logger.h" />
     <ClInclude Include="console_tracer.h" />
+    <ClInclude Include="azure_factories.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />