diff --git a/sql-odbc/docs/user/img/pbi_disable_parallel_loading_tables.png b/sql-odbc/docs/user/img/pbi_disable_parallel_loading_tables.png
new file mode 100644
index 0000000000..4e12022e9e
Binary files /dev/null and b/sql-odbc/docs/user/img/pbi_disable_parallel_loading_tables.png differ
diff --git a/sql-odbc/docs/user/img/pbi_simple_graph.png b/sql-odbc/docs/user/img/pbi_simple_graph.png
new file mode 100644
index 0000000000..9174de438b
Binary files /dev/null and b/sql-odbc/docs/user/img/pbi_simple_graph.png differ
diff --git a/sql-odbc/docs/user/power_bi_support.md b/sql-odbc/docs/user/power_bi_support.md
index 3e5a6f2c4f..4a2dcda292 100644
--- a/sql-odbc/docs/user/power_bi_support.md
+++ b/sql-odbc/docs/user/power_bi_support.md
@@ -1,7 +1,5 @@
 #  Connecting Open Distro For ElasticSearch to Microsoft Power BI Desktop
 
-**NOTE**: **The connector is under development. All connection options are not available yet. There could be issues while loading data**
-
 ## Prerequisites
 * Microsoft Power BI Desktop
 * [Open Distro for Elasticsearch](https://opendistro.github.io/for-elasticsearch-docs/docs/install/)
@@ -19,7 +17,14 @@
 
 ## Load Data
 
+> **NOTE**: Currently only import mode is supported. Direct query support will be added soon.
+
 * Open Power BI Desktop.
+
+* Disable parallel loading of tables. Click on **Files** > **Options and settings** > **Options** > **CURRENT FILE** > **Data Load** > Deselect **Enable parallel loading of tables** and click **OK**.
+
+<img src="img/pbi_disable_parallel_loading_tables.png"  width="500">
+
 * Click on **Home** > **Get Data** > **More** > **Other**. Select **Open Distro For Elasticsearch (Beta)**. Click on **Connect**.
 
 <img src="img/pbi_select_connector.png" width="500">
@@ -42,6 +47,10 @@
 
 * Click on **Load**.
 
+* Select required columns for creating graph.
+
+<img src="img/pbi_simple_graph.png">
+
 ## Troubleshooting 
 
 * If you get an following error, please install [Open Distro For Elasticsearch SQL ODBC Driver](https://opendistro.github.io/for-elasticsearch-docs/docs/sql/odbc/).
diff --git a/sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector.pq b/sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector.pq
index fa706a5db9..a389755d91 100644
--- a/sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector.pq
+++ b/sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector.pq
@@ -106,6 +106,20 @@ OdfeSqlOdbcPBIConnectorImpl = (Host as text, optional Port as number) as table =
                     Value.ReplaceType(toTable, Value.Type(source))
             else
                 source,
+        
+        SQLGetFunctions = Diagnostics.LogValue("SQLGetFunctions_Options", [
+            SQL_API_SQLBINDPARAMETER = false
+        ]),
+
+        SqlCapabilities = Diagnostics.LogValue("SqlCapabilities_Options", [
+            SupportsTop = false,
+            LimitClauseKind = LimitClauseKind.LimitOffset,
+            SupportsNumericLiterals = true,
+            SupportsStringLiterals = true,
+            SupportsOdbcDateLiterals = true,
+            SupportsOdbcTimeLiterals = true,
+            SupportsOdbcTimestampLiterals = true
+        ]),
 
         OdbcDatasource = Odbc.DataSource(ConnectionString & Server & CredentialConnectionString & EncryptedConnectionString, [
             // Do not view the tables grouped by their schema names.
@@ -123,6 +137,8 @@ OdfeSqlOdbcPBIConnectorImpl = (Host as text, optional Port as number) as table =
             SQLColumns = SQLColumns,
             SQLGetTypeInfo = SQLGetTypeInfo,
             SQLGetInfo = SQLGetInfo,
+            SQLGetFunctions = SQLGetFunctions,
+            SqlCapabilities = SqlCapabilities,
 
             OnError = OnOdbcError,
 
@@ -191,7 +207,10 @@ OdfeSqlOdbcPBIConnector.Publish = [
     Category = "Other",
     ButtonText = { Extension.LoadString("ButtonTitle"), Extension.LoadString("ButtonHelp") },
     LearnMoreUrl = "https://opendistro.github.io/for-elasticsearch/",
-    SupportsDirectQuery = true,
+    
+    // Disabling direct query due to limited SQL query support
+    SupportsDirectQuery = false,
+
     SourceImage = OdfeSqlOdbcPBIConnector.Icons,
     SourceTypeImage = OdfeSqlOdbcPBIConnector.Icons
 ];
diff --git a/sql-odbc/src/PowerBIConnector/bin/Release/OdfeSqlOdbcPBIConnector.mez b/sql-odbc/src/PowerBIConnector/bin/Release/OdfeSqlOdbcPBIConnector.mez
index a45e425fbf..98b2046f02 100644
Binary files a/sql-odbc/src/PowerBIConnector/bin/Release/OdfeSqlOdbcPBIConnector.mez and b/sql-odbc/src/PowerBIConnector/bin/Release/OdfeSqlOdbcPBIConnector.mez differ