diff --git a/NDbUnit.sln b/NDbUnit.sln
index 7df3e1f..e228e71 100644
--- a/NDbUnit.sln
+++ b/NDbUnit.sln
@@ -12,6 +12,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1. Build", "1. Build", "{11
 		.travis.yml = .travis.yml
 		src\ndbunit.targets.xml = src\ndbunit.targets.xml
 		NuGet.config = NuGet.config
+		scripts\build-setup.ps1 = scripts\build-setup.ps1
+		scripts\test-setup-databases.ps1 = scripts\test-setup-databases.ps1
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2. Src", "2. Src", "{7DD0FF84-8EAD-47F0-A208-021413504642}"
diff --git a/NuGet.config b/NuGet.config
index 19eb349..6bf733a 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -12,8 +12,8 @@
     <add key="automatic" value="True" />
   </packageRestore>
   <packageSources>
-    <add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
+    <!-- <add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" /> -->
     <add key="DotNet Core extensions source" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
-    <add key="Bintray unstable package source" value="https://api.bintray.com/nuget/savornicesei/NDbUnit2" />
-    </packageSources>
+    <add key="Bintray NuGet bundles package source" value="https://dl.bintray.com/savornicesei/nuget-bundles" />
+  </packageSources>
 </configuration>
\ No newline at end of file
diff --git a/scripts/build-setup.ps1 b/scripts/build-setup.ps1
new file mode 100644
index 0000000..4b38d8c
--- /dev/null
+++ b/scripts/build-setup.ps1
@@ -0,0 +1,32 @@
+<# 
+.SYNOPSIS
+     Prepares env. (win or linux or mac) for building NDbUnit2
+.DESCRIPTION
+     Prepares the build environment by:
+     - downloading NUnit console runner
+     - downloading OpenCover
+     - downloading coveralls.net
+     The script is agnostic to the platform it is run on (windows, linux or mac)
+.INPUTTYPE
+   Documentary text, eg:
+   Input type  [Universal.SolarSystem.Planetary.CommonSense]
+   Appears in -full
+.RETURNVALUE
+   Documentary Text, eg:
+   Output type  [Universal.SolarSystem.Planetary.Wisdom]
+   Appears in -full
+#>
+import-module PackageManagement
+
+function Build-Setup{
+	param
+    (
+		[Parameter(Mandatory = $true, HelpMessage = "Some dummy parameter.")]
+        [String]
+		$Name
+	)
+
+	
+
+
+}
\ No newline at end of file
diff --git a/scripts/test-setup-databases.ps1 b/scripts/test-setup-databases.ps1
new file mode 100644
index 0000000..02f201e
--- /dev/null
+++ b/scripts/test-setup-databases.ps1
@@ -0,0 +1,15 @@
+<# .SYNOPSIS
+     Prepares env. (win or linux or mac) for building NDbUnit2
+.DESCRIPTION
+     Prepares the build environment by:
+     - downloading NUnit console runner
+     - downloading OpenCover
+     - downloading coveralls.net
+     The script is agnostic to the platform it is run on (windows, linux or mac)
+SYNTAX
+     build-setup.ps1 []
+.NOTES
+     Author     : Thomas Lee - tfl@psp.co.uk
+.LINK
+     https://github.com/savornicesei/NDbUnit2
+#>
\ No newline at end of file
diff --git a/src/NDbUnit.OracleClient/NDbUnit.OracleClient.csproj b/src/NDbUnit.OracleClient/NDbUnit.OracleClient.csproj
index 01c5714..5e928d9 100644
--- a/src/NDbUnit.OracleClient/NDbUnit.OracleClient.csproj
+++ b/src/NDbUnit.OracleClient/NDbUnit.OracleClient.csproj
@@ -2,13 +2,12 @@
   <Import Project="../ndbunit.targets.xml" />
   
   <PropertyGroup>
-    <TargetFrameworks>net452</TargetFrameworks>
+    <TargetFrameworks>net452;</TargetFrameworks>
     <PackageId>NDbUnit2.Oracle</PackageId>
   </PropertyGroup>
 
   <!-- common NuGet package refs -->
   <ItemGroup>
-    <PackageReference Include="Oracle.ManagedDataAccess" Version="12.2.1100" />
   </ItemGroup>
 
   <!-- .NET Standard 2.0 references and build options -->
@@ -19,6 +18,11 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452'">
   </ItemGroup>
 
+  <!-- .NET standard references and build options -->
+  <ItemGroup Condition="$(DefineConstants.Contains(NETSTANDARD))">
+    <!--<PackageReference Include="Oracle.ManagedDataAccess" Version="12.2.beta1" />-->
+  </ItemGroup>
+
   <!-- .NET framework references and build options -->
   <ItemGroup Condition="$(DefineConstants.Contains(NETFULL))">
     <Reference Include="Microsoft.CSharp" />
@@ -29,6 +33,9 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
+  <ItemGroup Condition="$(DefineConstants.Contains(NETFULL))">
+    <PackageReference Include="Oracle.ManagedDataAccess" Version="12.2.1100" />
+  </ItemGroup>
   
   <ItemGroup>
     <ProjectReference Include="..\NDbUnit.Core\NDbUnit.Core.csproj" />