diff --git a/dd-java-agent/README.md b/dd-java-agent/README.md
index 0543320449..8d75b239c2 100644
--- a/dd-java-agent/README.md
+++ b/dd-java-agent/README.md
@@ -116,7 +116,6 @@ Modern web application frameworks such as Dropwizard or Spring Boot are automati
 | Hibernate| 5.x | Please check the following [JDBC instrumentation](#jdbc-instrumentation) section |
 | [MongoDB](https://github.com/opentracing-contrib/java-mongo-driver) | 3.x | Intercepts all the calls from the MongoDB client |
 | [Cassandra](https://github.com/opentracing-contrib/java-cassandra-driver) | 3.2.x | Intercepts all the calls from the Cassandra client |
-| [Elasticsearch](https://github.com/opentracing-contrib/java-elasticsearch-client) | 5.4.x | Intercepts all the calls from the ES Transport client |
 
 #### JDBC instrumentation
 
diff --git a/dd-trace/src/main/resources/dd-trace-decorators.yaml b/dd-trace/src/main/resources/dd-trace-decorators.yaml
new file mode 100644
index 0000000000..0371b54d55
--- /dev/null
+++ b/dd-trace/src/main/resources/dd-trace-decorators.yaml
@@ -0,0 +1,24 @@
+# Decorators are used to add extra information to span
+# Could be DBServiceDecorator, MapperDecorator or HTTPServiceDecorator
+decorators:
+  - type: HTTPComponent
+    matchingValue: java-okhttp
+    setValue: http-client
+  - type: DBComponent
+    matchingValue: java-mongo
+    setValue: mongo
+  - type: DBComponent
+    matchingValue: java-jdbc
+    setValue: jdbc
+  - type: DBComponent
+    matchingValue: java-cassandra
+    setValue: cassandra
+  - type: DBComponent
+    matchingValue: java-elasticsearch
+    setValue: elasticsearch
+  - type: HTTPComponent
+    matchingValue: java-aws-sdk
+    setValue: aws-client
+#  - type: URLAsResourceName   # Performance issues, no URL generalisation
+  - type: DBStatementAsResourceName
+  - type: ErrorFlag
diff --git a/dd-trace/src/main/resources/dd-trace.yaml b/dd-trace/src/main/resources/dd-trace.yaml
new file mode 100644
index 0000000000..8922992e75
--- /dev/null
+++ b/dd-trace/src/main/resources/dd-trace.yaml
@@ -0,0 +1,23 @@
+# Service name used if none is provided in the app
+defaultServiceName: java-app
+
+# The writer to use.
+# Could be: LoggingWriter or DDAgentWriter (default)
+writer:
+  # LoggingWriter: Spans are logged using the application configuration
+  # DDAgentWriter: Spans are forwarding to a Datadog Agent
+  #  - Param 'host': the hostname where the DD Agent running (default: localhost)
+  #  - Param 'port': the port to reach the DD Agent (default: 8126)
+  type: DDAgentWriter
+  host: localhost
+  port: 8126
+
+# The sampler to use.
+# Could be: AllSampler (default) or RateSampler
+sampler:
+  # AllSampler: all spans are reported to the writer
+  # RateSample: only a portion of spans are reported to the writer
+  #  - Param 'rate': the portion of spans to keep
+  type: AllSampler
+  # Skip some traces if the root span tag values matches some regexp patterns
+  # skipTagsPatterns: {"http.url": ".*/demo/add.*"}