diff --git a/src/GUI/EFCorePowerTools/Contracts/ViewModels/IPickServerDatabaseViewModel.cs b/src/GUI/EFCorePowerTools/Contracts/ViewModels/IPickServerDatabaseViewModel.cs
index 180472832..3ba1188ed 100644
--- a/src/GUI/EFCorePowerTools/Contracts/ViewModels/IPickServerDatabaseViewModel.cs
+++ b/src/GUI/EFCorePowerTools/Contracts/ViewModels/IPickServerDatabaseViewModel.cs
@@ -20,5 +20,7 @@ public interface IPickServerDatabaseViewModel : IViewModel
 
         DatabaseConnectionModel SelectedDatabaseConnection { get; set; }
         DatabaseDefinitionModel SelectedDatabaseDefinition { get; set; }
+
+        bool IncludeViews { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/GUI/EFCorePowerTools/Contracts/Views/IPickServerDatabaseDialog.cs b/src/GUI/EFCorePowerTools/Contracts/Views/IPickServerDatabaseDialog.cs
index a67a66d06..80dd7b4d5 100644
--- a/src/GUI/EFCorePowerTools/Contracts/Views/IPickServerDatabaseDialog.cs
+++ b/src/GUI/EFCorePowerTools/Contracts/Views/IPickServerDatabaseDialog.cs
@@ -3,7 +3,7 @@
     using System.Collections.Generic;
     using Shared.Models;
 
-    public interface IPickServerDatabaseDialog : IDialog<(DatabaseConnectionModel Connection, DatabaseDefinitionModel Definition)>
+    public interface IPickServerDatabaseDialog : IDialog<(DatabaseConnectionModel Connection, DatabaseDefinitionModel Definition, bool IncludeViews)>
     {
         void PublishConnections(IEnumerable<DatabaseConnectionModel> connections);
         void PublishDefinitions(IEnumerable<DatabaseDefinitionModel> definitions);
diff --git a/src/GUI/EFCorePowerTools/Dialogs/PickServerDatabaseDialog.xaml b/src/GUI/EFCorePowerTools/Dialogs/PickServerDatabaseDialog.xaml
index 26639a5c1..4f6b969c3 100644
--- a/src/GUI/EFCorePowerTools/Dialogs/PickServerDatabaseDialog.xaml
+++ b/src/GUI/EFCorePowerTools/Dialogs/PickServerDatabaseDialog.xaml
@@ -90,6 +90,14 @@
             </ComboBox.ItemTemplate>
         </ComboBox>
 
+        <StackPanel 
+            Grid.Row="3"
+                    Orientation="Horizontal"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center">
+            <CheckBox x:Name="IncludeViews" IsChecked="{Binding IncludeViews}" >Include views (requires EF Core 3.0)</CheckBox>
+        </StackPanel>
+        
         <StackPanel Grid.Row="3"
                     Orientation="Horizontal"
                     HorizontalAlignment="Right"
diff --git a/src/GUI/EFCorePowerTools/Dialogs/PickServerDatabaseDialog.xaml.cs b/src/GUI/EFCorePowerTools/Dialogs/PickServerDatabaseDialog.xaml.cs
index c72d7031c..6f69fc5bd 100644
--- a/src/GUI/EFCorePowerTools/Dialogs/PickServerDatabaseDialog.xaml.cs
+++ b/src/GUI/EFCorePowerTools/Dialogs/PickServerDatabaseDialog.xaml.cs
@@ -10,7 +10,7 @@
 
     public partial class PickServerDatabaseDialog : IPickServerDatabaseDialog
     {
-        private readonly Func<(DatabaseConnectionModel Connection, DatabaseDefinitionModel Definition)> _getDialogResult;
+        private readonly Func<(DatabaseConnectionModel Connection, DatabaseDefinitionModel Definition, bool IncludeViews)> _getDialogResult;
         private readonly Action<IEnumerable<DatabaseConnectionModel>> _addConnections;
         private readonly Action<IEnumerable<DatabaseDefinitionModel>> _addDefinitions;
 
@@ -25,7 +25,7 @@ public PickServerDatabaseDialog(ITelemetryAccess telemetryAccess,
                 DialogResult = args.DialogResult;
                 Close();
             };
-            _getDialogResult = () => (viewModel.SelectedDatabaseConnection, viewModel.SelectedDatabaseDefinition);
+            _getDialogResult = () => (viewModel.SelectedDatabaseConnection, viewModel.SelectedDatabaseDefinition, viewModel.IncludeViews);
             _addConnections = models =>
             {
                 foreach (var model in models)
@@ -45,7 +45,7 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
             DatabaseConnectionCombobox.Focus();
         }
 
-        public (bool ClosedByOK, (DatabaseConnectionModel Connection, DatabaseDefinitionModel Definition) Payload) ShowAndAwaitUserResponse(bool modal)
+        public (bool ClosedByOK, (DatabaseConnectionModel Connection, DatabaseDefinitionModel Definition, bool IncludeViews) Payload) ShowAndAwaitUserResponse(bool modal)
         {
             bool closedByOkay;
 
diff --git a/src/GUI/EFCorePowerTools/Dialogs/PickTablesDialog.xaml b/src/GUI/EFCorePowerTools/Dialogs/PickTablesDialog.xaml
index 1f71313b2..bff82cb25 100644
--- a/src/GUI/EFCorePowerTools/Dialogs/PickTablesDialog.xaml
+++ b/src/GUI/EFCorePowerTools/Dialogs/PickTablesDialog.xaml
@@ -32,15 +32,15 @@
                         <Setter Property="Margin" Value="0, 0, 5, 0"/>
                     </Style>
                     <Style x:Key="NoPrimaryKeyImageStyle" TargetType="Image">
-                        <Setter Property="ToolTip" Value="This table has no primary key defined. It cannot be selected and will be ignored."/>
-                        <Setter Property="Source" Value="/EFCorePowerTools;component/Resources/StatusInvalid_16x.png"/>
+                        <Setter Property="ToolTip" Value="This table (or view) has no primary key defined."/>
+                        <Setter Property="Source" Value="/EFCorePowerTools;component/Resources/TableWarning_16x.png"/>
                         <Setter Property="Width" Value="16"/>
                         <Setter Property="Height" Value="16"/>
                         <Setter Property="Margin" Value="5, 0, 0, 0"/>
                     </Style>
                     <Style x:Key="TableNameTextBlockStyle" TargetType="TextBlock">
                         <Style.Triggers>
-                            <DataTrigger Binding="{Binding Model.HasPrimaryKey}" Value="False">
+                            <DataTrigger Binding="{Binding Model.HasKey}" Value="False">
                                 <Setter Property="Foreground" Value="{StaticResource DisabledTextBlockTextColor}"/>
                             </DataTrigger>
                         </Style.Triggers>
@@ -106,7 +106,7 @@
                                     d:DataContext="{d:DesignInstance Type=viewModels:TableInformationViewModel, IsDesignTimeCreatable=false}">
                             <CheckBox Style="{StaticResource TableSelectionCheckBoxStyle}"
                                       IsChecked="{Binding IsSelected}"
-                                      IsEnabled="{Binding Model.HasPrimaryKey}"/>
+                                      IsEnabled="{Binding Model.HasKey}"/>
                             <TextBlock Text="{Binding Model.Name}" 
                                        Style="{StaticResource TableNameTextBlockStyle}"/>
                             <Image Style="{StaticResource NoPrimaryKeyImageStyle}"
diff --git a/src/GUI/EFCorePowerTools/Dialogs/TableWarning_16x.png b/src/GUI/EFCorePowerTools/Dialogs/TableWarning_16x.png
new file mode 100644
index 000000000..28d0a89bc
Binary files /dev/null and b/src/GUI/EFCorePowerTools/Dialogs/TableWarning_16x.png differ
diff --git a/src/GUI/EFCorePowerTools/EFCorePowerTools.csproj b/src/GUI/EFCorePowerTools/EFCorePowerTools.csproj
index ea77b7d53..26bd9cd8d 100644
--- a/src/GUI/EFCorePowerTools/EFCorePowerTools.csproj
+++ b/src/GUI/EFCorePowerTools/EFCorePowerTools.csproj
@@ -150,6 +150,7 @@
       <Link>Microsoft.VisualStudio.ProjectSystem.VS.dll</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
+    <Content Include="Dialogs\TableWarning_16x.png" />
     <Content Include="efpt\2.1.0\efpt.exe">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
@@ -184,6 +185,7 @@
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="Resources\7.png" />
+    <Resource Include="Resources\TableWarning_16x.png" />
     <Resource Include="Resources\StatusInvalid_16x.png" />
     <Resource Include="Resources\Unicorn.png" />
     <EmbeddedResource Include="..\ErikEJ.EntityFrameworkCore.DgmlBuilder\template.dgml">
diff --git a/src/GUI/EFCorePowerTools/Handlers/ReverseEngineerHandler.cs b/src/GUI/EFCorePowerTools/Handlers/ReverseEngineerHandler.cs
index d38e9f7d5..addcf7080 100644
--- a/src/GUI/EFCorePowerTools/Handlers/ReverseEngineerHandler.cs
+++ b/src/GUI/EFCorePowerTools/Handlers/ReverseEngineerHandler.cs
@@ -87,6 +87,14 @@ public async void ReverseEngineerCodeFirst(Project project)
 
                 if (dbInfo == null) dbInfo = new DatabaseInfo();
 
+                var includeViews = pickDataSourceResult.Payload.IncludeViews;
+
+                if (includeViews && !string.IsNullOrEmpty(dacpacPath))
+                {
+                    EnvDteHelper.ShowMessage("Dacpac not currently supported with views");
+                    return;
+                }
+
                 if (!string.IsNullOrEmpty(dacpacPath))
                 {
                     dbInfo.DatabaseType = DatabaseType.SQLServer;
@@ -105,13 +113,11 @@ public async void ReverseEngineerCodeFirst(Project project)
                     return;
                 }
 
-                var result = revEng.GetDacpacTables("xx");
-
                 var options = ReverseEngineerOptionsExtensions.TryRead(optionsPath);
 
                 List<TableInformationModel> predefinedTables = !string.IsNullOrEmpty(dacpacPath)
                                            ? revEng.GetDacpacTables(dacpacPath)
-                                           : GetTablesFromRepository(dbInfo);
+                                           : GetTablesFromRepository(dbInfo, includeViews);
 
                 var preselectedTables = new List<TableInformationModel>();
                 if (options != null)
@@ -313,7 +319,9 @@ private List<TableInformationModel> GetTablesFromRepository(DatabaseInfo dbInfo,
                 foreach (var table in tableList)
                 {
                     var hasPrimaryKey = allPks.Any(m => m.TableName == table);
-                    tables.Add(new TableInformationModel(table, hasPrimaryKey));
+                    var info = new TableInformationModel(table, hasPrimaryKey);
+                    info.HasKey = includeViews ? true : hasPrimaryKey;
+                    tables.Add(info);
                 }
 
                 if (includeViews)
@@ -321,7 +329,9 @@ private List<TableInformationModel> GetTablesFromRepository(DatabaseInfo dbInfo,
                     var views = repository.GetAllViews();
                     foreach (var view in views)
                     {
-                        tables.Add(new TableInformationModel(view.ViewName, false));
+                        var info = new TableInformationModel(view.ViewName, false);
+                        info.HasKey = true;
+                        tables.Add(info);
                     }
                 }
 
diff --git a/src/GUI/EFCorePowerTools/Resources/TableWarning_16x.png b/src/GUI/EFCorePowerTools/Resources/TableWarning_16x.png
new file mode 100644
index 000000000..28d0a89bc
Binary files /dev/null and b/src/GUI/EFCorePowerTools/Resources/TableWarning_16x.png differ
diff --git a/src/GUI/EFCorePowerTools/ViewModels/PickServerDatabaseViewModel.cs b/src/GUI/EFCorePowerTools/ViewModels/PickServerDatabaseViewModel.cs
index 3677bf833..4b287a91c 100644
--- a/src/GUI/EFCorePowerTools/ViewModels/PickServerDatabaseViewModel.cs
+++ b/src/GUI/EFCorePowerTools/ViewModels/PickServerDatabaseViewModel.cs
@@ -18,6 +18,7 @@ public class PickServerDatabaseViewModel : ViewModelBase, IPickServerDatabaseVie
 
         private DatabaseConnectionModel _selectedDatabaseConnection;
         private DatabaseDefinitionModel _selectedDatabaseDefinition;
+        private bool _includeViews;
 
         public event EventHandler<CloseRequestedEventArgs> CloseRequested;
 
@@ -29,6 +30,17 @@ public class PickServerDatabaseViewModel : ViewModelBase, IPickServerDatabaseVie
         public ObservableCollection<DatabaseConnectionModel> DatabaseConnections { get; }
         public ObservableCollection<DatabaseDefinitionModel> DatabaseDefinitions { get; }
 
+        public bool IncludeViews
+        {
+            get => _includeViews;
+            set
+            {
+                if (value == _includeViews) return;
+                _includeViews = value;
+                RaisePropertyChanged();
+            }
+        }
+
         public DatabaseConnectionModel SelectedDatabaseConnection
         {
             get => _selectedDatabaseConnection;
diff --git a/src/GUI/RevEng.Shared/TableInformationModel.cs b/src/GUI/RevEng.Shared/TableInformationModel.cs
index f07859668..9cb9ca2a0 100644
--- a/src/GUI/RevEng.Shared/TableInformationModel.cs
+++ b/src/GUI/RevEng.Shared/TableInformationModel.cs
@@ -16,6 +16,7 @@ public class TableInformationModel : INotifyPropertyChanged
     {
         private string _name;
         private bool _hasPrimaryKey;
+        private bool _isKeyLess;
 
         /// <summary>
         /// Gets or sets the table name.
@@ -47,6 +48,21 @@ public bool HasPrimaryKey
             }
         }
 
+        /// <summary>
+        /// Gets or sets whether a key exists for the table/view or not.
+        /// </summary>
+        [IgnoreDataMember]
+        public bool HasKey
+        {
+            get => _isKeyLess;
+            set
+            {
+                if (value == _isKeyLess) return;
+                _isKeyLess = value;
+                OnPropertyChanged();
+            }
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="TableInformationModel"/> class for a specific table.
         /// </summary>
@@ -61,6 +77,7 @@ public TableInformationModel(string name,
 
             Name = name;
             HasPrimaryKey = hasPrimaryKey;
+            HasKey = !hasPrimaryKey;
         }
 
         public event PropertyChangedEventHandler PropertyChanged;