diff --git a/README.md b/README.md
index ed866678..5ee7a510 100644
--- a/README.md
+++ b/README.md
@@ -127,8 +127,8 @@ $executor = new Executor($loop, new Parser(), new BinaryDumper(), null);
 
 $executor->query(
     '8.8.8.8:53', 
-    new Query($name, Message::TYPE_AAAA, Message::CLASS_IN, time())
-)->done(function (Message $message) {
+    new Query($name, Message::TYPE_AAAA, Message::CLASS_IN)
+)->then(function (Message $message) {
     foreach ($message->answers as $answer) {
         echo 'IPv6: ' . $answer->data . PHP_EOL;
     }
@@ -154,7 +154,7 @@ $executor = new HostsFileExecutor($hosts, $executor);
 
 $executor->query(
     '8.8.8.8:53', 
-    new Query('localhost', Message::TYPE_A, Message::CLASS_IN, time())
+    new Query('localhost', Message::TYPE_A, Message::CLASS_IN)
 );
 ```
 
diff --git a/examples/04-query-a-and-aaaa.php b/examples/04-query-a-and-aaaa.php
index 6c46bbfe..c4f52fcf 100644
--- a/examples/04-query-a-and-aaaa.php
+++ b/examples/04-query-a-and-aaaa.php
@@ -15,15 +15,15 @@
 
 $name = isset($argv[1]) ? $argv[1] : 'www.google.com';
 
-$ipv4Query = new Query($name, Message::TYPE_A, Message::CLASS_IN, time());
-$ipv6Query = new Query($name, Message::TYPE_AAAA, Message::CLASS_IN, time());
+$ipv4Query = new Query($name, Message::TYPE_A, Message::CLASS_IN);
+$ipv6Query = new Query($name, Message::TYPE_AAAA, Message::CLASS_IN);
 
-$executor->query('8.8.8.8:53', $ipv4Query)->done(function (Message $message) {
+$executor->query('8.8.8.8:53', $ipv4Query)->then(function (Message $message) {
     foreach ($message->answers as $answer) {
         echo 'IPv4: ' . $answer->data . PHP_EOL;
     }
 }, 'printf');
-$executor->query('8.8.8.8:53', $ipv6Query)->done(function (Message $message) {
+$executor->query('8.8.8.8:53', $ipv6Query)->then(function (Message $message) {
     foreach ($message->answers as $answer) {
         echo 'IPv6: ' . $answer->data . PHP_EOL;
     }
diff --git a/src/Model/HeaderBag.php b/src/Model/HeaderBag.php
index 193e65cd..0093bd3d 100644
--- a/src/Model/HeaderBag.php
+++ b/src/Model/HeaderBag.php
@@ -4,8 +4,6 @@
 
 class HeaderBag
 {
-    public $data = '';
-
     public $attributes = array(
         'qdCount'   => 0,
         'anCount'   => 0,
@@ -21,6 +19,11 @@ class HeaderBag
         'rcode'     => Message::RCODE_OK,
     );
 
+    /**
+     * @deprecated unused, exists for BC only
+     */
+    public $data = '';
+
     public function get($name)
     {
         return isset($this->attributes[$name]) ? $this->attributes[$name] : null;
diff --git a/src/Model/Message.php b/src/Model/Message.php
index 715cb1f8..cbe41b74 100644
--- a/src/Model/Message.php
+++ b/src/Model/Message.php
@@ -78,14 +78,20 @@ private static function generateId()
         return mt_rand(0, 0xffff);
     }
 
-    public $data = '';
-
     public $header;
     public $questions = array();
     public $answers = array();
     public $authority = array();
     public $additional = array();
 
+    /**
+     * @deprecated still used internally for BC reasons, should not be used externally.
+     */
+    public $data = '';
+
+    /**
+     * @deprecated still used internally for BC reasons, should not be used externally.
+     */
     public $consumed = 0;
 
     public function __construct()
diff --git a/src/Query/Query.php b/src/Query/Query.php
index aef6e051..058a78d5 100644
--- a/src/Query/Query.php
+++ b/src/Query/Query.php
@@ -7,10 +7,24 @@ class Query
     public $name;
     public $type;
     public $class;
+
+    /**
+     * @deprecated still used internally for BC reasons, should not be used externally.
+     */
     public $currentTime;
 
-    public function __construct($name, $type, $class, $currentTime)
+    /**
+     * @param string   $name        query name, i.e. hostname to look up
+     * @param int      $type        query type, see Message::TYPE_* constants
+     * @param int      $class       query class, see Message::CLASS_IN constant
+     * @param int|null $currentTime (deprecated) still used internally, should not be passed explicitly anymore.
+     */
+    public function __construct($name, $type, $class, $currentTime = null)
     {
+        if($currentTime === null) {
+            $currentTime = time();
+        }
+
         $this->name = $name;
         $this->type = $type;
         $this->class = $class;
diff --git a/src/Resolver/Resolver.php b/src/Resolver/Resolver.php
index 4a4983ab..733dffb4 100644
--- a/src/Resolver/Resolver.php
+++ b/src/Resolver/Resolver.php
@@ -20,7 +20,7 @@ public function __construct($nameserver, ExecutorInterface $executor)
 
     public function resolve($domain)
     {
-        $query = new Query($domain, Message::TYPE_A, Message::CLASS_IN, time());
+        $query = new Query($domain, Message::TYPE_A, Message::CLASS_IN);
         $that = $this;
 
         return $this->executor