diff --git a/artifacts/tsbs/README.txt b/artifacts/tsbs/README.txt
index 0043e2417d63bc184758cd3f27387508aece2afb..6b4b0e5b4a16875631465db9aeab4b38258a3fab 100644
--- a/artifacts/tsbs/README.txt
+++ b/artifacts/tsbs/README.txt
@@ -18,6 +18,34 @@ GOPATH=~/tmp/go go install -v ./...
 # https://blog.timescale.com/blog/timescaledb-vs-influxdb-for-time-series-data-timescale-influx-sql-nosql-36489299877/
 ~/tmp/go/bin/tsbs_generate_data --use-case="cpu-only" --seed=123 --scale=4000 --timestamp-start="2016-01-01T00:00:00Z" --timestamp-end="2016-01-02T00:00:00Z" --log-interval="10s" --format="influx" > /tmp/data
 cat /tmp/data | ~/tmp/go/bin/tsbs_load_influx 
+# Show help
 ~/tmp/go/bin/tsbs_load_questdb -help
 cat /tmp/data | ~/tmp/go/bin/tsbs_load_questdb 
 
+
+#
+# Loading data benchmarks using the shell scripts
+#
+# Change to install directory see above
+cd ~/tmp/go/src/github.com/timescale/
+# generate data file /tmp/bulk_data/influx-data.gz
+PATH=${PATH}:~/tmp/go/bin FORMATS=influx TS_END=2016-01-01T02:00:00Z bash ./scripts/generate_data.sh 
+PATH=${PATH}:~/tmp/go/bin NUM_WORKERS=1 ./scripts/load/load_questdb.sh
+
+
+#
+# Running query benchmarks against the iot data set (cpu-only use case)
+# Assumes a iot data set including periods 2016-01-01T00:00:00Z -> 2016-01-02T00:00:01Z is loaded
+#
+# Change to install directory see above
+cd ~/tmp/go/src/github.com/timescale/
+# Run the single-groupby-5-8-1
+~/tmp/go/bin/tsbs_generate_queries --use-case="cpu-only" --seed=123 --scale=4000 --timestamp-start="2016-01-01T00:00:00Z" --timestamp-end="2016-01-02T00:00:01Z" --queries=1000 --query-type="single-groupby-5-8-1" --format="questdb" > /tmp/queries_questdb
+~/tmp/go/bin/tsbs_run_queries_questdb --file /tmp/queries_questdb --print-interval 500
+
+
+#
+# Running query benchmarks using the shell scripts
+#
+PATH=${PATH}:~/tmp/go/bin FORMATS=questdb TS_END=2016-01-02T00:00:00Z bash ./scripts/generate_queries.sh
+PATH=${PATH}:~/tmp/go/bin ./scripts/run_queries/run_queries_questdb.sh
diff --git a/artifacts/tsbs/cpu-only-example-queries.txt b/artifacts/tsbs/cpu-only-example-queries.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ec9d859b1219c18648ba05e6d2bda1ab067e5a08
--- /dev/null
+++ b/artifacts/tsbs/cpu-only-example-queries.txt
@@ -0,0 +1,103 @@
+#
+# For context see
+# https://github.com/questdb/questdb/blob/tsbs/artifacts/tsbs/README.txt
+#
+# The dataset used to run the queries was created with commands (for high-cpu-1) like
+~/tmp/go/bin/tsbs_generate_queries --use-case="cpu-only" --seed=123 --scale=4000 --timestamp-start="2016-01-01T00:00:00Z" --timestamp-end="2016-01-02T00:00:01Z" --queries=1000 --query-type="high-cpu-1" --format="questdb" > /tmp/queries_questdb
+# and should be run against a data set created with a command like
+~/tmp/go/bin/tsbs_generate_data --use-case="cpu-only" --seed=123 --scale=4000 --timestamp-start="2016-01-01T00:00:00Z" --timestamp-end="2016-01-02T00:00:00Z" --log-interval="10s" --format="influx" > /tmp/bigcpu
+
+#
+# Queries generated
+#
+
+-- high-cpu-1
+SELECT *
+FROM cpu
+WHERE usage_user > 90.0
+ AND hostname IN ('host_249')
+ AND timestamp >= '2016-01-01T07:47:52Z'
+ AND timestamp < '2016-01-01T19:47:52Z
+
+-- high-cpu-all
+SELECT *
+FROM cpu
+WHERE usage_user > 90.0
+ AND timestamp >= '2016-01-01T07:47:52Z'
+ AND timestamp < '2016-01-01T19:47:52Z'
+
+-- cpu-max-all-1
+SELECT
+ hour(timestamp) AS hour,
+ max(usage_user) AS max_usage_user, max(usage_system) AS max_usage_system, max(usage_idle) AS max_usage_idle, max(usage_nice) AS max_usage_nice, max(usage_iowait) AS max_usage_iowait, max(usage_irq) AS max_usage_irq, max(usage_softirq) AS max_usage_softirq, max(usage_steal) AS max_usage_steal, max(usage_guest) AS max_usage_guest, max(usage_guest_nice) AS max_usage_guest_nice
+FROM cpu
+WHERE hostname IN ('host_249')
+ AND timestamp >= '2016-01-01T08:24:59Z'
+ AND timestamp < '2016-01-01T16:24:59Z'
+ SAMPLE BY 1h
+
+-- cpu-max-all-8
+SELECT
+ hour(timestamp) AS hour,
+ max(usage_user) AS max_usage_user, max(usage_system) AS max_usage_system, max(usage_idle) AS max_usage_idle, max(usage_nice) AS max_usage_nice, max(usage_iowait) AS max_usage_iowait, max(usage_irq) AS max_usage_irq, max(usage_softirq) AS max_usage_softirq, max(usage_steal) AS max_usage_steal, max(usage_guest) AS max_usage_guest, max(usage_guest_nice) AS max_usage_guest_nice
+FROM cpu
+WHERE hostname IN ('host_249', 'host_1403', 'host_1435', 'host_3539', 'host_3639', 'host_3075', 'host_815', 'host_2121')
+ AND timestamp >= '2016-01-01T08:24:59Z'
+ AND timestamp < '2016-01-01T16:24:59Z'
+ SAMPLE BY 1h
+
+-- double-groupby-1
+SELECT timestamp, hostname,
+ avg(usage_user) AS avg_usage_user
+FROM cpu
+WHERE timestamp >= '2016-01-01T07:47:52Z'
+ AND timestamp < '2016-01-01T19:47:52Z'
+ SAMPLE BY 1h
+ GROUP BY timestamp, hostname
+
+-- double-groupby-5
+SELECT timestamp, hostname,
+ avg(usage_user) AS avg_usage_user, avg(usage_system) AS avg_usage_system, avg(usage_idle) AS avg_usage_idle, avg(usage_nice) AS avg_usage_nice, avg(usage_iowait) AS avg_usage_iowait
+FROM cpu
+WHERE timestamp >= '2016-01-01T07:47:52Z'
+ AND timestamp < '2016-01-01T19:47:52Z'
+ SAMPLE BY 1h
+ GROUP BY timestamp, hostname
+
+-- double-groupby-all
+SELECT timestamp, hostname,
+ avg(usage_user) AS avg_usage_user, avg(usage_system) AS avg_usage_system, avg(usage_idle) AS avg_usage_idle, avg(usage_nice) AS avg_usage_nice, avg(usage_iowait) AS avg_usage_iowait, avg(usage_irq) AS avg_usage_irq, avg(usage_softirq) AS avg_usage_softirq, avg(usage_steal) AS avg_usage_steal, avg(usage_guest) AS avg_usage_guest, avg(usage_guest_nice) AS avg_usage_guest_nice
+FROM cpu
+WHERE timestamp >= '2016-01-01T10:20:52Z'
+ AND timestamp < '2016-01-01T22:20:52Z'
+ SAMPLE BY 1h
+ GROUP BY timestamp, hostname
+
+-- groupby-orderby-limit
+SELECT timestamp AS minute,
+ max(usage_user)
+FROM cpu
+WHERE timestamp < '2016-01-01T03:17:08Z'
+ SAMPLE BY 1m
+ LIMIT 5
+
+-- lastpoint
+SELECT * FROM cpu latest by hostname
+
+-- single-groupby-1-1-12
+SELECT timestamp,
+ max(usage_user) AS max_usage_user
+FROM cpu
+WHERE hostname IN ('host_249')
+ AND timestamp >= '2016-01-01T07:47:52Z'
+ AND timestamp < '2016-01-01T19:47:52Z'
+ SAMPLE BY 1m
+
+-- single-groupby-1-8-1
+SELECT timestamp,
+ max(usage_user) AS max_usage_user
+FROM cpu
+WHERE hostname IN ('host_249', 'host_1403', 'host_1435', 'host_3539', 'host_3639', 'host_3075', 'host_815', 'host_2121')
+ AND timestamp >= '2016-01-01T02:17:08Z'
+ AND timestamp < '2016-01-01T03:17:08Z'
+ SAMPLE BY 1m