From 1ac59dc5500d048f64b05bd91a6c380fbd512188 Mon Sep 17 00:00:00 2001
From: Sacha Morard <smorard@idobs.net>
Date: Thu, 23 Mar 2017 11:12:03 +0100
Subject: [PATCH] Cassandra driver v1.3.0

---
 .gitignore                                    |   1 +
 Library/Cassandra.php                         | 253 ++++++++-----
 Library/Cassandra/Aggregate.php               |  44 ++-
 Library/Cassandra/BatchStatement.php          |  13 +-
 Library/Cassandra/Bigint.php                  |  84 ++---
 Library/Cassandra/Blob.php                    |  25 +-
 Library/Cassandra/Cluster.php                 |  11 +-
 Library/Cassandra/Cluster/Builder.php         | 143 ++++---
 Library/Cassandra/Collection.php              |  61 +--
 Library/Cassandra/Column.php                  |  36 +-
 Library/Cassandra/Custom.php                  |  33 ++
 Library/Cassandra/Date.php                    |  32 +-
 Library/Cassandra/Decimal.php                 |  63 ++--
 Library/Cassandra/DefaultAggregate.php        |  35 +-
 Library/Cassandra/DefaultCluster.php          |  15 +-
 Library/Cassandra/DefaultColumn.php           |  29 +-
 Library/Cassandra/DefaultFunction.php         |  31 +-
 Library/Cassandra/DefaultIndex.php            |  30 +-
 Library/Cassandra/DefaultKeyspace.php         |  94 ++++-
 Library/Cassandra/DefaultMaterializedView.php | 219 +++++++++++
 Library/Cassandra/DefaultSchema.php           |  20 +-
 Library/Cassandra/DefaultSession.php          |  68 ++--
 Library/Cassandra/DefaultTable.php            | 123 +++---
 Library/Cassandra/Duration.php                |  24 +-
 Library/Cassandra/Exception.php               |   8 +-
 .../Exception/AlreadyExistsException.php      |  23 +-
 .../Exception/AuthenticationException.php     |  23 +-
 .../Exception/ConfigurationException.php      |  23 +-
 .../Exception/DivideByZeroException.php       |  25 +-
 .../Cassandra/Exception/DomainException.php   |  27 +-
 .../Exception/ExecutionException.php          |  23 +-
 .../Exception/InvalidArgumentException.php    |  27 +-
 .../Exception/InvalidQueryException.php       |  23 +-
 .../Exception/InvalidSyntaxException.php      |  23 +-
 .../Exception/IsBootstrappingException.php    |  23 +-
 .../Cassandra/Exception/LogicException.php    |  27 +-
 .../Exception/OverloadedException.php         |  23 +-
 .../Cassandra/Exception/ProtocolException.php |  29 +-
 .../Cassandra/Exception/RangeException.php    |  27 +-
 .../Exception/ReadTimeoutException.php        |  23 +-
 .../Cassandra/Exception/RuntimeException.php  |  27 +-
 .../Cassandra/Exception/ServerException.php   |  25 +-
 .../Cassandra/Exception/TimeoutException.php  |  23 +-
 .../Cassandra/Exception/TruncateException.php |  23 +-
 .../Exception/UnauthorizedException.php       |  23 +-
 .../Exception/UnavailableException.php        |  23 +-
 .../Exception/UnpreparedException.php         |  23 +-
 .../Exception/ValidationException.php         |  35 +-
 .../Exception/WriteTimeoutException.php       |  23 +-
 Library/Cassandra/ExecutionOptions.php        |  39 +-
 Library/Cassandra/Float.php                   |  93 +++--
 Library/Cassandra/Function.php                |  37 +-
 Library/Cassandra/Future.php                  |  13 +-
 Library/Cassandra/FutureClose.php             |  17 +-
 Library/Cassandra/FuturePreparedStatement.php |  19 +-
 Library/Cassandra/FutureRows.php              |  17 +-
 Library/Cassandra/FutureSession.php           |  17 +-
 Library/Cassandra/FutureValue.php             |  15 +-
 Library/Cassandra/Index.php                   |  38 +-
 Library/Cassandra/Inet.php                    |  23 +-
 Library/Cassandra/Keyspace.php                | 100 ++++-
 Library/Cassandra/Map.php                     |  68 ++--
 Library/Cassandra/MaterializedView.php        | 197 +++++++++-
 Library/Cassandra/Numeric.php                 |  42 +--
 Library/Cassandra/PreparedStatement.php       |   8 +-
 Library/Cassandra/RetryPolicy.php             |   6 +-
 .../Cassandra/RetryPolicy/DefaultPolicy.php   |   9 +-
 .../RetryPolicy/DowngradingConsistency.php    |   9 +-
 Library/Cassandra/RetryPolicy/Fallthrough.php |   8 +-
 Library/Cassandra/RetryPolicy/Logging.php     |  14 +-
 Library/Cassandra/Rows.php                    |  61 +--
 Library/Cassandra/SSLOptions.php              |   8 +-
 Library/Cassandra/SSLOptions/Builder.php      |  47 +--
 Library/Cassandra/Schema.php                  |  20 +-
 Library/Cassandra/Session.php                 |  92 +++--
 Library/Cassandra/Set.php                     |  31 +-
 Library/Cassandra/SimpleStatement.php         |   9 +-
 Library/Cassandra/Smallint.php                |  79 ++--
 Library/Cassandra/Statement.php               |   6 +-
 Library/Cassandra/Table.php                   | 112 +++---
 Library/Cassandra/Time.php                    |  35 +-
 Library/Cassandra/Timestamp.php               |  25 +-
 Library/Cassandra/TimestampGenerator.php      |   6 +-
 .../TimestampGenerator/Monotonic.php          |   8 +-
 .../TimestampGenerator/ServerSide.php         |  11 +-
 Library/Cassandra/Timeuuid.php                |  30 +-
 Library/Cassandra/Tinyint.php                 |  79 ++--
 Library/Cassandra/Tuple.php                   |  37 +-
 Library/Cassandra/Type.php                    | 350 +++++++++++-------
 Library/Cassandra/Type/Collection.php         |  41 +-
 Library/Cassandra/Type/Custom.php             |  26 +-
 Library/Cassandra/Type/Map.php                |  56 +--
 Library/Cassandra/Type/Scalar.php             |  34 +-
 Library/Cassandra/Type/Set.php                |  40 +-
 Library/Cassandra/Type/Tuple.php              |  34 +-
 Library/Cassandra/Type/UserType.php           |  55 ++-
 Library/Cassandra/UserTypeValue.php           |  38 +-
 Library/Cassandra/Uuid.php                    |  17 +-
 Library/Cassandra/UuidInterface.php           |   7 +-
 Library/Cassandra/Value.php                   |   9 +-
 Library/Cassandra/Varint.php                  |  50 ++-
 101 files changed, 2896 insertions(+), 1435 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 Library/Cassandra/Custom.php
 create mode 100644 Library/Cassandra/DefaultMaterializedView.php

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..723ef36
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.idea
\ No newline at end of file
diff --git a/Library/Cassandra.php b/Library/Cassandra.php
index b0ea2f7..2cae842 100644
--- a/Library/Cassandra.php
+++ b/Library/Cassandra.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,14 +22,14 @@
  * Use Cassandra::cluster() to build a cluster instance.
  * Use Cassandra::ssl() to build SSL options instance.
  */
-final class Cassandra
-{
+final class Cassandra {
+
     /**
      * Consistency level ANY means the request is fulfilled as soon as the data
      * has been written on the Coordinator. Requests with this consistency level
      * are not guranteed to make it to Replica nodes.
      *
-     * @see Cassandra\ExecutionOptions::__construct()
+     * @see ExecutionOptions::__construct()
      */
     const CONSISTENCY_ANY = 0;
 
@@ -37,22 +37,15 @@ final class Cassandra
      * Consistency level ONE guarantees that data has been written to at least
      * one Replica node.
      *
-     * @see Cassandra\ExecutionOptions::__construct()
+     * @see ExecutionOptions::__construct()
      */
     const CONSISTENCY_ONE = 1;
 
-    /**
-     * Same as `CONSISTENCY_ONE`, but confined to the local data center. This
-     * consistency level works only with `NetworkTopologyStrategy` replication.
-     *
-     * @see Cassandra\ExecutionOptions::__construct()
-     */
-    const CONSISTENCY_LOCAL_ONE = 10;
     /**
      * Consistency level TWO guarantees that data has been written to at least
      * two Replica nodes.
      *
-     * @see Cassandra\ExecutionOptions::__construct()
+     * @see ExecutionOptions::__construct()
      */
     const CONSISTENCY_TWO = 2;
 
@@ -60,7 +53,7 @@ final class Cassandra
      * Consistency level THREE guarantees that data has been written to at least
      * three Replica nodes.
      *
-     * @see Cassandra\ExecutionOptions::__construct()
+     * @see ExecutionOptions::__construct()
      */
     const CONSISTENCY_THREE = 3;
 
@@ -72,15 +65,23 @@ final class Cassandra
      * ceiling function and `RF` is the replication factor used. For example,
      * for a replication factor of `5`, the majority is `ceil(5 / 2 + 1) = 3`.
      *
-     * @see Cassandra\ExecutionOptions::__construct()
+     * @see ExecutionOptions::__construct()
      */
     const CONSISTENCY_QUORUM = 4;
 
+    /**
+     * Consistency level ALL guarantees that data has been written to all
+     * Replica nodes.
+     *
+     * @see ExecutionOptions::__construct()
+     */
+    const CONSISTENCY_ALL = 5;
+
     /**
      * Same as `CONSISTENCY_QUORUM`, but confined to the local data center. This
      * consistency level works only with `NetworkTopologyStrategy` replication.
      *
-     * @see Cassandra\ExecutionOptions::__construct()
+     * @see ExecutionOptions::__construct()
      */
     const CONSISTENCY_LOCAL_QUORUM = 6;
 
@@ -89,27 +90,19 @@ final class Cassandra
      * least a majority Replica nodes in all datacenters. This consistency level
      * works only with `NetworkTopologyStrategy` replication.
      *
-     * @see Cassandra\ExecutionOptions::__construct()
+     * @see ExecutionOptions::__construct()
      */
     const CONSISTENCY_EACH_QUORUM = 7;
 
-    /**
-     * Consistency level ALL guarantees that data has been written to all
-     * Replica nodes.
-     *
-     * @see Cassandra\ExecutionOptions::__construct()
-     */
-    const CONSISTENCY_ALL = 5;
-
     /**
      * This is a serial consistency level, it is used in conditional updates,
      * e.g. (`CREATE|INSERT ... IF NOT EXISTS`), and should be specified as the
-     * `serial_consistency` option of the Cassandra\ExecutionOptions instance.
+     * `serial_consistency` option of the ExecutionOptions instance.
      *
      * Consistency level SERIAL, when set, ensures that a Paxos commit fails if
      * any of the replicas is down.
      *
-     * @see Cassandra\ExecutionOptions::__construct()
+     * @see ExecutionOptions::__construct()
      */
     const CONSISTENCY_SERIAL = 8;
 
@@ -117,55 +110,98 @@ final class Cassandra
      * Same as `CONSISTENCY_SERIAL`, but confined to the local data center. This
      * consistency level works only with `NetworkTopologyStrategy` replication.
      *
-     * @see Cassandra\ExecutionOptions::__construct()
+     * @see ExecutionOptions::__construct()
      */
     const CONSISTENCY_LOCAL_SERIAL = 9;
 
     /**
-     * Perform no verification of Cassandra nodes when using SSL encryption.
+     * Same as `CONSISTENCY_ONE`, but confined to the local data center. This
+     * consistency level works only with `NetworkTopologyStrategy` replication.
      *
-     * @see Cassandra\SSLOptions\Builder::withVerifyFlags()
+     * @see ExecutionOptions::__construct()
      */
-    const VERIFY_NONE          = 0;
+    const CONSISTENCY_LOCAL_ONE = 10;
 
     /**
-     * Verify presence and validity of SSL certificates of Cassandra.
+     * Perform no verification of nodes when using SSL encryption.
      *
-     * @see Cassandra\SSLOptions\Builder::withVerifyFlags()
+     * @see SSLOptions\Builder::withVerifyFlags()
      */
-    const VERIFY_PEER_CERT     = 1;
+    const VERIFY_NONE = 0;
+
+    /**
+     * Verify presence and validity of SSL certificates.
+     *
+     * @see SSLOptions\Builder::withVerifyFlags()
+     */
+    const VERIFY_PEER_CERT = 1;
 
     /**
      * Verify that the IP address matches the SSL certificate’s common name or
      * one of its subject alternative names. This implies the certificate is
      * also present.
      *
-     * @see Cassandra\SSLOptions\Builder::withVerifyFlags()
+     * @see SSLOptions\Builder::withVerifyFlags()
      */
     const VERIFY_PEER_IDENTITY = 2;
 
     /**
-     * @see Cassandra\BatchStatement::__construct()
+     * @see BatchStatement::__construct()
      */
     const BATCH_LOGGED = 0;
 
     /**
-     * @see Cassandra\BatchStatement::__construct()
+     * @see BatchStatement::__construct()
      */
     const BATCH_UNLOGGED = 1;
 
     /**
-     * @see Cassandra\BatchStatement::__construct()
+     * @see BatchStatement::__construct()
      */
     const BATCH_COUNTER = 2;
 
+    /**
+     * Used to disable logging.
+     */
+    const LOG_DISABLED = 0;
+
+    /**
+     * Allow critical level logging.
+     */
+    const LOG_CRITICAL = 1;
+
+    /**
+     * Allow error level logging.
+     */
+    const LOG_ERROR = 2;
+
+    /**
+     * Allow warning level logging.
+     */
+    const LOG_WARN = 3;
+
+    /**
+     * Allow info level logging.
+     */
+    const LOG_INFO = 4;
+
+    /**
+     * Allow debug level logging.
+     */
+    const LOG_DEBUG = 5;
+
+    /**
+     * Allow trace level logging.
+     */
+    const LOG_TRACE = 6;
+
     /**
      * When using a map, collection or set of type text, all of its elements
      * must be strings.
      *
-     * @see Cassandra\Set::__construct()
-     * @see Cassandra\Collection::__construct()
-     * @see Cassandra\Map::__construct()
+     * @see Set::__construct()
+     * @see Collection::__construct()
+     * @see Map::__construct()
      */
     const TYPE_TEXT = 'text';
 
@@ -173,9 +209,9 @@ final class Cassandra
      * When using a map, collection or set of type ascii, all of its elements
      * must be strings.
      *
-     * @see Cassandra\Set::__construct()
-     * @see Cassandra\Collection::__construct()
-     * @see Cassandra\Map::__construct()
+     * @see Set::__construct()
+     * @see Collection::__construct()
+     * @see Map::__construct()
      */
     const TYPE_ASCII = 'ascii';
 
@@ -183,9 +219,9 @@ final class Cassandra
      * When using a map, collection or set of type varchar, all of its elements
      * must be strings.
      *
-     * @see Cassandra\Set::__construct()
-     * @see Cassandra\Collection::__construct()
-     * @see Cassandra\Map::__construct()
+     * @see Set::__construct()
+     * @see Collection::__construct()
+     * @see Map::__construct()
      */
     const TYPE_VARCHAR = 'varchar';
 
@@ -193,29 +229,49 @@ final class Cassandra
      * When using a map, collection or set of type bigint, all of its elements
      * must be instances of Bigint.
      *
-     * @see Cassandra\Set::__construct()
-     * @see Cassandra\Collection::__construct()
-     * @see Cassandra\Map::__construct()
+     * @see Set::__construct()
+     * @see Collection::__construct()
+     * @see Map::__construct()
      */
     const TYPE_BIGINT = 'bigint';
 
+    /**
+     * When using a map, collection or set of type smallint, all of its elements
+     * must be instances of Inet.
+     *
+     * @see Set::__construct()
+     * @see Collection::__construct()
+     * @see Map::__construct()
+     */
+    const TYPE_SMALLINT = 'smallint';
+
+    /**
+     * When using a map, collection or set of type tinyint, all of its elements
+     * must be instances of Inet.
+     *
+     * @see Set::__construct()
+     * @see Collection::__construct()
+     * @see Map::__construct()
+     */
+    const TYPE_TINYINT = 'tinyint';
+
     /**
      * When using a map, collection or set of type blob, all of its elements
      * must be instances of Blob.
      *
-     * @see Cassandra\Set::__construct()
-     * @see Cassandra\Collection::__construct()
-     * @see Cassandra\Map::__construct()
+     * @see Set::__construct()
+     * @see Collection::__construct()
+     * @see Map::__construct()
      */
     const TYPE_BLOB = 'blob';
 
     /**
-     * When using a map, collection or set of type boolean, all of its elements
-     * must be booleans.
+     * When using a map, collection or set of type bool, all of its elements
+     * must be boolean.
      *
-     * @see Cassandra\Set::__construct()
-     * @see Cassandra\Collection::__construct()
-     * @see Cassandra\Map::__construct()
+     * @see Set::__construct()
+     * @see Collection::__construct()
+     * @see Map::__construct()
      */
     const TYPE_BOOLEAN = 'boolean';
 
@@ -223,9 +279,9 @@ final class Cassandra
      * When using a map, collection or set of type counter, all of its elements
      * must be instances of Bigint.
      *
-     * @see Cassandra\Set::__construct()
-     * @see Cassandra\Collection::__construct()
-     * @see Cassandra\Map::__construct()
+     * @see Set::__construct()
+     * @see Collection::__construct()
+     * @see Map::__construct()
      */
     const TYPE_COUNTER = 'counter';
 
@@ -233,9 +289,9 @@ final class Cassandra
      * When using a map, collection or set of type decimal, all of its elements
      * must be instances of Decimal.
      *
-     * @see Cassandra\Set::__construct()
-     * @see Cassandra\Collection::__construct()
-     * @see Cassandra\Map::__construct()
+     * @see Set::__construct()
+     * @see Collection::__construct()
+     * @see Map::__construct()
      */
     const TYPE_DECIMAL = 'decimal';
 
@@ -243,9 +299,9 @@ final class Cassandra
      * When using a map, collection or set of type double, all of its elements
      * must be doubles.
      *
-     * @see Cassandra\Set::__construct()
-     * @see Cassandra\Collection::__construct()
-     * @see Cassandra\Map::__construct()
+     * @see Set::__construct()
+     * @see Collection::__construct()
+     * @see Map::__construct()
      */
     const TYPE_DOUBLE = 'double';
 
@@ -253,9 +309,9 @@ final class Cassandra
      * When using a map, collection or set of type float, all of its elements
      * must be instances of Float.
      *
-     * @see Cassandra\Set::__construct()
-     * @see Cassandra\Collection::__construct()
-     * @see Cassandra\Map::__construct()
+     * @see Set::__construct()
+     * @see Collection::__construct()
+     * @see Map::__construct()
      */
     const TYPE_FLOAT = 'float';
 
@@ -263,9 +319,9 @@ final class Cassandra
      * When using a map, collection or set of type int, all of its elements
      * must be ints.
      *
-     * @see Cassandra\Set::__construct()
-     * @see Cassandra\Collection::__construct()
-     * @see Cassandra\Map::__construct()
+     * @see Set::__construct()
+     * @see Collection::__construct()
+     * @see Map::__construct()
      */
     const TYPE_INT = 'int';
 
@@ -273,9 +329,9 @@ final class Cassandra
      * When using a map, collection or set of type timestamp, all of its elements
      * must be instances of Timestamp.
      *
-     * @see Cassandra\Set::__construct()
-     * @see Cassandra\Collection::__construct()
-     * @see Cassandra\Map::__construct()
+     * @see Set::__construct()
+     * @see Collection::__construct()
+     * @see Map::__construct()
      */
     const TYPE_TIMESTAMP = 'timestamp';
 
@@ -283,9 +339,9 @@ final class Cassandra
      * When using a map, collection or set of type uuid, all of its elements
      * must be instances of Uuid.
      *
-     * @see Cassandra\Set::__construct()
-     * @see Cassandra\Collection::__construct()
-     * @see Cassandra\Map::__construct()
+     * @see Set::__construct()
+     * @see Collection::__construct()
+     * @see Map::__construct()
      */
     const TYPE_UUID = 'uuid';
 
@@ -293,9 +349,9 @@ final class Cassandra
      * When using a map, collection or set of type varint, all of its elements
      * must be instances of Varint.
      *
-     * @see Cassandra\Set::__construct()
-     * @see Cassandra\Collection::__construct()
-     * @see Cassandra\Map::__construct()
+     * @see Set::__construct()
+     * @see Collection::__construct()
+     * @see Map::__construct()
      */
     const TYPE_VARINT = 'varint';
 
@@ -303,9 +359,9 @@ final class Cassandra
      * When using a map, collection or set of type timeuuid, all of its elements
      * must be instances of Timeuuid.
      *
-     * @see Cassandra\Set::__construct()
-     * @see Cassandra\Collection::__construct()
-     * @see Cassandra\Map::__construct()
+     * @see Set::__construct()
+     * @see Collection::__construct()
+     * @see Map::__construct()
      */
     const TYPE_TIMEUUID = 'timeuuid';
 
@@ -313,33 +369,34 @@ final class Cassandra
      * When using a map, collection or set of type inet, all of its elements
      * must be instances of Inet.
      *
-     * @see Cassandra\Set::__construct()
-     * @see Cassandra\Collection::__construct()
-     * @see Cassandra\Map::__construct()
+     * @see Set::__construct()
+     * @see Collection::__construct()
+     * @see Map::__construct()
      */
     const TYPE_INET = 'inet';
 
     /**
-     * Current version of the extension.
+     * The current version of the extension.
      */
-    const VERSION = '1.1';
+    const VERSION = '1.3.0-devel';
 
     /**
-     * Version of the cpp-driver the extension is compiled against.
+     * The version of the cpp-driver the extension is compiled against.
      */
-    const CPP_DRIVER_VERSION = '2.2.2';
+    const CPP_DRIVER_VERSION = '2.6.0-dev';
 
     /**
-     * Returns a Cluster Builder.
+     * Creates a new cluster builder for constructing a Cluster object.
      *
-     * @return Cassandra\Cluster\Builder a Cluster Builder instance
+     * @return Cluster\Builder A cluster builder object with default settings
      */
-    public static function cluster() {}
+    public static function cluster() { }
 
     /**
-     * Returns SSL Options Builder.
+     * Creates a new ssl builder for constructing a SSLOptions object.
      *
-     * @return Cassandra\SSLOptions\Builder an SSLOptions Builder instance
+     * @return SSLOptions\Builder A SSL options builder with default settings
      */
-    public static function ssl() {}
+    public static function ssl() { }
+
 }
diff --git a/Library/Cassandra/Aggregate.php b/Library/Cassandra/Aggregate.php
index 2821978..38cbb6e 100644
--- a/Library/Cassandra/Aggregate.php
+++ b/Library/Cassandra/Aggregate.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,59 +21,69 @@
 /**
  * A PHP representation of an aggregate
  */
-interface Aggregate
-{
+interface Aggregate {
+
     /**
      * Returns the full name of the aggregate
+     *
      * @return string Full name of the aggregate including name and types
      */
-    function name();
+    public function name();
 
     /**
      * Returns the simple name of the aggregate
+     *
      * @return string Simple name of the aggregate
      */
-    function simpleName();
+    public function simpleName();
 
     /**
      * Returns the argument types of the aggregate
+     *
      * @return array Argument types of the aggregate
      */
-    function argumentTypes();
+    public function argumentTypes();
 
     /**
      * Returns the final function of the aggregate
-     * @return Cassandra\Function Final function of the aggregate
+     *
+     * @return Function Final function of the aggregate
      */
-    function finalFunction();
+    public function finalFunction();
 
     /**
      * Returns the state function of the aggregate
-     * @return Cassandra\Function State function of the aggregate
+     *
+     * @return Function State function of the aggregate
      */
-    function stateFunction();
+    public function stateFunction();
 
     /**
      * Returns the initial condition of the aggregate
-     * @return Cassandra\Value Initial condition of the aggregate
+     *
+     * @return Value Initial condition of the aggregate
      */
-    function initialCondition();
+    public function initialCondition();
 
     /**
      * Returns the return type of the aggregate
-     * @return Cassandra\Type Return type of the aggregate
+     *
+     * @return Type Return type of the aggregate
      */
-    function returnType();
+    public function returnType();
 
     /**
      * Returns the state type of the aggregate
-     * @return Cassandra\Type State type of the aggregate
+     *
+     * @return Type State type of the aggregate
      */
-    function stateType();
+    public function stateType();
 
     /**
      * Returns the signature of the aggregate
+     *
      * @return string Signature of the aggregate (same as name())
      */
-    function signature();
+    public function signature();
+
 }
diff --git a/Library/Cassandra/BatchStatement.php b/Library/Cassandra/BatchStatement.php
index 8f71838..afbd5eb 100644
--- a/Library/Cassandra/BatchStatement.php
+++ b/Library/Cassandra/BatchStatement.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,24 +37,25 @@
  * @see Cassandra::BATCH_UNLOGGED
  * @see Cassandra::BATCH_COUNTER
  */
-final class BatchStatement implements Statement
-{
+final class BatchStatement implements Statement {
+
     /**
      * Creates a new batch statement.
      *
      * @param int $type must be one of Cassandra::BATCH_* (default: Cassandra::BATCH_LOGGED).
      */
-    public function __construct($type = \Cassandra::BATCH_LOGGED) {}
+    public function __construct($type) { }
 
     /**
      * Adds a statement to this batch.
      *
      * @param string|Statement $statement string or statement to add
-     * @param array|null $arguments positional or named arguments
+     * @param array|null $arguments positional or named arguments (optional)
      *
      * @throws Exception\InvalidArgumentException
      *
      * @return BatchStatement self
      */
-    public function add($statement, array $arguments = null) {}
+    public function add($statement, $arguments) { }
+
 }
diff --git a/Library/Cassandra/Bigint.php b/Library/Cassandra/Bigint.php
index d98b259..2ffc5eb 100644
--- a/Library/Cassandra/Bigint.php
+++ b/Library/Cassandra/Bigint.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,107 +21,103 @@
 /**
  * A PHP representation of the CQL `bigint` datatype
  */
-final class Bigint implements Value, Numeric
-{
-    /**
-     * Minimum possible Bigint value
-     *
-     * @return Bigint minimum value
-     */
-    public static function min() {}
+final class Bigint implements Value, Numeric {
 
     /**
-     * Maximum possible Bigint value
+     * Creates a new 64bit integer.
      *
-     * @return Bigint maximum value
+     * @param string $value integer value as a string
      */
-    public static function max() {}
+    public function __construct($value) { }
 
     /**
-     * Creates a new 64bit integer.
+     * Returns string representation of the integer value.
      *
-     * @param string $value integer value as a string
+     * @return string integer value
      */
-    public function __construct($value) {}
+    public function __toString() { }
 
     /**
      * The type of this bigint.
      *
      * @return Type
      */
-    public function type() {}
+    public function type() { }
 
     /**
      * Returns the integer value.
      *
      * @return string integer value
      */
-    public function value() {}
-
-    /**
-     * Returns string representation of the integer value.
-     *
-     * @return string integer value
-     */
-    public function __toString() {}
+    public function value() { }
 
     /**
-     * @param Numeric $addend a number to add to this one
-     *
+     * @param Numeric $num a number to add to this one
      * @return Numeric sum
      */
-    public function add(Numeric $addend) {}
+    public function add($num) { }
 
     /**
-     * @param Numeric $subtrahend a number to subtract from this one
-     *
+     * @param Numeric $num a number to subtract from this one
      * @return Numeric difference
      */
-    public function sub(Numeric $subtrahend) {}
+    public function sub($num) { }
 
     /**
-     * @param Numeric $multiplier a number to multiply this one by
-     *
+     * @param Numeric $num a number to multiply this one by
      * @return Numeric product
      */
-    public function mul(Numeric $multiplier) {}
+    public function mul($num) { }
 
     /**
-     * @param Numeric $divisor a number to divide this one by
-     *
+     * @param Numeric $num a number to divide this one by
      * @return Numeric quotient
      */
-    public function div(Numeric $divisor) {}
+    public function div($num) { }
 
     /**
-     * @param Numeric $divisor a number to divide this one by
-     *
+     * @param Numeric $num a number to divide this one by
      * @return Numeric remainder
      */
-    public function mod(Numeric $divisor) {}
+    public function mod($num) { }
 
     /**
      * @return Numeric absolute value
      */
-    public function abs() {}
+    public function abs() { }
 
     /**
      * @return Numeric negative value
      */
-    public function neg() {}
+    public function neg() { }
 
     /**
      * @return Numeric square root
      */
-    public function sqrt() {}
+    public function sqrt() { }
 
     /**
      * @return int this number as int
      */
-    public function toInt() {}
+    public function toInt() { }
 
     /**
      * @return float this number as float
      */
-    public function toDouble() {}
+    public function toDouble() { }
+
+    /**
+     * Minimum possible Bigint value
+     *
+     * @return Bigint minimum value
+     */
+    public static function min() { }
+
+    /**
+     * Maximum possible Bigint value
+     *
+     * @return Bigint maximum value
+     */
+    public static function max() { }
+
 }
diff --git a/Library/Cassandra/Blob.php b/Library/Cassandra/Blob.php
index 7c1f05a..89b798c 100644
--- a/Library/Cassandra/Blob.php
+++ b/Library/Cassandra/Blob.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,40 +21,41 @@
 /**
  * A PHP representation of the CQL `blob` datatype
  */
-final class Blob implements Value
-{
+final class Blob implements Value {
+
     /**
      * Creates a new bytes array.
      *
      * @param string $bytes any bytes
      */
-    public function __construct($bytes) {}
+    public function __construct($bytes) { }
 
     /**
-     * The type of this blob.
+     * Returns bytes as a hex string.
      *
-     * @return Type
+     * @return string bytes as hexadecimal string
      */
-    public function type() {}
+    public function __toString() { }
 
     /**
-     * Returns bytes as a hex string.
+     * The type of this blob.
      *
-     * @return string bytes as hexadecimal string
+     * @return Type
      */
-    public function bytes() {}
+    public function type() { }
 
     /**
      * Returns bytes as a hex string.
      *
      * @return string bytes as hexadecimal string
      */
-    public function __toString() {}
+    public function bytes() { }
 
     /**
      * Returns bytes as a binary string.
      *
      * @return string bytes as binary string
      */
-    public function toBinaryString() {}
+    public function toBinaryString() { }
+
 }
diff --git a/Library/Cassandra/Cluster.php b/Library/Cassandra/Cluster.php
index 68e7ae1..af15914 100644
--- a/Library/Cassandra/Cluster.php
+++ b/Library/Cassandra/Cluster.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@
 /**
  * Cluster object is used to create Sessions.
  */
-interface Cluster
-{
+interface Cluster {
+
     /**
      * Creates a new Session instance.
      *
@@ -30,7 +30,7 @@ interface Cluster
      *
      * @return Session Session instance
      */
-    function connect($keyspace = null);
+    public function connect($keyspace);
 
     /**
      * Creates a new Session instance.
@@ -39,5 +39,6 @@ function connect($keyspace = null);
      *
      * @return Future A Future Session instance
      */
-    function connectAsync($keyspace = null);
+    public function connectAsync($keyspace);
+
 }
diff --git a/Library/Cassandra/Cluster/Builder.php b/Library/Cassandra/Cluster/Builder.php
index d55f458..cc4e2c5 100644
--- a/Library/Cassandra/Cluster/Builder.php
+++ b/Library/Cassandra/Cluster/Builder.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,14 +23,14 @@
  *
  * @see \Cassandra::cluster()
  */
-final class Builder
-{
+final class Builder {
+
     /**
      * Returns a Cluster Instance.
      *
-     * @return \Cassandra\Cluster Cluster instance
+     * @return \Cluster Cluster instance
      */
-    public function build() {}
+    public function build() { }
 
     /**
      * Configures default consistency for all requests.
@@ -39,7 +39,7 @@ public function build() {}
      *
      * @return Builder self
      */
-    public function withDefaultConsistency($consistency) {}
+    public function withDefaultConsistency($consistency) { }
 
     /**
      * Configures default page size for all results.
@@ -49,7 +49,7 @@ public function withDefaultConsistency($consistency) {}
      *
      * @return Builder self
      */
-    public function withDefaultPageSize($pageSize) {}
+    public function withDefaultPageSize($pageSize) { }
 
     /**
      * Configures default timeout for future resolution in blocking operations
@@ -59,46 +59,91 @@ public function withDefaultPageSize($pageSize) {}
      *
      * @return Builder self
      */
-    public function withDefaultTimeout($timeout) {}
+    public function withDefaultTimeout($timeout) { }
 
     /**
      * Configures the initial endpoints. Note that the driver will
      * automatically discover and connect to the rest of the cluster.
      *
-     * @param string $host,... one or more ip addresses or hostnames
+     * @param string $host ,... one or more ip addresses or hostnames
      *
      * @return Builder self
      */
-    public function withContactPoints($host) {}
+    public function withContactPoints($host) { }
 
     /**
      * Specify a different port to be used when connecting to the cluster.
      *
-     * @throws \Cassandra\Exception\InvalidArgumentException
-     *
      * @param int $port a number between 1 and 65535
      *
+     * @throws \Exception\InvalidArgumentException
+     *
      * @return Builder self
      */
-    public function withPort($port) {}
+    public function withPort($port) { }
 
     /**
      * Configures this cluster to use a round robin load balancing policy.
      *
      * @return Builder self
      */
-    public function withRoundRobinLoadBalancingPolicy() {}
+    public function withRoundRobinLoadBalancingPolicy() { }
 
     /**
      * Configures this cluster to use a datacenter aware round robin load balancing policy.
      *
-     * @param string $localDatacenter                          Name of the local datacenter
-     * @param int    $hostPerRemoteDatacenter                  Maximum number of hosts to try in remote datacenters
-     * @param bool   $useRemoteDatacenterForLocalConsistencies Allow using hosts from remote datacenters to execute statements with local consistencies
+     * @param string $localDatacenter Name of the local datacenter
+     * @param int $hostPerRemoteDatacenter Maximum number of hosts to try in remote datacenters
+     * @param bool $useRemoteDatacenterForLocalConsistencies Allow using hosts from remote datacenters to execute statements with local consistencies
+     *
+     * @return Builder self
+     */
+    public function withDatacenterAwareRoundRobinLoadBalancingPolicy($localDatacenter, $hostPerRemoteDatacenter, $useRemoteDatacenterForLocalConsistencies) { }
+
+    /**
+     * Sets the blacklist hosts. Any host in the blacklist will be ignored and
+     * a conneciton will not be established. This is useful for ensuring that
+     * the driver will not connection to a predefied set of hosts.
+     *
+     * @param string $hosts A comma delimited list of addresses.
+     *
+     * @return Builder self
+     */
+    public function withBlackListHosts($hosts) { }
+
+    /**
+     * Sets the whitelist hosts. Any host not in the whitelist will be ignored
+     * and a connection will not be established. This policy is useful for
+     * ensuring that the driver will only connect to a predefined set of hosts.
+     *
+     * @param string $hosts A comma delimited list of addresses.
+     *
+     * @return Builder self
+     */
+    public function withWhiteListHosts($hosts) { }
+
+    /**
+     * Sets the blacklist datacenters. Any datacenter in the blacklist will be
+     * ignored and a connection will not be established to any host in those
+     * datacenters. This policy is useful for ensuring the driver will not
+     * connect to any host in a specific datacenter.
+     *
+     * @param string $dcs A comma delimited list of datacenters.
+     *
+     * @return Builder self
+     */
+    public function withBlackListDCs($dcs) { }
+
+    /**
+     * Sets the whitelist datacenters. Any host not in a whitelisted datacenter
+     * will be ignored. This policy is useful for ensuring the driver will only
+     * connect to hosts in specific datacenters.
+     *
+     * @param string $dcs A comma delimited list of datacenters.
      *
      * @return Builder self
      */
-    public function withDatacenterAwareRoundRobinLoadBalancingPolicy($localDatacenter, $hostPerRemoteDatacenter, $useRemoteDatacenterForLocalConsistencies) {}
+    public function withWhiteListDCs($dcs) { }
 
     /**
      * Enable token aware routing.
@@ -107,17 +152,17 @@ public function withDatacenterAwareRoundRobinLoadBalancingPolicy($localDatacente
      *
      * @return Builder self
      */
-    public function withTokenAwareRouting($enabled = true) {}
+    public function withTokenAwareRouting($enabled) { }
 
     /**
-     * Configures cassandra authentication.
+     * Configures plain-text authentication.
      *
      * @param string $username Username
      * @param string $password Password
      *
      * @return Builder self
      */
-    public function withCredentials($username, $password) {}
+    public function withCredentials($username, $password) { }
 
     /**
      * Timeout used for establishing TCP connections.
@@ -126,7 +171,7 @@ public function withCredentials($username, $password) {}
      *
      * @return Builder self
      */
-    public function withConnectTimeout($timeout) {}
+    public function withConnectTimeout($timeout) { }
 
     /**
      * Timeout used for waiting for a response from a node.
@@ -135,26 +180,25 @@ public function withConnectTimeout($timeout) {}
      *
      * @return Builder self
      */
-    public function withRequestTimeout($timeout) {}
+    public function withRequestTimeout($timeout) { }
 
     /**
      * Set up ssl context.
      *
-     * @param \Cassandra\SSLOptions $options a preconfigured ssl context
+     * @param SSLOptions $options a preconfigured ssl context
      *
      * @return Builder self
      */
-    public function withSSL(\Cassandra\SSLOptions $options) {}
+    public function withSSL($options) { }
 
     /**
      * Enable persistent sessions and clusters.
      *
      * @param bool $enabled whether to enable persistent sessions and clusters
-     *                      (optional)
      *
      * @return Builder self
      */
-    public function withPersistentSessions($enabled = true) {}
+    public function withPersistentSessions($enabled) { }
 
     /**
      * Force the driver to use a specific binary protocol version.
@@ -166,12 +210,11 @@ public function withPersistentSessions($enabled = true) {}
      *
      * NOTE: Apache Cassandra 3.x supports protocol version 3 and 4 only
      *
-     * @param int $version the actual protocol version, only `1`, `2`, `3`, or
-     *                     `4` are supported
+     * @param int $version The protocol version
      *
      * @return Builder self
      */
-    public function withProtocolVersion($version) {}
+    public function withProtocolVersion($version) { }
 
     /**
      * Total number of IO threads to use for handling the requests.
@@ -183,7 +226,7 @@ public function withProtocolVersion($version) {}
      *
      * @return Builder self
      */
-    public function withIOThreads($count) {}
+    public function withIOThreads($count) { }
 
     /**
      * Set the size of connection pools used by the driver. Pools are fixed
@@ -194,11 +237,11 @@ public function withIOThreads($count) {}
      * until only the core number of connections is left.
      *
      * @param int $core minimum connections to keep open to any given host
-     * @param int $max  maximum connections to keep open to any given host
+     * @param int $max maximum connections to keep open to any given host
      *
      * @return Builder self
      */
-    public function withConnectionsPerHost($core = 1, $max = 2) {}
+    public function withConnectionsPerHost($core, $max) { }
 
     /**
      * Specify interval in seconds that the driver should wait before attempting
@@ -208,7 +251,7 @@ public function withConnectionsPerHost($core = 1, $max = 2) {}
      *
      * @return Builder self
      */
-    public function withReconnectInterval($interval) {}
+    public function withReconnectInterval($interval) { }
 
     /**
      * Enables/disables latency-aware routing.
@@ -217,7 +260,7 @@ public function withReconnectInterval($interval) {}
      *
      * @return Builder self
      */
-    public function withLatencyAwareRouting($enabled = true) {}
+    public function withLatencyAwareRouting($enabled) { }
 
     /**
      * Disables nagle algorithm for lower latency.
@@ -226,38 +269,38 @@ public function withLatencyAwareRouting($enabled = true) {}
      *
      * @return Builder self
      */
-    public function withTCPNodelay($enabled = true) {}
+    public function withTCPNodelay($enabled) { }
 
     /**
      * Enables/disables TCP keepalive.
      *
-     * @param float|null $delay the period of inactivity in seconds, after
+     * @param float|null $delay The period of inactivity in seconds, after
      *                          which the keepalive probe should be sent over
      *                          the connection. If set to `null`, disables
      *                          keepalive probing.
      *
      * @return Builder self
      */
-    public function withTCPKeepalive($delay) {}
+    public function withTCPKeepalive($delay) { }
 
     /**
      * Configures the retry policy.
      *
-     * @param RetryPolicy $policy the retry policy to use.
+     * @param Cluster\RetryPolicy $policy the retry policy to use.
      *
      * @return Builder self
      */
-    public function withRetryPolicy(RetryPolicy $policy) {}
+    public function withRetryPolicy($policy) { }
 
     /**
      * Sets the timestamp generator.
      *
-     * @param Cassandra\TimestampGenerator $generator A timestamp generator that will be used
-     *                                                to generate timestamps for statements.
+     * @param TimestampGenerator $generator A timestamp generator that will be used
+     *                                      to generate timestamps for statements.
      *
      * @return Builder self
      */
-    public function withTimestampGenerator($generator) {}
+    public function withTimestampGenerator($generator) { }
 
     /**
      * Enables/disables Schema Metadata.
@@ -267,11 +310,11 @@ public function withTimestampGenerator($generator) {}
      * routing and $session->schema() will always return an empty object. This
      * can be useful for reducing the startup overhead of short-lived sessions.
      *
-     * @param bool $enable whether the driver fetches and maintains schema metadata.
+     * @param bool $enabled whether the driver fetches and maintains schema metadata.
      *
      * @return Builder self
      */
-    public function withSchemaMetadata($enable = true) {}
+    public function withSchemaMetadata($enabled) { }
 
     /**
      * Enables/disables Hostname Resolution.
@@ -280,11 +323,11 @@ public function withSchemaMetadata($enable = true) {}
      * reverse IP lookup. This is useful for authentication (Kerberos) or
      * encryption SSL services that require a valid hostname for verification.
      *
-     * @param bool $enable whether the driver uses hostname resolution.
+     * @param bool $enabled whether the driver uses hostname resolution.
      *
      * @return Builder self
      */
-    public function withHostnameResolution($enable = true) {}
+    public function withHostnameResolution($enabled) { }
 
     /**
      * Enables/disables Randomized Contact Points.
@@ -295,11 +338,11 @@ public function withHostnameResolution($enable = true) {}
      *
      * Note: This setting should only be disabled for debugging and testing.
      *
-     * @param bool $enable whether the driver uses randomized contact points.
+     * @param bool $enabled whether the driver uses randomized contact points.
      *
      * @return Builder self
      */
-    public function withRandomizedContactPoints($enable = true) {}
+    public function withRandomizedContactPoints($enabled) { }
 
     /**
      * Specify interval in seconds that the driver should wait before attempting
@@ -311,6 +354,6 @@ public function withRandomizedContactPoints($enable = true) {}
      *
      * @return Builder self
      */
-    public function withConnectionHeartbeatInterval($interval) {}
+    public function withConnectionHeartbeatInterval($interval) { }
 
 }
diff --git a/Library/Cassandra/Collection.php b/Library/Cassandra/Collection.php
index 83eeeb9..81a0bb0 100644
--- a/Library/Cassandra/Collection.php
+++ b/Library/Cassandra/Collection.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,102 +21,105 @@
 /**
  * A PHP representation of the CQL `list` datatype
  */
-final class Collection implements Value, \Countable, \Iterator
-{
+final class Collection implements Value, \Countable, \Iterator {
+
     /**
      * Creates a new collection of a given type.
      *
      * @param Type $type
      */
-    public function __construct($type) {}
+    public function __construct($type) { }
 
     /**
      * The type of this collection.
      *
      * @return Type
      */
-    public function type() {}
+    public function type() { }
 
     /**
      * Array of values in this collection.
      *
      * @return array values
      */
-    public function values() {}
+    public function values() { }
 
     /**
      * Adds one or more values to this collection.
      *
-     * @param mixed $value,... one or more values to add
+     * @param mixed $value ,... one or more values to add
      *
      * @return int total number of values in this collection
      */
-    public function add($value) {}
-
-    /**
-     * Deletes the value at a given index
-     *
-     * @param int $index   Index
-     *
-     * @return bool        Whether the value at a given index is correctly removed
-     */
-    public function remove($index) {}
+    public function add($value) { }
 
     /**
      * Retrieves the value at a given index.
      *
-     * @param   int   $index  Index
-     * @return  mixed         Value or null
+     * @param int $index Index
+     *
+     * @return mixed Value or null
      */
-    public function get($index) {}
+    public function get($index) { }
 
     /**
      * Finds index of a value in this collection.
      *
-     * @param   mixed  $value  Value
-     * @return  int            Index or null
+     * @param mixed $value Value
+     *
+     * @return int Index or null
      */
-    public function find($value) {}
+    public function find($value) { }
 
     /**
      * Total number of elements in this collection
      *
      * @return int count
      */
-    public function count() {}
+    public function count() { }
 
     /**
      * Current element for iteration
      *
      * @return mixed current element
      */
-    public function current() {}
+    public function current() { }
 
     /**
      * Current key for iteration
      *
      * @return int current key
      */
-    public function key() {}
+    public function key() { }
 
     /**
      * Move internal iterator forward
      *
      * @return void
      */
-    public function next() {}
+    public function next() { }
 
     /**
      * Check whether a current value exists
      *
      * @return bool
      */
-    public function valid() {}
+    public function valid() { }
 
     /**
      * Rewind internal iterator
      *
      * @return void
      */
-    public function rewind() {}
+    public function rewind() { }
+
+    /**
+     * Deletes the value at a given index
+     *
+     * @param int $index Index
+     *
+     * @return bool Whether the value at a given index is correctly removed
+     */
+    public function remove($index) { }
+
 }
diff --git a/Library/Cassandra/Column.php b/Library/Cassandra/Column.php
index b504716..0c696cc 100644
--- a/Library/Cassandra/Column.php
+++ b/Library/Cassandra/Column.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,47 +21,55 @@
 /**
  * A PHP representation of a column
  */
-interface Column
-{
+interface Column {
+
     /**
      * Returns the name of the column.
+     *
      * @return string Name of the column or null
      */
-    function name();
+    public function name();
 
     /**
      * Returns the type of the column.
-     * @return Cassandra\Type Type of the column
+     *
+     * @return Type Type of the column
      */
-    function type();
+    public function type();
 
     /**
      * Returns whether the column is in descending or ascending order.
-     * @return boolean Whether the column is stored in descending order.
+     *
+     * @return bool Whether the column is stored in descending order.
      */
-    function isReversed();
+    public function isReversed();
 
     /**
      * Returns true for static columns.
-     * @return boolean Whether the column is static
+     *
+     * @return bool Whether the column is static
      */
-    function isStatic();
+    public function isStatic();
 
     /**
      * Returns true for frozen columns.
-     * @return boolean Whether the column is frozen
+     *
+     * @return bool Whether the column is frozen
      */
-    function isFrozen();
+    public function isFrozen();
 
     /**
      * Returns name of the index if defined.
+     *
      * @return string Name of the index if defined or null
      */
-    function indexName();
+    public function indexName();
 
     /**
      * Returns index options if present.
+     *
      * @return string Index options if present or null
      */
-    function indexOptions();
+    public function indexOptions();
+
 }
diff --git a/Library/Cassandra/Custom.php b/Library/Cassandra/Custom.php
new file mode 100644
index 0000000..6a26419
--- /dev/null
+++ b/Library/Cassandra/Custom.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Copyright 2017 DataStax, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Cassandra;
+
+/**
+ * A class for representing custom values.
+ */
+abstract class Custom implements Value {
+
+    /**
+     * The type of this value.
+     *
+     * @return Type\Custom
+     */
+    public abstract function type();
+
+}
diff --git a/Library/Cassandra/Date.php b/Library/Cassandra/Date.php
index 8ab621c..25b7c85 100644
--- a/Library/Cassandra/Date.php
+++ b/Library/Cassandra/Date.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,36 +21,48 @@
 /**
  * A PHP representation of the CQL `date` type.
  */
-final class Date implements Value
-{
+final class Date implements Value {
+
     /**
      * Creates a new Date object
      *
-     * @param int $seconds Absolute seconds from epoch (1970, 1, 1), can be negative, defaults to current time
+     * @param int $seconds Absolute seconds from epoch (1970, 1, 1), can be negative, defaults to current time.
      */
-    public function __construct($seconds = null) {}
+    public function __construct($seconds) { }
 
     /**
      * The type of this date.
      *
      * @return Type
      */
-    public function type() {}
+    public function type() { }
 
     /**
      * @return int Absolute seconds from epoch (1970, 1, 1), can be negative
      */
-    public function seconds() {}
+    public function seconds() { }
 
     /**
      * Converts current date to PHP DateTime.
      *
+     * @param Time $time An optional Time object that is added to the DateTime object.
+     *
      * @return \DateTime PHP representation
      */
-    public function toDateTime() {}
+    public function toDateTime($time) { }
 
     /**
-     * @return string this date in string format: Cassandra\Date(seconds=$seconds)
+     * Creates a new Date object from a \DateTime object.
+     *
+     * @param \DateTime $datetime A \DateTime object to convert.
+     *
+     * @return \DateTime PHP representation
      */
-    public function __toString() {}
+    public static function fromDateTime($datetime) { }
+
+    /**
+     * @return string this date in string format: Date(seconds=$seconds)
+     */
+    public function __toString() { }
+
 }
diff --git a/Library/Cassandra/Decimal.php b/Library/Cassandra/Decimal.php
index f399e79..f97c9fc 100644
--- a/Library/Cassandra/Decimal.php
+++ b/Library/Cassandra/Decimal.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,108 +23,101 @@
  *
  * The actual value of a decimal is `$value * pow(10, $scale * -1)`
  */
-final class Decimal implements Value, Numeric
-{
+final class Decimal implements Value, Numeric {
+
     /**
      * Creates a decimal from a given decimal string:
      *
      * ~~~{.php}
      * <?php
      * $decimal = new Cassandra::Decimal("1313123123.234234234234234234123");
-     *
-     * $this->assertEquals(21, $decimal->scale());
-     * $this->assertEquals("1313123123234234234234234234123", $decimal->value());
      * ~~~
      *
      * @param string $value Any decimal string
      */
-    public function __construct($value) {}
+    public function __construct($value) { }
 
     /**
-     * The type of this decimal.
+     * String representation of this decimal.
      *
-     * @return Type
+     * @return string Decimal value
      */
-    public function type() {}
+    public function __toString() { }
 
     /**
-     * String representation of this decimal.
+     * The type of this decimal.
      *
-     * @return string Decimal value
+     * @return Type
      */
-    public function __toString() {}
+    public function type() { }
 
     /**
      * Numeric value of this decimal as string.
      *
      * @return string Numeric value
      */
-    public function value() {}
+    public function value() { }
 
     /**
      * Scale of this decimal as int.
      *
      * @return int Scale
      */
-    public function scale() {}
+    public function scale() { }
 
     /**
-     * @param Numeric $addend a number to add to this one
-     *
+     * @param Numeric $num a number to add to this one
      * @return Numeric sum
      */
-    public function add(Numeric $addend) {}
+    public function add($num) { }
 
     /**
-     * @param Numeric $subtrahend a number to subtract from this one
-     *
+     * @param Numeric $num a number to subtract from this one
      * @return Numeric difference
      */
-    public function sub(Numeric $subtrahend) {}
+    public function sub($num) { }
 
     /**
-     * @param Numeric $multiplier a number to multiply this one by
-     *
+     * @param Numeric $num a number to multiply this one by
      * @return Numeric product
      */
-    public function mul(Numeric $multiplier) {}
+    public function mul($num) { }
 
     /**
-     * @param Numeric $divisor a number to divide this one by
-     *
+     * @param Numeric $num a number to divide this one by
      * @return Numeric quotient
      */
-    public function div(Numeric $divisor) {}
+    public function div($num) { }
 
     /**
-     * @param Numeric $divisor a number to divide this one by
-     *
+     * @param Numeric $num a number to divide this one by
      * @return Numeric remainder
      */
-    public function mod(Numeric $divisor) {}
+    public function mod($num) { }
 
     /**
      * @return Numeric absolute value
      */
-    public function abs() {}
+    public function abs() { }
 
     /**
      * @return Numeric negative value
      */
-    public function neg() {}
+    public function neg() { }
 
     /**
      * @return Numeric square root
      */
-    public function sqrt() {}
+    public function sqrt() { }
 
     /**
      * @return int this number as int
      */
-    public function toInt() {}
+    public function toInt() { }
 
     /**
      * @return float this number as float
      */
-    public function toDouble() {}
+    public function toDouble() { }
+
 }
diff --git a/Library/Cassandra/DefaultAggregate.php b/Library/Cassandra/DefaultAggregate.php
index 6d69fc3..75e2aa0 100644
--- a/Library/Cassandra/DefaultAggregate.php
+++ b/Library/Cassandra/DefaultAggregate.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,68 +21,69 @@
 /**
  * A PHP representation of an aggregate
  */
-final class DefaultAggregate implements Aggregate
-{
+final class DefaultAggregate implements Aggregate {
+
     /**
      * {@inheritDoc}
      *
      * @return string Full name of the aggregate including name and types
      */
-    public function name() {}
+    public function name() { }
 
     /**
      * {@inheritDoc}
      *
      * @return string Simple name of the aggregate
      */
-    public function simpleName() {}
+    public function simpleName() { }
 
     /**
      * {@inheritDoc}
      *
      * @return array Argument types of the aggregate
      */
-    public function argumentTypes() {}
+    public function argumentTypes() { }
 
     /**
      * {@inheritDoc}
      *
-     * @return Cassandra\Function Final public function of the aggregate
+     * @return Function State public function of the aggregate
      */
-    public function finalFunction() {}
+    public function stateFunction() { }
 
     /**
      * {@inheritDoc}
      *
-     * @return Cassandra\Function State public function of the aggregate
+     * @return Function Final public function of the aggregate
      */
-    public function stateFunction() {}
+    public function finalFunction() { }
 
     /**
      * {@inheritDoc}
      *
-     * @return Cassandra\Value Initial condition of the aggregate
+     * @return Value Initial condition of the aggregate
      */
-    public function initialCondition() {}
+    public function initialCondition() { }
 
     /**
      * {@inheritDoc}
      *
-     * @return Cassandra\Type Return type of the aggregate
+     * @return Type State type of the aggregate
      */
-    public function returnType() {}
+    public function stateType() { }
 
     /**
      * {@inheritDoc}
      *
-     * @return Cassandra\Type State type of the aggregate
+     * @return Type Return type of the aggregate
      */
-    public function stateType() {}
+    public function returnType() { }
 
     /**
      * {@inheritDoc}
      *
      * @return string Signature of the aggregate (same as name())
      */
-    public function signature() {}
+    public function signature() { }
+
 }
diff --git a/Library/Cassandra/DefaultCluster.php b/Library/Cassandra/DefaultCluster.php
index 0a346f6..7204b9e 100644
--- a/Library/Cassandra/DefaultCluster.php
+++ b/Library/Cassandra/DefaultCluster.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,22 +18,22 @@
 
 namespace Cassandra;
 
-
 /**
  * Default cluster implementation.
  *
- * @see Cassandra\Cluster
+ * @see Cluster
  */
-final class DefaultCluster implements Cluster
-{
+final class DefaultCluster implements Cluster {
+
     /**
      * {@inheritDoc}
      *
      * @param string $keyspace Optional keyspace name
+     * @param int $timeout Optional timeout
      *
      * @return Session Session instance
      */
-    public function connect($keyspace = null) {}
+    public function connect($keyspace, $timeout) { }
 
     /**
      * {@inheritDoc}
@@ -42,5 +42,6 @@ public function connect($keyspace = null) {}
      *
      * @return Future A Future Session instance
      */
-    public function connectAsync($keyspace = null) {}
+    public function connectAsync($keyspace) { }
+
 }
diff --git a/Library/Cassandra/DefaultColumn.php b/Library/Cassandra/DefaultColumn.php
index 0306b21..e48ff73 100644
--- a/Library/Cassandra/DefaultColumn.php
+++ b/Library/Cassandra/DefaultColumn.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,54 +21,55 @@
 /**
  * A PHP representation of a column
  */
-final class DefaultColumn implements Column
-{
+final class DefaultColumn implements Column {
+
     /**
      * {@inheritDoc}
      *
      * @return string Name of the column or null
      */
-    public function name() {}
+    public function name() { }
 
     /**
      * {@inheritDoc}
      *
-     * @return Cassandra\Type Type of the column
+     * @return Type Type of the column
      */
-    public function type() {}
+    public function type() { }
 
     /**
      * {@inheritDoc}
      *
-     * @return boolean Whether the column is stored in descending order.
+     * @return bool Whether the column is stored in descending order.
      */
-    public function isReversed() {}
+    public function isReversed() { }
 
     /**
      * {@inheritDoc}
      *
-     * @return boolean Whether the column is static
+     * @return bool Whether the column is static
      */
-    public function isStatic() {}
+    public function isStatic() { }
 
     /**
      * {@inheritDoc}
      *
-     * @return boolean Whether the column is frozen
+     * @return bool Whether the column is frozen
      */
-    public function isFrozen() {}
+    public function isFrozen() { }
 
     /**
      * {@inheritDoc}
      *
      * @return string Name of the index if defined or null
      */
-    public function indexName() {}
+    public function indexName() { }
 
     /**
      * {@inheritDoc}
      *
      * @return string Index options if present or null
      */
-    public function indexOptions() {}
+    public function indexOptions() { }
+
 }
diff --git a/Library/Cassandra/DefaultFunction.php b/Library/Cassandra/DefaultFunction.php
index ad9876a..b999bf4 100644
--- a/Library/Cassandra/DefaultFunction.php
+++ b/Library/Cassandra/DefaultFunction.php
@@ -1,9 +1,9 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
- * Licensed under the Apache License, Version 2.0 (the "License") {}
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -16,66 +16,67 @@
  * limitations under the License.
  */
 
-namespace Cassandra {}
+namespace Cassandra;
 
 /**
  * A PHP representation of a public function
  */
-final class DefaultFunction implements Function
-{
+final class DefaultFunction implements Function_ {
+
     /**
      * {@inheritDoc}
      *
      * @return string Full name of the function including name and types
      */
-    public public function name() {}
+    public function name() { }
 
     /**
      * {@inheritDoc}
      *
      * @return string Simple name of the function
      */
-    public function simpleName() {}
+    public function simpleName() { }
 
     /**
      * {@inheritDoc}
      *
      * @return array Arguments of the function
      */
-    public function arguments() {}
+    public function arguments() { }
 
     /**
      * {@inheritDoc}
      *
-     * @return Cassandra\Type Return type of the function
+     * @return Type Return type of the function
      */
-    public function returnType() {}
+    public function returnType() { }
 
     /**
      * {@inheritDoc}
      *
      * @return string Signature of the function (same as name())
      */
-    public function signature() {}
+    public function signature() { }
 
     /**
      * {@inheritDoc}
      *
      * @return string Language used by the function
      */
-    public function language() {}
+    public function language() { }
 
     /**
      * {@inheritDoc}
      *
      * @return string Body of the function
      */
-    public function body() {}
+    public function body() { }
 
     /**
      * {@inheritDoc}
      *
-     * @return boolean
+     * @return bool
      */
-    public function isCalledOnNullInput() {}
+    public function isCalledOnNullInput() { }
+
 }
diff --git a/Library/Cassandra/DefaultIndex.php b/Library/Cassandra/DefaultIndex.php
index a050440..f85c59d 100644
--- a/Library/Cassandra/DefaultIndex.php
+++ b/Library/Cassandra/DefaultIndex.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,55 +21,57 @@
 /**
  * A PHP representation of an index
  */
-final class DefaultIndex implements Index
-{
+final class DefaultIndex implements Index {
+
     /**
      * {@inheritDoc}
      *
      * @return string Name of the index
      */
-    public function name() {}
+    public function name() { }
 
     /**
      * {@inheritDoc}
      *
      * @return string Kind of the index
      */
-    public function kind() {}
+    public function kind() { }
 
     /**
      * {@inheritDoc}
      *
      * @return string Target column name of the index
      */
-    public function target() {}
+    public function target() { }
 
     /**
      * {@inheritDoc}
      *
-     * @return Cassandra\Value Value of an option by name
+     * @param string $name {@inheritDoc}
+     *
+     * @return Value Value of an option by name
      */
-    public function option($name) {}
+    public function option($name) { }
 
     /**
      * {@inheritDoc}
      *
-     * @return array A dictionary of `string` and `Cassandra\Value pairs of the
-     *               index's options.
+     * @return array A dictionary of `string` and `Value` pairs of the
      */
-    public function options() {}
+    public function options() { }
 
     /**
      * {@inheritDoc}
      *
      * @return string Class name of a custom index
      */
-    public function className() {}
+    public function className() { }
 
     /**
      * {@inheritDoc}
      *
-     * @return boolean
+     * @return bool
      */
-    public function isCustom() {}
+    public function isCustom() { }
+
 }
diff --git a/Library/Cassandra/DefaultKeyspace.php b/Library/Cassandra/DefaultKeyspace.php
index 0770baf..693accb 100644
--- a/Library/Cassandra/DefaultKeyspace.php
+++ b/Library/Cassandra/DefaultKeyspace.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,48 +21,116 @@
 /**
  * A PHP representation of a keyspace
  */
-final class DefaultKeyspace implements Keyspace
-{
+final class DefaultKeyspace implements Keyspace {
+
     /**
      * {@inheritDoc}
      *
      * @return string Name
      */
-    public function name() {}
+    public function name() { }
 
     /**
      * {@inheritDoc}
      *
      * @return string Replication class
      */
-    public function replicationClassName() {}
+    public function replicationClassName() { }
 
     /**
      * {@inheritDoc}
      *
-     * @return Cassandra\Map Replication options
+     * @return Map Replication options
      */
-    public function replicationOptions() {}
+    public function replicationOptions() { }
 
     /**
      * {@inheritDoc}
      *
      * @return string Whether durable writes are enabled
      */
-    public function hasDurableWrites() {}
+    public function hasDurableWrites() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param string $name Table name
+     *
+     * @return Table Table instance or null
+     */
+    public function table($name) { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return array An array of `Table` instances
+     */
+    public function tables() { }
 
     /**
      * {@inheritDoc}
      *
-     * @param  string          $name  Table name
-     * @return Cassandra\Table        Table instance or null
+     * @param string $name {@inheritDoc}
+     *
+     * @return Type\UserType|null {@inheritDoc}
+     */
+    public function userType($name) { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return array {@inheritDoc}
+     */
+    public function userTypes() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param string $name {@inheritDoc}
+     *
+     * @return MaterizedView|null {@inheritDoc}
      */
-    public function table($name) {}
+    public function materializedView($name) { }
 
     /**
      * {@inheritDoc}
      *
-     * @return array An array of `Cassandra\Table` instances
+     * @return array {@inheritDoc}
      */
-    public function tables() {}
+    public function materializedViews() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param string $name {@inheritDoc}
+     * @param string|Type $params {@inheritDoc}
+     *
+     * @return Function|null {@inheritDoc}
+     */
+    public function function_($name, ...$params) { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return array {@inheritDoc}
+     */
+    public function functions() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param string $name {@inheritDoc}
+     * @param string|Type $params {@inheritDoc}
+     *
+     * @return Aggregate|null {@inheritDoc}
+     */
+    public function aggregate($name, ...$params) { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return array {@inheritDoc}
+     */
+    public function aggregates() { }
+
 }
diff --git a/Library/Cassandra/DefaultMaterializedView.php b/Library/Cassandra/DefaultMaterializedView.php
new file mode 100644
index 0000000..e2798f6
--- /dev/null
+++ b/Library/Cassandra/DefaultMaterializedView.php
@@ -0,0 +1,219 @@
+<?php
+
+/**
+ * Copyright 2017 DataStax, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Cassandra;
+
+/**
+ * A PHP representation of a materialized view
+ */
+final class DefaultMaterializedView extends MaterializedView  {
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return string Name of the view
+     */
+    public function name() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param string $name {@inheritDoc}
+     *
+     * @return Value Value of an option by name
+     */
+    public function option($name) { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return array A dictionary of string and Value pairs of the
+     */
+    public function options() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return string Table description or null
+     */
+    public function comment() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return float Read repair chance
+     */
+    public function readRepairChance() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return float Local read repair chance
+     */
+    public function localReadRepairChance() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return int GC grace seconds
+     */
+    public function gcGraceSeconds() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return string Caching options
+     */
+    public function caching() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return float Bloom filter FP chance
+     */
+    public function bloomFilterFPChance() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return int Memtable flush period in milliseconds
+     */
+    public function memtableFlushPeriodMs() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return int Default TTL.
+     */
+    public function defaultTTL() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return string Speculative retry.
+     */
+    public function speculativeRetry() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return int Index interval
+     */
+    public function indexInterval() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return string Compaction strategy class name
+     */
+    public function compactionStrategyClassName() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return Map Compaction strategy options
+     */
+    public function compactionStrategyOptions() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return Map Compression parameters
+     */
+    public function compressionParameters() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return bool Value of `populate_io_cache_on_flush` or null
+     */
+    public function populateIOCacheOnFlush() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return bool Value of `replicate_on_write` or null
+     */
+    public function replicateOnWrite() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return int Value of `max_index_interval` or null
+     */
+    public function maxIndexInterval() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return int Value of `min_index_interval` or null
+     */
+    public function minIndexInterval() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param string $name Name of the column
+     *
+     * @return Column Column instance
+     */
+    public function column($name) { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return array A list of Column instances
+     */
+    public function columns() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return array A list of of Column instances
+     */
+    public function partitionKey() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return array A list of of Column instances
+     */
+    public function primaryKey() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return array A list of of Column instances
+     */
+    public function clusteringKey() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return array A list of cluster column orders ('asc' and 'desc')
+     */
+    public function clusteringOrder() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return Table Base table of the view
+     */
+    public function baseTable() { }
+
+}
diff --git a/Library/Cassandra/DefaultSchema.php b/Library/Cassandra/DefaultSchema.php
index 57a74e6..3860976 100644
--- a/Library/Cassandra/DefaultSchema.php
+++ b/Library/Cassandra/DefaultSchema.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,27 +21,29 @@
 /**
  * A PHP representation of a schema
  */
-final class DefaultSchema implements Schema
-{
+final class DefaultSchema implements Schema {
+
     /**
      * {@inheritDoc}
      *
-     * @param  string             $name Name of the keyspace to get
-     * @return Cassandra\Keyspace       Keyspace instance or null
+     * @param string $name Name of the keyspace to get
+     *
+     * @return Keyspace Keyspace instance or null
      */
-    public function keyspace($name) {}
+    public function keyspace($name) { }
 
     /**
      * {@inheritDoc}
      *
-     * @return array An array of `Cassandra\Keyspace` instances.
+     * @return array An array of `Keyspace` instances.
      */
-    public function keyspaces() {}
+    public function keyspaces() { }
 
     /**
      * {@inheritDoc}
      *
      * @return int Version of the schema.
      */
-    public function version() {}
+    public function version() { }
+
 }
diff --git a/Library/Cassandra/DefaultSession.php b/Library/Cassandra/DefaultSession.php
index cc48bec..54198cf 100644
--- a/Library/Cassandra/DefaultSession.php
+++ b/Library/Cassandra/DefaultSession.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,82 +19,78 @@
 namespace Cassandra;
 
 /**
- * Actual session implementation.
- *
- * @see Cassandra\Session
+ * {@inheritDoc}
  */
-final class DefaultSession implements Session
-{
+final class DefaultSession implements Session {
+
     /**
      * {@inheritDoc}
      *
-     * @return array Performance/Diagnostic metrics.
+     * @param string|Statement $statement {@inheritDoc}
+     * @param array|ExecutionOptions|null $options {@inheritDoc}
+     *
+     * @return Rows {@inheritDoc}
      */
-    public function metrics() {}
+    public function execute($statement, $options) { }
 
     /**
      * {@inheritDoc}
      *
-     * @return Schema current schema.
+     * @param string|Statement $statement {@inheritDoc}
+     * @param array|ExecutionOptions|null $options {@inheritDoc}
+     *
+     * @return FutureRows {@inheritDoc}
      */
-    public function schema() {}
+    public function executeAsync($statement, $options) { }
 
     /**
      * {@inheritDoc}
      *
-     * @throws Exception
+     * @param string $cql {@inheritDoc}
+     * @param ExecutionOptions $options {@inheritDoc}
      *
-     * @param string|Statement $statement string or statement to be executed
-     * @param ExecutionOptions $options   execution options (optional)
-     *
-     * @return Rows execution result
+     * @return PreparedStatement {@inheritDoc}
      */
-    public function execute($statement, ExecutionOptions $options = null) {}
+    public function prepare($cql, $options) { }
 
     /**
      * {@inheritDoc}
      *
-     * @param string|Statement      $statement string or statement to be executed
-     * @param ExecutionOptions|null $options   execution options (optional)
+     * @param string $cql {@inheritDoc}
+     * @param ExecutionOptions $options {@inheritDoc}
      *
-     * @return Future future result
+     * @return FuturePreparedStatement {@inheritDoc}
      */
-    public function executeAsync($statement, ExecutionOptions $options = null) {}
+    public function prepareAsync($cql, $options) { }
 
     /**
      * {@inheritDoc}
      *
-     * @throws Exception
-     *
-     * @param string                $cql     CQL statement string
-     * @param ExecutionOptions|null $options execution options (optional)
+     * @param double $timeout {@inheritDoc}
      *
-     * @return PreparedStatement prepared statement
+     * @return null {@inheritDoc}
      */
-    public function prepare($cql, ExecutionOptions $options = null) {}
+    public function close($timeout) { }
 
     /**
      * {@inheritDoc}
      *
-     * @param string                $cql     CQL string to be prepared
-     * @param ExecutionOptions|null $options preparation options
-     *
-     * @return Future statement
+     * @return FutureClose {@inheritDoc}
      */
-    public function prepareAsync($cql, ExecutionOptions $options = null) {}
+    public function closeAsync() { }
 
     /**
      * {@inheritDoc}
      *
-     * @param float|null $timeout Timeout to wait for closure in seconds
-     * @return void
+     * @return array {@inheritDoc}
      */
-    public function close($timeout = null) {}
+    public function metrics() { }
 
     /**
      * {@inheritDoc}
      *
-     * @return Future future
+     * @return Schema {@inheritDoc}
      */
-    public function closeAsync() {}
+    public function schema() { }
+
 }
diff --git a/Library/Cassandra/DefaultTable.php b/Library/Cassandra/DefaultTable.php
index 90ed8b4..eb41321 100644
--- a/Library/Cassandra/DefaultTable.php
+++ b/Library/Cassandra/DefaultTable.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,185 +21,224 @@
 /**
  * A PHP representation of a table
  */
-final class DefaultTable implements Table
-{
+final class DefaultTable implements Table {
+
     /**
      * {@inheritDoc}
      *
      * @return string Name of the table
      */
-    public function name() {}
+    public function name() { }
 
     /**
      * {@inheritDoc}
      *
-     * @return Cassandra\Value Value of an option by name
+     * @param string $name {@inheritDoc}
+     *
+     * @return Value Value of an option by name
      */
-    public function option($name) {}
+    public function option($name) { }
 
     /**
      * {@inheritDoc}
      *
-     * @return array A dictionary of `string` and `Cassandra\Value pairs of the
-     *               table's options.
+     * @return array A dictionary of `string` and `Value` pairs of the
      */
-    public function options() {}
+    public function options() { }
 
     /**
      * {@inheritDoc}
      *
      * @return string Table description or null
      */
-    public function comment() {}
+    public function comment() { }
 
     /**
      * {@inheritDoc}
      *
      * @return float Read repair chance
      */
-    public function readRepairChance() {}
+    public function readRepairChance() { }
 
     /**
      * {@inheritDoc}
      *
      * @return float Local read repair chance
      */
-    public function localReadRepairChance() {}
+    public function localReadRepairChance() { }
 
     /**
      * {@inheritDoc}
      *
      * @return int GC grace seconds
      */
-    public function gcGraceSeconds() {}
+    public function gcGraceSeconds() { }
 
     /**
      * {@inheritDoc}
      *
      * @return string Caching options
      */
-    public function caching() {}
+    public function caching() { }
 
     /**
      * {@inheritDoc}
      *
      * @return float Bloom filter FP chance
      */
-    public function bloomFilterFPChance() {}
+    public function bloomFilterFPChance() { }
 
     /**
      * {@inheritDoc}
      *
      * @return int Memtable flush period in milliseconds
      */
-    public function memtableFlushPeriodMs() {}
+    public function memtableFlushPeriodMs() { }
 
     /**
      * {@inheritDoc}
      *
      * @return int Default TTL.
      */
-    public function defaultTTL() {}
+    public function defaultTTL() { }
 
     /**
      * {@inheritDoc}
      *
      * @return string Speculative retry.
      */
-    public function speculativeRetry() {}
+    public function speculativeRetry() { }
 
     /**
      * {@inheritDoc}
      *
      * @return int Index interval
      */
-    public function indexInterval() {}
+    public function indexInterval() { }
 
     /**
      * {@inheritDoc}
      *
      * @return string Compaction strategy class name
      */
-    public function compactionStrategyClassName() {}
+    public function compactionStrategyClassName() { }
 
     /**
      * {@inheritDoc}
      *
-     * @return Cassandra\Map Compaction strategy options
+     * @return Map Compaction strategy options
      */
-    public function compactionStrategyOptions() {}
+    public function compactionStrategyOptions() { }
 
     /**
      * {@inheritDoc}
      *
-     * @return Cassandra\Map Compression parameters
+     * @return Map Compression parameters
      */
-    public function compressionParameters() {}
+    public function compressionParameters() { }
 
     /**
      * {@inheritDoc}
-     * @return boolean Value of `populate_io_cache_on_flush` or null
+     *
+     * @return bool Value of `populate_io_cache_on_flush` or null
      */
-    public function populateIOCacheOnFlush() {}
+    public function populateIOCacheOnFlush() { }
 
     /**
      * {@inheritDoc}
-     * @return boolean Value of `replicate_on_write` or null
+     *
+     * @return bool Value of `replicate_on_write` or null
      */
-    public function replicateOnWrite() {}
+    public function replicateOnWrite() { }
 
     /**
      * {@inheritDoc}
+     *
      * @return int Value of `max_index_interval` or null
      */
-    public function maxIndexInterval() {}
+    public function maxIndexInterval() { }
 
     /**
      * {@inheritDoc}
+     *
      * @return int Value of `min_index_interval` or null
      */
-    public function minIndexInterval() {}
+    public function minIndexInterval() { }
 
     /**
      * {@inheritDoc}
      *
-     * @param  string           $name Name of the column
-     * @return Cassandra\Column Column instance
+     * @param string $name Name of the column
+     *
+     * @return Column Column instance
      */
-    public function column($name) {}
+    public function column($name) { }
 
     /**
      * {@inheritDoc}
      *
-     * @return array A list of `Cassandra\Column` instances
+     * @return array A list of `Column` instances
      */
-    public function columns() {}
+    public function columns() { }
 
     /**
      * {@inheritDoc}
      *
-     * @return array A list of of `Cassandra\Column` instance
+     * @return array A list of of `Column` instance
      */
-    public function partitionKey() {}
+    public function partitionKey() { }
 
     /**
      * {@inheritDoc}
      *
-     * @return array A list of of `Cassandra\Column` instance
+     * @return array A list of of `Column` instance
      */
-    public function primaryKey() {}
+    public function primaryKey() { }
 
     /**
      * {@inheritDoc}
      *
-     * @return array A list of of `Cassandra\Column` instances
+     * @return array A list of of `Column` instances
      */
-    public function clusteringKey() {}
+    public function clusteringKey() { }
 
     /**
      * {@inheritDoc}
      *
      * @return array A list of cluster column orders ('asc' and 'desc')
      */
-    public function clusteringOrder() {}
+    public function clusteringOrder() { }
+
+    /**
+     * Get an index by name
+     *
+     * @param string $name Index name
+     *
+     * @return Index|null An index or null
+     */
+    public function index($name) { }
+
+    /**
+     * Gets all indexes
+     *
+     * @return array An array of indexes
+     */
+    public function indexes() { }
+
+    /**
+     * Get materialized view by name
+     *
+     * @param string $name Materialized view name
+     *
+     * @return MaterizedView|null A materialized view or null
+     */
+    public function materializedView($name) { }
+
+    /**
+     * Gets all materialized views
+     *
+     * @return array An array of materialized views
+     */
+    public function materializedViews() { }
+
 }
diff --git a/Library/Cassandra/Duration.php b/Library/Cassandra/Duration.php
index 014e2fa..aee007a 100644
--- a/Library/Cassandra/Duration.php
+++ b/Library/Cassandra/Duration.php
@@ -1,17 +1,27 @@
 <?php
 
-/*
-  Copyright (c) 2016 DataStax, Inc.
-  This software can be used solely with DataStax Enterprise. Please consult the
-  license at http://www.datastax.com/terms/datastax-Cassandra-driver-license-terms
-*/
+/**
+ * Copyright 2017 DataStax, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 namespace Cassandra;
 
 /**
  * A PHP representation of the CQL `duration` datatype
  */
-final class Duration implements Value  {
+final class Duration implements Value {
 
     /**
      * @param long|double|string|Bigint $months Months attribute of the duration.
@@ -21,6 +31,8 @@ final class Duration implements Value  {
     public function __construct($months, $days, $nanos) { }
 
     /**
+     * {@inheritDoc}
+     *
      * @return Type the Cassandra type for Duration
      */
     public function type() { }
diff --git a/Library/Cassandra/Exception.php b/Library/Cassandra/Exception.php
index 29f10cb..4110990 100644
--- a/Library/Cassandra/Exception.php
+++ b/Library/Cassandra/Exception.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@
 /**
  * An interface implemented by all exceptions thrown by the PHP Driver.
  * Makes it easy to catch all driver-related exceptions using
- * `catch (Cassandra\Exception $e)`.
+ * `catch (Exception $e)`.
  */
-interface Exception {}
+interface Exception {
+
+}
diff --git a/Library/Cassandra/Exception/AlreadyExistsException.php b/Library/Cassandra/Exception/AlreadyExistsException.php
index 766ac77..945f277 100644
--- a/Library/Cassandra/Exception/AlreadyExistsException.php
+++ b/Library/Cassandra/Exception/AlreadyExistsException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,4 +21,23 @@
 /**
  * AlreadyExistsException is raised when attempting to re-create existing keyspace.
  */
-class AlreadyExistsException extends ConfigurationException {}
+class AlreadyExistsException extends ConfigurationException  {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/AuthenticationException.php b/Library/Cassandra/Exception/AuthenticationException.php
index 3c71eec..4632d51 100644
--- a/Library/Cassandra/Exception/AuthenticationException.php
+++ b/Library/Cassandra/Exception/AuthenticationException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,4 +22,23 @@
  * AuthenticationException is raised when client was not configured with valid
  * authentication credentials.
  */
-class AuthenticationException extends RuntimeException {}
+class AuthenticationException extends RuntimeException  {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/ConfigurationException.php b/Library/Cassandra/Exception/ConfigurationException.php
index 9fd9421..6729028 100644
--- a/Library/Cassandra/Exception/ConfigurationException.php
+++ b/Library/Cassandra/Exception/ConfigurationException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,4 +23,23 @@
  * invalid because of some configuration issue.
  * For example when attempting to drop a non-existent keyspace.
  */
-class ConfigurationException extends ValidationException {}
+class ConfigurationException extends ValidationException  {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/DivideByZeroException.php b/Library/Cassandra/Exception/DivideByZeroException.php
index 77d4cbb..3111504 100644
--- a/Library/Cassandra/Exception/DivideByZeroException.php
+++ b/Library/Cassandra/Exception/DivideByZeroException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,25 @@
 namespace Cassandra\Exception;
 
 /**
- * Cassandra-specific domain exception.
+ * Cassandra domain exception.
  */
-class DivideByZeroException extends RangeException {}
+class DivideByZeroException extends RangeException  {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/DomainException.php b/Library/Cassandra/Exception/DomainException.php
index a69e622..a301fb8 100644
--- a/Library/Cassandra/Exception/DomainException.php
+++ b/Library/Cassandra/Exception/DomainException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,26 @@
 
 namespace Cassandra\Exception;
 
-use Cassandra\Exception;
-
 /**
- * Cassandra-specific domain exception.
+ * Cassandra domain exception.
  */
-class DomainException extends \DomainException implements Exception {}
+class DomainException extends \DomainException implements Exception {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/ExecutionException.php b/Library/Cassandra/Exception/ExecutionException.php
index 44a851b..4711350 100644
--- a/Library/Cassandra/Exception/ExecutionException.php
+++ b/Library/Cassandra/Exception/ExecutionException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,4 +25,23 @@
  * @see ReadTimeoutException
  * @see WriteTimeoutException
  */
-class ExecutionException extends RuntimeException {}
+class ExecutionException extends RuntimeException  {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/InvalidArgumentException.php b/Library/Cassandra/Exception/InvalidArgumentException.php
index 2842c21..fb69205 100644
--- a/Library/Cassandra/Exception/InvalidArgumentException.php
+++ b/Library/Cassandra/Exception/InvalidArgumentException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,26 @@
 
 namespace Cassandra\Exception;
 
-use Cassandra\Exception;
-
 /**
- * Cassandra-specific invalid argument exception.
+ * Cassandra invalid argument exception.
  */
-class InvalidArgumentException extends \InvalidArgumentException implements Exception {}
+class InvalidArgumentException extends \InvalidArgumentException implements Exception {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/InvalidQueryException.php b/Library/Cassandra/Exception/InvalidQueryException.php
index 6ea87cb..4234995 100644
--- a/Library/Cassandra/Exception/InvalidQueryException.php
+++ b/Library/Cassandra/Exception/InvalidQueryException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,4 +22,23 @@
  * InvalidQueryException is raised when query is syntactically correct but invalid.
  * For example when attempting to create a table without specifying a keyspace.
  */
-class InvalidQueryException extends ValidationException {}
+class InvalidQueryException extends ValidationException  {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/InvalidSyntaxException.php b/Library/Cassandra/Exception/InvalidSyntaxException.php
index 591bd39..68b6fd7 100644
--- a/Library/Cassandra/Exception/InvalidSyntaxException.php
+++ b/Library/Cassandra/Exception/InvalidSyntaxException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,4 +21,23 @@
 /**
  * InvalidSyntaxException is raised when CQL in the request is syntactically incorrect.
  */
-class InvalidSyntaxException extends ValidationException {}
+class InvalidSyntaxException extends ValidationException  {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/IsBootstrappingException.php b/Library/Cassandra/Exception/IsBootstrappingException.php
index f3512f5..203b313 100644
--- a/Library/Cassandra/Exception/IsBootstrappingException.php
+++ b/Library/Cassandra/Exception/IsBootstrappingException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,4 +21,23 @@
 /**
  * IsBootstrappingException is raised when a node is bootstrapping.
  */
-class IsBootstrappingException extends ServerException {}
+class IsBootstrappingException extends ServerException  {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/LogicException.php b/Library/Cassandra/Exception/LogicException.php
index 6cdd18c..d00e41d 100644
--- a/Library/Cassandra/Exception/LogicException.php
+++ b/Library/Cassandra/Exception/LogicException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,26 @@
 
 namespace Cassandra\Exception;
 
-use Cassandra\Exception;
-
 /**
- * Cassandra-specific logic exception.
+ * Cassandra logic exception.
  */
-class LogicException extends \LogicException implements Exception {}
+class LogicException extends \LogicException implements Exception {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/OverloadedException.php b/Library/Cassandra/Exception/OverloadedException.php
index 89c981a..7eb9c37 100644
--- a/Library/Cassandra/Exception/OverloadedException.php
+++ b/Library/Cassandra/Exception/OverloadedException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,4 +21,23 @@
 /**
  * OverloadedException is raised when a node is overloaded.
  */
-class OverloadedException extends ServerException {}
+class OverloadedException extends ServerException  {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/ProtocolException.php b/Library/Cassandra/Exception/ProtocolException.php
index 30af59d..1ff516c 100644
--- a/Library/Cassandra/Exception/ProtocolException.php
+++ b/Library/Cassandra/Exception/ProtocolException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,27 @@
 namespace Cassandra\Exception;
 
 /**
- * ProtocolException is raised when a client did not follow Apache Cassandra
- * protocol, e.g. sending a QUERY message before STARTUP. Seeing this error can
- * be considered a bug.
+ * ProtocolException is raised when a client did not follow server's protocol,
+ * e.g. sending a QUERY message before STARTUP. Seeing this error can be
+ * considered a bug.
  */
-class ProtocolException extends RuntimeException {}
+class ProtocolException extends RuntimeException  {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/RangeException.php b/Library/Cassandra/Exception/RangeException.php
index 383895c..d8a7819 100644
--- a/Library/Cassandra/Exception/RangeException.php
+++ b/Library/Cassandra/Exception/RangeException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,26 @@
 
 namespace Cassandra\Exception;
 
-use Cassandra\Exception;
-
 /**
- * Cassandra-specific domain exception.
+ * Cassandra domain exception.
  */
-class RangeException extends \RangeException implements Exception {}
+class RangeException extends \RangeException implements Exception {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/ReadTimeoutException.php b/Library/Cassandra/Exception/ReadTimeoutException.php
index 749954d..e403e68 100644
--- a/Library/Cassandra/Exception/ReadTimeoutException.php
+++ b/Library/Cassandra/Exception/ReadTimeoutException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,4 +23,23 @@
  * from the required number of replica nodes in time during a read.
  * @see https://github.com/apache/cassandra/blob/cassandra-2.1/doc/native_protocol_v1.spec#L709-L726 Description of ReadTimeout error in the native protocol spec
  */
-class ReadTimeoutException extends ExecutionException {}
+class ReadTimeoutException extends ExecutionException  {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/RuntimeException.php b/Library/Cassandra/Exception/RuntimeException.php
index 5917957..1230b17 100644
--- a/Library/Cassandra/Exception/RuntimeException.php
+++ b/Library/Cassandra/Exception/RuntimeException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,26 @@
 
 namespace Cassandra\Exception;
 
-use Cassandra\Exception;
-
 /**
- * Cassandra-specific runtime exception.
+ * Cassandra runtime exception.
  */
-class RuntimeException extends \RuntimeException implements Exception {}
+class RuntimeException extends \RuntimeException implements Exception {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/ServerException.php b/Library/Cassandra/Exception/ServerException.php
index 6796382..ba413af 100644
--- a/Library/Cassandra/Exception/ServerException.php
+++ b/Library/Cassandra/Exception/ServerException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,26 @@
 
 /**
  * ServerException is raised when something unexpected happened on the server.
- * This exception is most likely due to an Apache Cassandra bug.
+ * This exception is most likely due to a server-side bug.
  * **NOTE** This exception and all its children are generated on the server.
  */
-class ServerException extends RuntimeException {}
+class ServerException extends RuntimeException  {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/TimeoutException.php b/Library/Cassandra/Exception/TimeoutException.php
index 97a3a88..cdb7cf9 100644
--- a/Library/Cassandra/Exception/TimeoutException.php
+++ b/Library/Cassandra/Exception/TimeoutException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,4 +22,23 @@
  * TimeoutException is generally raised when a future did not resolve
  * within a given time interval.
  */
-class TimeoutException extends RuntimeException {}
+class TimeoutException extends RuntimeException  {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/TruncateException.php b/Library/Cassandra/Exception/TruncateException.php
index 602129c..37bf7c1 100644
--- a/Library/Cassandra/Exception/TruncateException.php
+++ b/Library/Cassandra/Exception/TruncateException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,4 +22,23 @@
  * TruncateException is raised when something went wrong during table
  * truncation.
  */
-class TruncateException extends ExecutionException {}
+class TruncateException extends ExecutionException  {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/UnauthorizedException.php b/Library/Cassandra/Exception/UnauthorizedException.php
index b06998e..90b5987 100644
--- a/Library/Cassandra/Exception/UnauthorizedException.php
+++ b/Library/Cassandra/Exception/UnauthorizedException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,4 +22,23 @@
  * UnauthorizedException is raised when the current user doesn't have
  * sufficient permissions to access data.
  */
-class UnauthorizedException extends ValidationException {}
+class UnauthorizedException extends ValidationException  {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/UnavailableException.php b/Library/Cassandra/Exception/UnavailableException.php
index 559f90f..7ab701f 100644
--- a/Library/Cassandra/Exception/UnavailableException.php
+++ b/Library/Cassandra/Exception/UnavailableException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,4 +25,23 @@
  * NOTE: Request has not even been forwarded to the replica nodes in this case.
  * @see https://github.com/apache/cassandra/blob/cassandra-2.1/doc/native_protocol_v1.spec#L667-L677 Description of the Unavailable error in the native protocol v1 spec.
  */
-class UnavailableException extends ExecutionException {}
+class UnavailableException extends ExecutionException  {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/UnpreparedException.php b/Library/Cassandra/Exception/UnpreparedException.php
index 1bf46ab..57634fd 100644
--- a/Library/Cassandra/Exception/UnpreparedException.php
+++ b/Library/Cassandra/Exception/UnpreparedException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,4 +23,23 @@
  * exist on the server. The driver should be automatically re-preparing the
  * statement in this case. Seeing this error could be considered a bug.
  */
-class UnpreparedException extends ValidationException {}
+class UnpreparedException extends ValidationException  {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/ValidationException.php b/Library/Cassandra/Exception/ValidationException.php
index 49f8607..57bfdb3 100644
--- a/Library/Cassandra/Exception/ValidationException.php
+++ b/Library/Cassandra/Exception/ValidationException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,11 +21,30 @@
 /**
  * ValidationException is raised on invalid request, before even attempting to
  * execute it.
- * @see Cassandra\Exception\InvalidSyntaxException
- * @see Cassandra\Exception\UnauthorizedException
- * @see Cassandra\Exception\InvalidQueryException
- * @see Cassandra\Exception\ConfigurationException
- * @see Cassandra\Exception\AlreadyExistsException
- * @see Cassandra\Exception\UnpreparedException
+ * @see Exception\InvalidSyntaxException
+ * @see Exception\UnauthorizedException
+ * @see Exception\InvalidQueryException
+ * @see Exception\ConfigurationException
+ * @see Exception\AlreadyExistsException
+ * @see Exception\UnpreparedException
  */
-class ValidationException extends RuntimeException {}
+class ValidationException extends RuntimeException  {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/Exception/WriteTimeoutException.php b/Library/Cassandra/Exception/WriteTimeoutException.php
index 34c6007..82d3031 100644
--- a/Library/Cassandra/Exception/WriteTimeoutException.php
+++ b/Library/Cassandra/Exception/WriteTimeoutException.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,4 +23,23 @@
  * from the required number of replica nodes in time during a write.
  * @see https://github.com/apache/cassandra/blob/cassandra-2.1/doc/native_protocol_v1.spec#L683-L708 Description of WriteTimeout error in the native protocol spec
  */
-class WriteTimeoutException extends ExecutionException {}
+class WriteTimeoutException extends ExecutionException  {
+
+    /**
+     * @param mixed $message
+     * @param mixed $code
+     * @param mixed $previous
+     */
+    public function __construct($message, $code, $previous) { }
+
+    /**
+     * @return mixed
+     */
+    public function __wakeup() { }
+
+    /**
+     * @return mixed
+     */
+    public function __toString() { }
+
+}
diff --git a/Library/Cassandra/ExecutionOptions.php b/Library/Cassandra/ExecutionOptions.php
index 6e4a8c9..34cc819 100644
--- a/Library/Cassandra/ExecutionOptions.php
+++ b/Library/Cassandra/ExecutionOptions.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,31 +21,36 @@
 /**
  * Request execution options.
  *
- * @deprecated Use an array of options instead of creating an instance of this class.
- *
  * @see Session::execute()
  * @see Session::executeAsync()
  * @see Session::prepare()
  * @see Session::prepareAsync()
  */
-final class ExecutionOptions
-{
+final class ExecutionOptions {
+
     /**
      * Creates a new options object for execution.
      *
-     * * array['arguments']          array                  An array or positional or named arguments
-     * * array['consistency']        int                    One of Cassandra::CONSISTENCY_*
-     * * array['timeout']            int|null               A number of seconds or null
-     * * array['page_size']          int                    A number of rows to include in result for paging
-     * * array['paging_state_token'] string                 A string token use to resume from the state of a previous result set
-     * * array['retry_policy']       Cassandra\RetryPolicy  A retry policy that is used to handle server-side failures for this request
-     * * array['serial_consistency'] int                    Either Cassandra::CONSISTENCY_SERIAL or Cassandra::CONSISTENCY_LOCAL_SERIAL
-     * * array['timestamp']          int|string             Either an integer or integer string timestamp that represents the number
-     *                                                      of microseconds since the epoch.
-     *
-     * @throws Exception\InvalidArgumentException
+     * * array['arguments']          array        An array or positional or named arguments
+     * * array['consistency']        int          One of Cassandra::CONSISTENCY_*
+     * * array['timeout']            int|null     A number of seconds or null
+     * * array['page_size']          int          A number of rows to include in result for paging
+     * * array['paging_state_token'] string       A string token use to resume from the state of a previous result set
+     * * array['retry_policy']       RetryPolicy  A retry policy that is used to handle server-side failures for this request
+     * * array['serial_consistency'] int          Either Cassandra::CONSISTENCY_SERIAL or Cassandra::CONSISTENCY_LOCAL_SERIAL
+     * * array['timestamp']          int|string   Either an integer or integer string timestamp that represents the number
+     *                                            of microseconds since the epoch.
      *
      * @param array $options various execution options
+     *
+     * @throws Exception\InvalidArgumentException
      */
-    public function __construct(array $options = null) {}
+    public function __construct($options) { }
+
+    /**
+     * @param mixed $name
+     * @return mixed
+     */
+    public function __get($name) { }
+
 }
diff --git a/Library/Cassandra/Float.php b/Library/Cassandra/Float.php
index 81d0e67..5c0a63d 100644
--- a/Library/Cassandra/Float.php
+++ b/Library/Cassandra/Float.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,107 +21,118 @@
 /**
  * A PHP representation of the CQL `float` datatype
  */
-final class Float implements Value, Numeric
-{
-    /**
-     * Minimum possible Float value
-     *
-     * @return Float minimum value
-     */
-    public static function min() {}
+final class Float_ implements Value, Numeric {
 
     /**
-     * Maximum possible Float value
+     * Creates a new float.
      *
-     * @return Float maximum value
+     * @param double|int|string|Float $value A float value as a string, number or Float
      */
-    public static function max() {}
+    public function __construct($value) { }
 
     /**
-     * Creates a new float.
+     * Returns string representation of the float value.
      *
-     * @param mixed $value float value as a string, number or Cassandra\Float
+     * @return string float value
      */
-    public function __construct($value) {}
+    public function __toString() { }
 
     /**
      * The type of this float.
      *
      * @return Type
      */
-    public function type() {}
+    public function type() { }
 
     /**
      * Returns the float value.
      *
      * @return float float value
      */
-    public function value() {}
+    public function value() { }
 
     /**
-     * Returns string representation of the float value.
-     *
-     * @return string float value
+     * @return bool
      */
-    public function __toString() {}
+    public function isInfinite() { }
 
     /**
-     * @param Numeric $addend a number to add to this one
-     *
+     * @return bool
+     */
+    public function isFinite() { }
+
+    /**
+     * @return bool
+     */
+    public function isNaN() { }
+
+    /**
+     * @param Numeric $num a number to add to this one
      * @return Numeric sum
      */
-    public function add(Numeric $addend) {}
+    public function add($num) { }
 
     /**
-     * @param Numeric $subtrahend a number to subtract from this one
-     *
+     * @param Numeric $num a number to subtract from this one
      * @return Numeric difference
      */
-    public function sub(Numeric $subtrahend) {}
+    public function sub($num) { }
 
     /**
-     * @param Numeric $multiplier a number to multiply this one by
-     *
+     * @param Numeric $num a number to multiply this one by
      * @return Numeric product
      */
-    public function mul(Numeric $multiplier) {}
+    public function mul($num) { }
 
     /**
-     * @param Numeric $divisor a number to divide this one by
-     *
+     * @param Numeric $num a number to divide this one by
      * @return Numeric quotient
      */
-    public function div(Numeric $divisor) {}
+    public function div($num) { }
 
     /**
-     * @param Numeric $divisor a number to divide this one by
-     *
+     * @param Numeric $num a number to divide this one by
      * @return Numeric remainder
      */
-    public function mod(Numeric $divisor) {}
+    public function mod($num) { }
 
     /**
      * @return Numeric absolute value
      */
-    public function abs() {}
+    public function abs() { }
 
     /**
      * @return Numeric negative value
      */
-    public function neg() {}
+    public function neg() { }
 
     /**
      * @return Numeric square root
      */
-    public function sqrt() {}
+    public function sqrt() { }
 
     /**
      * @return int this number as int
      */
-    public function toInt() {}
+    public function toInt() { }
 
     /**
      * @return float this number as float
      */
-    public function toDouble() {}
+    public function toDouble() { }
+
+    /**
+     * Minimum possible Float value
+     *
+     * @return Float minimum value
+     */
+    public static function min() { }
+
+    /**
+     * Maximum possible Float value
+     *
+     * @return Float maximum value
+     */
+    public static function max() { }
+
 }
diff --git a/Library/Cassandra/Function.php b/Library/Cassandra/Function.php
index 8a51c5b..13b8f24 100644
--- a/Library/Cassandra/Function.php
+++ b/Library/Cassandra/Function.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,53 +21,62 @@
 /**
  * A PHP representation of a function
  */
-interface Function
-{
+interface Function_ {
+
     /**
      * Returns the full name of the function
+     *
      * @return string Full name of the function including name and types
      */
-    function name();
+    public function name();
 
     /**
      * Returns the simple name of the function
+     *
      * @return string Simple name of the function
      */
-    function simpleName();
+    public function simpleName();
 
     /**
      * Returns the arguments of the function
+     *
      * @return array Arguments of the function
      */
-    function arguments();
+    public function arguments();
 
     /**
      * Returns the return type of the function
-     * @return Cassandra\Type Return type of the function
+     *
+     * @return Type Return type of the function
      */
-    function returnType();
+    public function returnType();
 
     /**
      * Returns the signature of the function
+     *
      * @return string Signature of the function (same as name())
      */
-    function signature();
+    public function signature();
 
     /**
      * Returns the lanuage of the function
+     *
      * @return string Language used by the function
      */
-    function language();
+    public function language();
 
     /**
      * Returns the body of the function
+     *
      * @return string Body of the function
      */
-    function body();
+    public function body();
 
     /**
-     * Returns whether the function is called when the input columns are null
-     * @return boolean
+     * Determines if a function is called when the value is null.
+     *
+     * @return bool Returns whether the function is called when the input columns are null
      */
-    function isCalledOnNullInput();
+    public function isCalledOnNullInput();
+
 }
diff --git a/Library/Cassandra/Future.php b/Library/Cassandra/Future.php
index 23a0f5c..b871a40 100644
--- a/Library/Cassandra/Future.php
+++ b/Library/Cassandra/Future.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,17 +26,18 @@
  * @see Session::prepareAsync()
  * @see Session::closeAsync()
  */
-interface Future
-{
+interface Future {
+
     /**
      * Waits for a given future resource to resolve and throws errors if any.
      *
+     * @param int|double|null $timeout A timeout in seconds
+     *
      * @throws Exception\InvalidArgumentException
      * @throws Exception\TimeoutException
      *
-     * @param float|null $timeout
-     *
      * @return mixed a value that the future has been resolved with
      */
-    public function get($timeout = null);
+    public function get($timeout);
+
 }
diff --git a/Library/Cassandra/FutureClose.php b/Library/Cassandra/FutureClose.php
index 9eb3f69..94b83a4 100644
--- a/Library/Cassandra/FutureClose.php
+++ b/Library/Cassandra/FutureClose.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,21 +19,22 @@
 namespace Cassandra;
 
 /**
- * A future returned from Cassandra\Session::closeAsync().
+ * A future returned from Session::closeAsync().
  *
  * @see Session::closeAsync()
  */
-final class FutureClose implements Future
-{
+final class FutureClose implements Future {
+
     /**
      * {@inheritDoc}
      *
+     * @param int|double|null $timeout A timeout in seconds
+     *
      * @throws Exception\InvalidArgumentException
      * @throws Exception\TimeoutException
      *
-     * @param float|null $timeout
-     *
-     * @return mixed a value that the future has been resolved with
+     * @return null Nothing
      */
-    public function get($timeout = null) {}
+    public function get($timeout) { }
+
 }
diff --git a/Library/Cassandra/FuturePreparedStatement.php b/Library/Cassandra/FuturePreparedStatement.php
index d06cb7a..e8ab1ec 100644
--- a/Library/Cassandra/FuturePreparedStatement.php
+++ b/Library/Cassandra/FuturePreparedStatement.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,22 +19,23 @@
 namespace Cassandra;
 
 /**
- * A future returned from `Cassandra\Session::prepareAsync()`
- * This future will resolve with a `Cassandra\PreparedStatement` or an exception.
+ * A future returned from `Session::prepareAsync()`
+ * This future will resolve with a PreparedStatement or an exception.
  *
  * @see Session::prepareAsync()
  */
-final class FuturePreparedStatement implements Future
-{
+final class FuturePreparedStatement implements Future {
+
     /**
      * {@inheritDoc}
      *
+     * @param int|double|null $timeout A timeout in seconds
+     *
      * @throws Exception\InvalidArgumentException
      * @throws Exception\TimeoutException
      *
-     * @param float|null $timeout
-     *
-     * @return mixed a value that the future has been resolved with
+     * @return PreparedStatement A prepared statement
      */
-    public function get($timeout = null) {}
+    public function get($timeout) { }
+
 }
diff --git a/Library/Cassandra/FutureRows.php b/Library/Cassandra/FutureRows.php
index 0296ae4..6ba9740 100644
--- a/Library/Cassandra/FutureRows.php
+++ b/Library/Cassandra/FutureRows.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,21 +19,22 @@
 namespace Cassandra;
 
 /**
- * This future results is resolved with `Cassandra\Rows`.
+ * This future results is resolved with Rows.
  *
  * @see Session::executeAsync()
  */
-final class FutureRows implements Future
-{
+final class FutureRows implements Future {
+
     /**
      * {@inheritDoc}
      *
+     * @param int|double|null $timeout A timeout in seconds
+     *
      * @throws Exception\InvalidArgumentException
      * @throws Exception\TimeoutException
      *
-     * @param float|null $timeout
-     *
-     * @return mixed a value that the future has been resolved with
+     * @return Rows|null The result set
      */
-    public function get($timeout = null) {}
+    public function get($timeout) { }
+
 }
diff --git a/Library/Cassandra/FutureSession.php b/Library/Cassandra/FutureSession.php
index 1ae37a1..cce3b95 100644
--- a/Library/Cassandra/FutureSession.php
+++ b/Library/Cassandra/FutureSession.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,21 +19,22 @@
 namespace Cassandra;
 
 /**
- * A future that resolves with `Cassandra\Session`.
+ * A future that resolves with Session.
  *
  * @see Cluster::connectAsync()
  */
-final class FutureSession implements Future
-{
+final class FutureSession implements Future {
+
     /**
      * {@inheritDoc}
      *
+     * @param int|double|null $timeout A timeout in seconds
+     *
      * @throws Exception\InvalidArgumentException
      * @throws Exception\TimeoutException
      *
-     * @param float|null $timeout
-     *
-     * @return mixed a value that the future has been resolved with
+     * @return Session A connected session
      */
-    public function get($timeout = null) {}
+    public function get($timeout) { }
+
 }
diff --git a/Library/Cassandra/FutureValue.php b/Library/Cassandra/FutureValue.php
index 0df2aa7..af3290c 100644
--- a/Library/Cassandra/FutureValue.php
+++ b/Library/Cassandra/FutureValue.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,17 +21,18 @@
 /**
  * A future that always resolves in a value.
  */
-final class FutureValue implements Future
-{
+final class FutureValue implements Future {
+
     /**
      * {@inheritDoc}
      *
+     * @param int|double|null $timeout A timeout in seconds
+     *
      * @throws Exception\InvalidArgumentException
      * @throws Exception\TimeoutException
      *
-     * @param float|null $timeout
-     *
-     * @return mixed a value that the future has been resolved with
+     * @return mixed A value
      */
-    public function get($timeout = null) {}
+    public function get($timeout) { }
+
 }
diff --git a/Library/Cassandra/Index.php b/Library/Cassandra/Index.php
index 51f3285..10a4f77 100644
--- a/Library/Cassandra/Index.php
+++ b/Library/Cassandra/Index.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,48 +21,58 @@
 /**
  * A PHP representation of an index
  */
-interface Index
-{
+interface Index {
+
     /**
      * Returns the name of the index
+     *
      * @return string Name of the index
      */
-    function name();
+    public function name();
 
     /**
      * Returns the kind of index
+     *
      * @return string Kind of the index
      */
-    function kind();
+    public function kind();
 
     /**
      * Returns the target column of the index
+     *
      * @return string Target column name of the index
      */
-    function target();
+    public function target();
 
     /**
      * Return a column's option by name
-     * @return Cassandra\Value Value of an option by name
+     *
+     * @param string $name The name of the option
+     *
+     * @return Value Value of an option by name
      */
-    function option($name);
+    public function option($name);
 
     /**
      * Returns all the index's options
-     * @return array A dictionary of `string` and `Cassandra\Value pairs of the
      *               index's options.
+     *
+     * @return array A dictionary of `string` and `Value` pairs of the
      */
-    function options();
+    public function options();
 
     /**
      * Returns the class name of the index
+     *
      * @return string Class name of a custom index
      */
-    function className();
+    public function className();
 
     /**
-     * Returns `true` if this is a custom index
-     * @return boolean
+     * Determines if the index is a custom index.
+     *
+     * @return bool true if a custom index
      */
-    function isCustom();
+    public function isCustom();
+
 }
diff --git a/Library/Cassandra/Inet.php b/Library/Cassandra/Inet.php
index ea0865e..a63c278 100644
--- a/Library/Cassandra/Inet.php
+++ b/Library/Cassandra/Inet.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,33 +21,34 @@
 /**
  * A PHP representation of the CQL `inet` datatype
  */
-final class Inet implements Value
-{
+final class Inet implements Value {
+
     /**
      * Creates a new IPv4 or IPv6 inet address.
      *
      * @param string $address any IPv4 or IPv6 address
      */
-    public function __construct($address) {}
+    public function __construct($address) { }
 
     /**
-     * The type of this inet.
+     * Returns the normalized string representation of the address.
      *
-     * @return Type
+     * @return string address
      */
-    public function type() {}
+    public function __toString() { }
 
     /**
-     * Returns the normalized string representation of the address.
+     * The type of this inet.
      *
-     * @return string address
+     * @return Type
      */
-    public function address() {}
+    public function type() { }
 
     /**
      * Returns the normalized string representation of the address.
      *
      * @return string address
      */
-    public function __toString() {}
+    public function address() { }
+
 }
diff --git a/Library/Cassandra/Keyspace.php b/Library/Cassandra/Keyspace.php
index c9d2d67..4c8a08f 100644
--- a/Library/Cassandra/Keyspace.php
+++ b/Library/Cassandra/Keyspace.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,42 +21,116 @@
 /**
  * A PHP representation of a keyspace
  */
-interface Keyspace
-{
+interface Keyspace {
+
     /**
      * Returns keyspace name
+     *
      * @return string Name
      */
-    function name();
+    public function name();
 
     /**
      * Returns replication class name
+     *
      * @return string Replication class
      */
-    function replicationClassName();
+    public function replicationClassName();
 
     /**
      * Returns replication options
-     * @return Cassandra\Map Replication options
+     *
+     * @return Map Replication options
      */
-    function replicationOptions();
+    public function replicationOptions();
 
     /**
      * Returns whether the keyspace has durable writes enabled
+     *
      * @return string Whether durable writes are enabled
      */
-    function hasDurableWrites();
+    public function hasDurableWrites();
 
     /**
      * Returns a table by name
-     * @param  string               $name Table name
-     * @return Cassandra\Table|null       Table instance or null
+     *
+     * @param string $name Table name
+     *
+     * @return Table|null Table instance or null
      */
-    function table($name);
+    public function table($name);
 
     /**
      * Returns all tables defined in this keyspace
-     * @return array An array of `Cassandra\Table` instances
+     *
+     * @return array An array of `Table` instances
+     */
+    public function tables();
+
+    /**
+     * Get user type by name
+     *
+     * @param string $name User type name
+     *
+     * @return Type\UserType|null A user type or null
+     */
+    public function userType($name);
+
+    /**
+     * Get all user types
+     *
+     * @return array An array of user types
+     */
+    public function userTypes();
+
+    /**
+     * Get materialized view by name
+     *
+     * @param string $name Materialized view name
+     *
+     * @return MaterizedView|null A materialized view or null
+     */
+    public function materializedView($name);
+
+    /**
+     * Gets all materialized views
+     *
+     * @return array An array of materialized views
      */
-    function tables();
+    public function materializedViews();
+
+    /**
+     * Get a function by name and signature
+     *
+     * @param string $name Function name
+     * @param string|Type $params Function arguments
+     *
+     * @return Function|null A function or null
+     */
+    public function function_($name, ...$params);
+
+    /**
+     * Get all functions
+     *
+     * @return array An array of functions
+     */
+    public function functions();
+
+    /**
+     * Get an aggregate by name and signature
+     *
+     * @param string $name Aggregate name
+     * @param string|Type $params Aggregate arguments
+     *
+     * @return Aggregate|null An aggregate or null
+     */
+    public function aggregate($name, ...$params);
+
+    /**
+     * Get all aggregates
+     *
+     * @return array An array of aggregates
+     */
+    public function aggregates();
+
 }
diff --git a/Library/Cassandra/Map.php b/Library/Cassandra/Map.php
index 3de6ba8..e8f99de 100644
--- a/Library/Cassandra/Map.php
+++ b/Library/Cassandra/Map.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,44 +21,46 @@
 /**
  * A PHP representation of the CQL `map` datatype
  */
-final class Map implements Value, \Countable, \Iterator, \ArrayAccess
-{
+final class Map implements Value, \Countable, \Iterator, \ArrayAccess {
+
     /**
      * Creates a new map of a given key and value type.
      *
      * @param Type $keyType
      * @param Type $valueType
      */
-    public function __construct($keyType, $valueType) {}
+    public function __construct($keyType, $valueType) { }
 
     /**
      * The type of this map.
      *
      * @return Type
      */
-    public function type() {}
+    public function type() { }
 
     /**
      * Returns all keys in the map as an array.
      *
      * @return array keys
      */
-    public function keys() {}
+    public function keys() { }
 
     /**
      * Returns all values in the map as an array.
      *
      * @return array values
      */
-    public function values() {}
+    public function values() { }
 
     /**
      * Sets key/value in the map.
      *
-     * @param mixed $key   key
+     * @param mixed $key key
      * @param mixed $value value
+     *
+     * @return mixed
      */
-    public function set($key, $value) {}
+    public function set($key, $value) { }
 
     /**
      * Gets the value of the key in the map.
@@ -67,7 +69,7 @@ public function set($key, $value) {}
      *
      * @return mixed Value or null
      */
-    public function get($key) {}
+    public function get($key) { }
 
     /**
      * Removes the key from the map.
@@ -76,7 +78,7 @@ public function get($key) {}
      *
      * @return bool Whether the key was removed or not, e.g. didn't exist
      */
-    public function remove($key) {}
+    public function remove($key) { }
 
     /**
      * Returns whether the key is in the map.
@@ -85,91 +87,93 @@ public function remove($key) {}
      *
      * @return bool Whether the key is in the map or not
      */
-    public function has($key) {}
+    public function has($key) { }
 
     /**
      * Total number of elements in this map
      *
      * @return int count
      */
-    public function count() {}
+    public function count() { }
 
     /**
      * Current value for iteration
      *
      * @return mixed current value
      */
-    public function current() {}
+    public function current() { }
 
     /**
      * Current key for iteration
      *
      * @return int current key
      */
-    public function key() {}
+    public function key() { }
 
     /**
      * Move internal iterator forward
      *
      * @return void
      */
-    public function next() {}
+    public function next() { }
 
     /**
      * Check whether a current value exists
      *
      * @return bool
      */
-    public function valid() {}
+    public function valid() { }
 
     /**
      * Rewind internal iterator
      *
      * @return void
      */
-    public function rewind() {}
+    public function rewind() { }
 
     /**
      * Sets the value at a given key
      *
-     * @throws Exception\InvalidArgumentException when the type of key or value is wrong
-     *
-     * @param mixed $key   Key to use.
+     * @param mixed $key Key to use.
      * @param mixed $value Value to set.
      *
+     * @throws Exception\InvalidArgumentException when the type of key or value is wrong
+     *
      * @return void
      */
-    public function offsetSet($key, $value) {}
+    public function offsetSet($key, $value) { }
 
     /**
      * Retrieves the value at a given key
      *
+     * @param mixed $key Key to use.
+     *
      * @throws Exception\InvalidArgumentException when the type of key is wrong
      *
-     * @param  mixed $key Key to use.
-     * @return mixed      Value or `null`
+     * @return mixed Value or `null`
      */
-    public function offsetGet($key) {}
+    public function offsetGet($key) { }
 
     /**
      * Deletes the value at a given key
      *
-     * @throws Exception\InvalidArgumentException when the type of key is wrong
+     * @param mixed $key Key to use.
      *
-     * @param mixed $key   Key to use.
+     * @throws Exception\InvalidArgumentException when the type of key is wrong
      *
      * @return void
      */
-    public function offsetUnset($key) {}
+    public function offsetUnset($key) { }
 
     /**
      * Returns whether the value a given key is present
      *
-     * @throws Exception\InvalidArgumentException when the type of key is wrong
+     * @param mixed $key Key to use.
      *
-     * @param mixed $key   Key to use.
+     * @throws Exception\InvalidArgumentException when the type of key is wrong
      *
-     * @return bool        Whether the value at a given key is present
+     * @return bool Whether the value at a given key is present
      */
-    public function offsetExists($key) {}
+    public function offsetExists($key) { }
+
 }
diff --git a/Library/Cassandra/MaterializedView.php b/Library/Cassandra/MaterializedView.php
index 872583d..dcbe172 100644
--- a/Library/Cassandra/MaterializedView.php
+++ b/Library/Cassandra/MaterializedView.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,11 +21,198 @@
 /**
  * A PHP representation of a materialized view
  */
-interface MaterializedView implements Table
-{
+abstract class MaterializedView implements Table {
+
     /**
      * Returns the base table of the view
-     * @return Cassandra\Table Base table of the view
+     *
+     * @return Table Base table of the view
+     */
+    public abstract function baseTable();
+
+    /**
+     * Returns the name of this view
+     *
+     * @return string Name of the view
+     */
+    public abstract function name();
+
+    /**
+     * Return a view's option by name
+     *
+     * @param string $name The name of the option
+     *
+     * @return Value Value of an option by name
+     */
+    public abstract function option($name);
+
+    /**
+     * Returns all the view's options
+     *
+     * @return array A dictionary of string and Value pairs of the
+view's options.
+     */
+    public abstract function options();
+
+    /**
+     * Description of the view, if any
+     *
+     * @return string View description or null
+     */
+    public abstract function comment();
+
+    /**
+     * Returns read repair chance
+     *
+     * @return float Read repair chance
+     */
+    public abstract function readRepairChance();
+
+    /**
+     * Returns local read repair chance
+     *
+     * @return float Local read repair chance
+     */
+    public abstract function localReadRepairChance();
+
+    /**
+     * Returns GC grace seconds
+     *
+     * @return int GC grace seconds
+     */
+    public abstract function gcGraceSeconds();
+
+    /**
+     * Returns caching options
+     *
+     * @return string Caching options
+     */
+    public abstract function caching();
+
+    /**
+     * Returns bloom filter FP chance
+     *
+     * @return float Bloom filter FP chance
+     */
+    public abstract function bloomFilterFPChance();
+
+    /**
+     * Returns memtable flush period in milliseconds
+     *
+     * @return int Memtable flush period in milliseconds
+     */
+    public abstract function memtableFlushPeriodMs();
+
+    /**
+     * Returns default TTL.
+     *
+     * @return int Default TTL.
+     */
+    public abstract function defaultTTL();
+
+    /**
+     * Returns speculative retry.
+     *
+     * @return string Speculative retry.
+     */
+    public abstract function speculativeRetry();
+
+    /**
+     * Returns index interval
+     *
+     * @return int Index interval
      */
-    function baseTable();
+    public abstract function indexInterval();
+
+    /**
+     * Returns compaction strategy class name
+     *
+     * @return string Compaction strategy class name
+     */
+    public abstract function compactionStrategyClassName();
+
+    /**
+     * Returns compaction strategy options
+     *
+     * @return Map Compaction strategy options
+     */
+    public abstract function compactionStrategyOptions();
+
+    /**
+     * Returns compression parameters
+     *
+     * @return Map Compression parameters
+     */
+    public abstract function compressionParameters();
+
+    /**
+     * Returns whether or not the `populate_io_cache_on_flush` is true
+     *
+     * @return bool Value of `populate_io_cache_on_flush` or null
+     */
+    public abstract function populateIOCacheOnFlush();
+
+    /**
+     * Returns whether or not the `replicate_on_write` is true
+     *
+     * @return bool Value of `replicate_on_write` or null
+     */
+    public abstract function replicateOnWrite();
+
+    /**
+     * Returns the value of `max_index_interval`
+     *
+     * @return int Value of `max_index_interval` or null
+     */
+    public abstract function maxIndexInterval();
+
+    /**
+     * Returns the value of `min_index_interval`
+     *
+     * @return int Value of `min_index_interval` or null
+     */
+    public abstract function minIndexInterval();
+
+    /**
+     * Returns column by name
+     *
+     * @param string $name Name of the column
+     *
+     * @return Column Column instance
+     */
+    public abstract function column($name);
+
+    /**
+     * Returns all columns in this view
+     *
+     * @return array A list of `Column` instances
+     */
+    public abstract function columns();
+
+    /**
+     * Returns the partition key columns of the view
+     *
+     * @return array A list of of `Column` instances
+     */
+    public abstract function partitionKey();
+
+    /**
+     * Returns both the partition and clustering key columns of the view
+     *
+     * @return array A list of of `Column` instances
+     */
+    public abstract function primaryKey();
+
+    /**
+     * Returns the clustering key columns of the view
+     *
+     * @return array A list of of `Column` instances
+     */
+    public abstract function clusteringKey();
+
+    /**
+     * @return array A list of cluster column orders ('asc' and 'desc')
+     */
+    public abstract function clusteringOrder();
+
 }
diff --git a/Library/Cassandra/Numeric.php b/Library/Cassandra/Numeric.php
index 664778c..458b8b7 100644
--- a/Library/Cassandra/Numeric.php
+++ b/Library/Cassandra/Numeric.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,65 +27,61 @@
  * @see Float
  * @see Varint
  */
-interface Numeric
-{
+interface Numeric {
+
     /**
-     * @param Numeric $addend a number to add to this one
-     *
+     * @param Numeric $num a number to add to this one
      * @return Numeric sum
      */
-    function add(Numeric $addend);
+    public function add($num);
 
     /**
-     * @param Numeric $subtrahend a number to subtract from this one
-     *
+     * @param Numeric $num a number to subtract from this one
      * @return Numeric difference
      */
-    function sub(Numeric $subtrahend);
+    public function sub($num);
 
     /**
-     * @param Numeric $multiplier a number to multiply this one by
-     *
+     * @param Numeric $num a number to multiply this one by
      * @return Numeric product
      */
-    function mul(Numeric $multiplier);
+    public function mul($num);
 
     /**
-     * @param Numeric $divisor a number to divide this one by
-     *
+     * @param Numeric $num a number to divide this one by
      * @return Numeric quotient
      */
-    function div(Numeric $divisor);
+    public function div($num);
 
     /**
-     * @param Numeric $divisor a number to divide this one by
-     *
+     * @param Numeric $num a number to divide this one by
      * @return Numeric remainder
      */
-    function mod(Numeric $divisor);
+    public function mod($num);
 
     /**
      * @return Numeric absolute value
      */
-    function abs();
+    public function abs();
 
     /**
      * @return Numeric negative value
      */
-    function neg();
+    public function neg();
 
     /**
      * @return Numeric square root
      */
-    function sqrt();
+    public function sqrt();
 
     /**
      * @return int this number as int
      */
-    function toInt();
+    public function toInt();
 
     /**
      * @return float this number as float
      */
-    function toDouble();
+    public function toDouble();
+
 }
diff --git a/Library/Cassandra/PreparedStatement.php b/Library/Cassandra/PreparedStatement.php
index 37546a9..7a4e752 100644
--- a/Library/Cassandra/PreparedStatement.php
+++ b/Library/Cassandra/PreparedStatement.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,8 @@
  *
  * @see Session::prepare()
  */
-final class PreparedStatement implements Statement
-{
+final class PreparedStatement implements Statement {
+
+    private function __construct() { }
+
 }
diff --git a/Library/Cassandra/RetryPolicy.php b/Library/Cassandra/RetryPolicy.php
index 573e4e4..e79d321 100644
--- a/Library/Cassandra/RetryPolicy.php
+++ b/Library/Cassandra/RetryPolicy.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,6 @@
 /**
  * Interface for retry policies.
  */
-interface RetryPolicy
-{
+interface RetryPolicy {
+
 }
diff --git a/Library/Cassandra/RetryPolicy/DefaultPolicy.php b/Library/Cassandra/RetryPolicy/DefaultPolicy.php
index 8b909db..76554b5 100644
--- a/Library/Cassandra/RetryPolicy/DefaultPolicy.php
+++ b/Library/Cassandra/RetryPolicy/DefaultPolicy.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,6 @@
 
 namespace Cassandra\RetryPolicy;
 
-use Cassandra\RetryPolicy;
-
 /**
  * The default retry policy. This policy retries a query, using the
  * request's original consistency level, in the following cases:
@@ -29,8 +27,7 @@
  * * On unavailable, it will move to the next host.
  *
  * In all other cases the error will be returned.
- *
  */
-final class DefaultPolicy implements RetryPolicy
-{
+final class DefaultPolicy implements RetryPolicy {
+
 }
diff --git a/Library/Cassandra/RetryPolicy/DowngradingConsistency.php b/Library/Cassandra/RetryPolicy/DowngradingConsistency.php
index 8b9b7ef..d900f4e 100644
--- a/Library/Cassandra/RetryPolicy/DowngradingConsistency.php
+++ b/Library/Cassandra/RetryPolicy/DowngradingConsistency.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,6 @@
 
 namespace Cassandra\RetryPolicy;
 
-use Cassandra\RetryPolicy;
-
 /**
  * A retry policy that will downgrade the consistency of a request in
  * an attempt to save a request in cases where there is any chance of success. A
@@ -41,7 +39,6 @@
  * Important: This policy may attempt to retry requests with a lower
  * consistency level. Using this policy can break consistency guarantees.
  */
-final class DowngradingConsistency implements RetryPolicy
-{
-}
+final class DowngradingConsistency implements RetryPolicy {
 
+}
diff --git a/Library/Cassandra/RetryPolicy/Fallthrough.php b/Library/Cassandra/RetryPolicy/Fallthrough.php
index efaf9a7..26b126f 100644
--- a/Library/Cassandra/RetryPolicy/Fallthrough.php
+++ b/Library/Cassandra/RetryPolicy/Fallthrough.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,11 +18,9 @@
 
 namespace Cassandra\RetryPolicy;
 
-use Cassandra\RetryPolicy;
-
 /**
  * A retry policy that never retries and allows all errors to fallthrough.
  */
-final class Fallthrough implements RetryPolicy
-{
+final class Fallthrough implements RetryPolicy {
+
 }
diff --git a/Library/Cassandra/RetryPolicy/Logging.php b/Library/Cassandra/RetryPolicy/Logging.php
index 39ef8f9..f12ae07 100644
--- a/Library/Cassandra/RetryPolicy/Logging.php
+++ b/Library/Cassandra/RetryPolicy/Logging.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,18 +18,16 @@
 
 namespace Cassandra\RetryPolicy;
 
-use Cassandra\RetryPolicy;
-
 /**
  * A retry policy that logs the decisions of its child policy.
  */
-final class Logging implements RetryPolicy
-{
+final class Logging implements RetryPolicy {
+
     /**
      * Creates a new Logging retry policy.
      *
-     * @param Cassandra\RetryPolicy $childPolicy Any retry policy other than
-     *                                           Cassandra\Logging
+     * @param RetryPolicy $childPolicy Any retry policy other than Logging
      */
-    public function __construct(RetryPolicy $childPolicy) {}
+    public function __construct($childPolicy) { }
+
 }
diff --git a/Library/Cassandra/Rows.php b/Library/Cassandra/Rows.php
index a530522..bbc3d97 100644
--- a/Library/Cassandra/Rows.php
+++ b/Library/Cassandra/Rows.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,55 +21,65 @@
 /**
  * Rows represent a result of statement execution.
  */
-final class Rows implements \Iterator, \Countable, \ArrayAccess
-{
+final class Rows implements \Iterator, \ArrayAccess {
+
+    /**
+     */
+    public function __construct() { }
+
     /**
      * Returns the number of rows.
      *
      * @return int number of rows
+     *
      * @see \Countable::count()
      */
-    public function count() {}
+    public function count() { }
 
     /**
      * Resets the rows iterator.
      *
      * @return void
+     *
      * @see \Iterator::rewind()
      */
-    public function rewind() {}
+    public function rewind() { }
 
     /**
      * Returns current row.
      *
      * @return array current row
+     *
      * @see \Iterator::current()
      */
-    public function current() {}
+    public function current() { }
 
     /**
      * Returns current index.
      *
      * @return int index
+     *
      * @see \Iterator::key()
      */
-    public function key() {}
+    public function key() { }
 
     /**
      * Advances the rows iterator by one.
      *
      * @return void
+     *
      * @see \Iterator::next()
      */
-    public function next() {}
+    public function next() { }
 
     /**
      * Returns existence of more rows being available.
      *
      * @return bool whether there are more rows available for iteration
+     *
      * @see \Iterator::valid()
      */
-    public function valid() {}
+    public function valid() { }
 
     /**
      * Returns existence of a given row.
@@ -77,9 +87,10 @@ public function valid() {}
      * @param int $offset row index
      *
      * @return bool whether a row at a given index exists
+     *
      * @see \ArrayAccess::offsetExists()
      */
-    public function offsetExists($offset) {}
+    public function offsetExists($offset) { }
 
     /**
      * Returns a row at given index.
@@ -87,41 +98,44 @@ public function offsetExists($offset) {}
      * @param int $offset row index
      *
      * @return array|null row at a given index
+     *
      * @see \ArrayAccess::offsetGet()
      */
-    public function offsetGet($offset) {}
+    public function offsetGet($offset) { }
 
     /**
      * Sets a row at given index.
      *
-     * @throws Exception\DomainException
-     *
-     * @param int   $offset row index
+     * @param int $offset row index
      * @param array $value row value
      *
+     * @throws Exception\DomainException
+     *
      * @return void
+     *
      * @see \ArrayAccess::offsetSet()
      */
-    public function offsetSet($offset, $value) {}
+    public function offsetSet($offset, $value) { }
 
     /**
      * Removes a row at given index.
      *
-     * @throws Exception\DomainException
-     *
      * @param int $offset row index
      *
+     * @throws Exception\DomainException
+     *
      * @return void
+     *
      * @see \ArrayAccess::offsetUnset()
      */
-    public function offsetUnset($offset) {}
+    public function offsetUnset($offset) { }
 
     /**
      * Check for the last page when paging.
      *
      * @return bool whether this is the last page or not
      */
-    public function isLastPage() {}
+    public function isLastPage() { }
 
     /**
      * Get the next page of results.
@@ -130,26 +144,27 @@ public function isLastPage() {}
      *
      * @return Rows|null loads and returns next result page
      */
-    public function nextPage($timeout = null) {}
+    public function nextPage($timeout) { }
 
     /**
      * Get the next page of results asynchronously.
      *
      * @return Future returns future of the next result page
      */
-    public function nextPageAsync() {}
+    public function nextPageAsync() { }
 
     /**
      * Returns the raw paging state token.
      *
      * @return string
      */
-    public function pagingStateToken() {}
+    public function pagingStateToken() { }
 
     /**
      * Get the first row.
      *
      * @return array|null returns first row if any
      */
-    public function first() {}
+    public function first() { }
+
 }
diff --git a/Library/Cassandra/SSLOptions.php b/Library/Cassandra/SSLOptions.php
index f723af6..17966f6 100644
--- a/Library/Cassandra/SSLOptions.php
+++ b/Library/Cassandra/SSLOptions.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,10 @@
 namespace Cassandra;
 
 /**
- * SSL options for Cassandra\Cluster.
+ * SSL options for Cluster.
  *
  * @see SSLOptions\Builder
  */
-final class SSLOptions
-{
+final class SSLOptions {
+
 }
diff --git a/Library/Cassandra/SSLOptions/Builder.php b/Library/Cassandra/SSLOptions/Builder.php
index 108b1b0..ae5c10a 100644
--- a/Library/Cassandra/SSLOptions/Builder.php
+++ b/Library/Cassandra/SSLOptions/Builder.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,31 +22,38 @@
  * SSLOptions builder allows fluent configuration of ssl options.
  *
  * @see \Cassandra::ssl()
- * @see \Cassandra\Cluster\Builder::withSSL()
+ * @see \Cluster\Builder::withSSL()
  */
-final class Builder
-{
+final class Builder {
+
+    /**
+     * Builds SSL options.
+     *
+     * @return \SSLOptions ssl options configured accordingly.
+     */
+    public function build() { }
+
     /**
      * Adds a trusted certificate. This is used to verify node's identity.
      *
-     * @throws \Cassandra\Exception\InvalidArgumentException
+     * @param string $path ,... one or more paths to files containing a PEM formatted certificate.
      *
-     * @param string $path,... one or more paths to files containing a PEM formatted certificate.
+     * @throws \Exception\InvalidArgumentException
      *
      * @return Builder self
      */
-    public function withTrustedCerts($path) {}
+    public function withTrustedCerts($path) { }
 
     /**
      * Disable certificate verification.
      *
-     * @throws \Cassandra\Exception\InvalidArgumentException
-     *
      * @param int $flags
      *
+     * @throws \Exception\InvalidArgumentException
+     *
      * @return Builder self
      */
-    public function withVerifyFlags($flags) {}
+    public function withVerifyFlags($flags) { }
 
     /**
      * Set client-side certificate chain.
@@ -54,31 +61,25 @@ public function withVerifyFlags($flags) {}
      * This is used to authenticate the client on the server-side. This should contain the entire Certificate
      * chain starting with the certificate itself.
      *
-     * @throws \Cassandra\Exception\InvalidArgumentException
-     *
      * @param string $path path to a file containing a PEM formatted certificate.
      *
+     * @throws \Exception\InvalidArgumentException
+     *
      * @return Builder self
      */
-    public function withClientCert($path) {}
+    public function withClientCert($path) { }
 
     /**
      * Set client-side private key. This is used to authenticate the client on
      * the server-side.
      *
-     * @throws \Cassandra\Exception\InvalidArgumentException
-     *
-     * @param string      $path       Path to the private key file
+     * @param string $path Path to the private key file
      * @param string|null $passphrase Passphrase for the private key, if any
      *
+     * @throws \Exception\InvalidArgumentException
+     *
      * @return Builder self
      */
-    public function withPrivateKey($path, $passphrase = null) {}
+    public function withPrivateKey($path, $passphrase) { }
 
-    /**
-     * Builds SSL options.
-     *
-     * @return \Cassandra\SSLOptions ssl options configured accordingly.
-     */
-    public function build() {}
 }
diff --git a/Library/Cassandra/Schema.php b/Library/Cassandra/Schema.php
index 7ddda39..05d1b09 100644
--- a/Library/Cassandra/Schema.php
+++ b/Library/Cassandra/Schema.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,18 +21,22 @@
 /**
  * A PHP representation of a schema
  */
-interface Schema
-{
+interface Schema {
+
     /**
      * Returns a Keyspace instance by name.
-     * @param  string             $name Name of the keyspace to get
-     * @return Cassandra\Keyspace       Keyspace instance or null
+     *
+     * @param string $name Name of the keyspace to get
+     *
+     * @return Keyspace Keyspace instance or null
      */
-    function keyspace($name);
+    public function keyspace($name);
 
     /**
      * Returns all keyspaces defined in the schema.
-     * @return array An array of `Cassandra\Keyspace` instances.
+     *
+     * @return array An array of Keyspace instances.
      */
-    function keyspaces();
+    public function keyspaces();
+
 }
diff --git a/Library/Cassandra/Session.php b/Library/Cassandra/Session.php
index 14a5667..dad82c1 100644
--- a/Library/Cassandra/Session.php
+++ b/Library/Cassandra/Session.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,91 +22,85 @@
  * A session is used to prepare and execute statements.
  *
  * @see Cluster::connect()
+ * @see Cluster::connectAsync()
  */
-interface Session
-{
+interface Session {
+
     /**
-     * Returns current performance/diagnostic metrics.
+     * Execute a query.
      *
-     * @return array Performance/Diagnostic metrics.
+     * @param string|Statement $statement string or statement to be executed.
+     * @param array|ExecutionOptions|null $options execution options (optional)
+     *
+     * @throws Exception
+     *
+     * @return Rows A collection of rows.
      */
-    public function metrics();
+    public function execute($statement, $options);
 
     /**
-     * Returns current schema.
+     * Execute a query asynchronously. This method returns immediately, but
+     * the query continues execution in the background.
      *
-     * NOTE: the returned Schema instance will not be updated as the actual
-     *       schema changes, instead an updated instance should be requested by
-     *       calling Session::schema() again.
+     * @param string|Statement $statement string or statement to be executed.
+     * @param array|ExecutionOptions|null $options execution options (optional)
      *
-     * @return Schema current schema.
+     * @return FutureRows A future that can be used to retrieve the result.
      */
-    public function schema();
+    public function executeAsync($statement, $options);
 
     /**
-     * Executes a given statement and returns a result.
+     * Prepare a query for execution.
      *
-     * @throws Exception
+     * @param string $cql The query to be prepared.
+     * @param ExecutionOptions $options Options to control preparing the query.
      *
-     * @param string|Statement $statement string or statement to be executed
-     * @param array|ExecutionOptions|null $options   execution options (optional)
+     * @throws Exception
      *
-     * @return Rows execution result
+     * @return PreparedStatement A prepared statement that can be bound with parameters and executed.
      */
-    public function execute($statement, ExecutionOptions $options = null);
+    public function prepare($cql, $options);
 
     /**
-     * Executes a given statement and returns a future result.
+     * Asynchronously prepare a query for execution.
      *
-     * Note that this method ignores timeout specified in the ExecutionOptions,
-     * you can provide one to Future::get() instead.
+     * @param string $cql The query to be prepared.
+     * @param ExecutionOptions $options Options to control preparing the query.
      *
-     * @param string|Statement $statement string or statement to be executed
-     * @param array|ExecutionOptions|null $options   execution options (optional)
-     *
-     * @return Future future result
+     * @return FuturePreparedStatement A future that can be used to retrieve the prepared statement.
      */
-    public function executeAsync($statement, ExecutionOptions $options = null);
+    public function prepareAsync($cql, $options);
 
     /**
-     * Creates a prepared statement from a given CQL string.
+     * Close the session and all its connections.
      *
-     * Note that this method only uses the ExecutionOptions::$timeout option,
-     * all other options will be ignored.
+     * @param double $timeout The amount of time in seconds to wait for the session to close.
      *
      * @throws Exception
      *
-     * @param string                $cql     CQL statement string
-     * @param array|ExecutionOptions|null $options execution options (optional)
-     *
-     * @return PreparedStatement prepared statement
+     * @return null Nothing.
      */
-    public function prepare($cql, ExecutionOptions $options = null);
+    public function close($timeout);
 
     /**
-     * Asynchronously prepares a statement and returns a future prepared statement.
+     * Asynchronously close the session and all its connections.
      *
-     * Note that all options passed to this method will be ignored.
-     *
-     * @param string                $cql     CQL string to be prepared
-     * @param array|ExecutionOptions|null $options preparation options
-     *
-     * @return Future statement
+     * @return FutureClose A future that can be waited on.
      */
-    public function prepareAsync($cql, ExecutionOptions $options = null);
+    public function closeAsync();
 
     /**
-     * Closes current session and all of its connections.
+     * Get performance and diagnostic metrics.
      *
-     * @param float|null $timeout Timeout to wait for closure in seconds
-     * @return void
+     * @return array Performance/Diagnostic metrics.
      */
-    public function close($timeout = null);
+    public function metrics();
 
     /**
-     * Asynchronously closes current session once all pending requests have finished.
+     * Get a snapshot of the cluster's current schema.
      *
-     * @return Future future
+     * @return Schema A snapshot of the cluster's schema.
      */
-    public function closeAsync();
+    public function schema();
+
 }
diff --git a/Library/Cassandra/Set.php b/Library/Cassandra/Set.php
index 0586a81..81e7687 100644
--- a/Library/Cassandra/Set.php
+++ b/Library/Cassandra/Set.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,28 +21,28 @@
 /**
  * A PHP representation of the CQL `set` datatype
  */
-final class Set implements Value, \Countable, \Iterator
-{
+final class Set implements Value, \Countable, \Iterator {
+
     /**
      * Creates a new collection of a given type.
      *
      * @param Type $type
      */
-    public function __construct($type) {}
+    public function __construct($type) { }
 
     /**
      * The type of this set.
      *
      * @return Type
      */
-    public function type() {}
+    public function type() { }
 
     /**
      * Array of values in this set.
      *
      * @return array values
      */
-    public function values() {}
+    public function values() { }
 
     /**
      * Adds a value to this set.
@@ -51,7 +51,7 @@ public function values() {}
      *
      * @return bool whether the value has been added
      */
-    public function add($value) {}
+    public function add($value) { }
 
     /**
      * Returns whether a value is in this set.
@@ -60,7 +60,7 @@ public function add($value) {}
      *
      * @return bool whether the value is in the set
      */
-    public function has($value) {}
+    public function has($value) { }
 
     /**
      * Removes a value to this set.
@@ -69,47 +69,48 @@ public function has($value) {}
      *
      * @return bool whether the value has been removed
      */
-    public function remove($value) {}
+    public function remove($value) { }
 
     /**
      * Total number of elements in this set
      *
      * @return int count
      */
-    public function count() {}
+    public function count() { }
 
     /**
      * Current element for iteration
      *
      * @return mixed current element
      */
-    public function current() {}
+    public function current() { }
 
     /**
      * Current key for iteration
      *
      * @return int current key
      */
-    public function key() {}
+    public function key() { }
 
     /**
      * Move internal iterator forward
      *
      * @return void
      */
-    public function next() {}
+    public function next() { }
 
     /**
      * Check whether a current value exists
      *
      * @return bool
      */
-    public function valid() {}
+    public function valid() { }
 
     /**
      * Rewind internal iterator
      *
      * @return void
      */
-    public function rewind() {}
+    public function rewind() { }
+
 }
diff --git a/Library/Cassandra/SimpleStatement.php b/Library/Cassandra/SimpleStatement.php
index e2272da..5f64f9c 100644
--- a/Library/Cassandra/SimpleStatement.php
+++ b/Library/Cassandra/SimpleStatement.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,12 +27,13 @@
  *
  * @see Session::execute()
  */
-final class SimpleStatement implements Statement
-{
+final class SimpleStatement implements Statement {
+
     /**
      * Creates a new simple statement with the provided CQL.
      *
      * @param string $cql CQL string for this simple statement
      */
-    public function __construct($cql) {}
+    public function __construct($cql) { }
+
 }
diff --git a/Library/Cassandra/Smallint.php b/Library/Cassandra/Smallint.php
index 062db73..1e763ad 100644
--- a/Library/Cassandra/Smallint.php
+++ b/Library/Cassandra/Smallint.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,101 +18,104 @@
 
 namespace Cassandra;
 
+/**
+ * A PHP representation of the CQL `smallint` datatype.
+ */
+final class Smallint implements Value, Numeric {
 
-final class Smallint implements Value, Numeric
-{
     /**
-     * Minimum possible Smallint value
+     * Creates a new 16-bit signed integer.
      *
-     * @return Smallint minimum value
+     * @param int|double|string $value The value as an integer, double or string
      */
-    public static function min() {}
+    public function __construct($value) { }
 
     /**
-     * Maximum possible Smallint value
-     *
-     * @return Smallint maximum value
+     * @return string
      */
-    public static function max() {}
+    public function __toString() { }
 
     /**
-     * Creates a new 16bit integer.
+     * The type of this value (smallint).
      *
-     * @param string $value integer value as a string
+     * @return Type
      */
-    public function __construct($value) {}
+    public function type() { }
 
     /**
-     * @param Numeric $addend a number to add to this one
+     * Returns the integer value.
      *
+     * @return int integer value
+     */
+    public function value() { }
+
+    /**
+     * @param Numeric $num a number to add to this one
      * @return Numeric sum
      */
-    public function add(Numeric $addend) {}
+    public function add($num) { }
 
     /**
-     * @param Numeric $subtrahend a number to subtract from this one
-     *
+     * @param Numeric $num a number to subtract from this one
      * @return Numeric difference
      */
-    public function sub(Numeric $subtrahend) {}
+    public function sub($num) { }
 
     /**
-     * @param Numeric $multiplier a number to multiply this one by
-     *
+     * @param Numeric $num a number to multiply this one by
      * @return Numeric product
      */
-    public function mul(Numeric $multiplier) {}
+    public function mul($num) { }
 
     /**
-     * @param Numeric $divisor a number to divide this one by
-     *
+     * @param Numeric $num a number to divide this one by
      * @return Numeric quotient
      */
-    public function div(Numeric $divisor) {}
+    public function div($num) { }
 
     /**
-     * @param Numeric $divisor a number to divide this one by
-     *
+     * @param Numeric $num a number to divide this one by
      * @return Numeric remainder
      */
-    public function mod(Numeric $divisor) {}
+    public function mod($num) { }
 
     /**
      * @return Numeric absolute value
      */
-    public function abs() {}
+    public function abs() { }
 
     /**
      * @return Numeric negative value
      */
-    public function neg() {}
+    public function neg() { }
 
     /**
      * @return Numeric square root
      */
-    public function sqrt() {}
+    public function sqrt() { }
 
     /**
      * @return int this number as int
      */
-    public function toInt() {}
+    public function toInt() { }
 
     /**
      * @return float this number as float
      */
-    public function toDouble() {}
+    public function toDouble() { }
 
     /**
-     * The type of this value (smallint).
+     * Minimum possible Smallint value
      *
-     * @return Type
+     * @return Smallint minimum value
      */
-    public function type() {}
+    public static function min() { }
 
     /**
-     * Returns the integer value.
+     * Maximum possible Smallint value
      *
-     * @return int integer value
+     * @return Smallint maximum value
      */
-    public function value() {}
+    public static function max() { }
+
 }
diff --git a/Library/Cassandra/Statement.php b/Library/Cassandra/Statement.php
index 84616bb..072047a 100644
--- a/Library/Cassandra/Statement.php
+++ b/Library/Cassandra/Statement.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,6 @@
  * @see PreparedStatement
  * @see BatchStatement
  */
-interface Statement
-{
+interface Statement {
+
 }
diff --git a/Library/Cassandra/Table.php b/Library/Cassandra/Table.php
index 874a29e..9555fe7 100644
--- a/Library/Cassandra/Table.php
+++ b/Library/Cassandra/Table.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,163 +21,191 @@
 /**
  * A PHP representation of a table
  */
-interface Table
-{
+interface Table {
+
     /**
      * Returns the name of this table
+     *
      * @return string Name of the table
      */
-    function name();
+    public function name();
 
     /**
      * Return a table's option by name
-     * @return Cassandra\Value Value of an option by name
+     *
+     * @param string $name The name of the option
+     *
+     * @return Value Value of an option by name
      */
-    function option($name);
+    public function option($name);
 
     /**
      * Returns all the table's options
-     * @return array A dictionary of `string` and `Cassandra\Value pairs of the
      *               view's options.
+     *
+     * @return array A dictionary of `string` and `Value` pairs of the
      */
-    function options();
+    public function options();
 
     /**
      * Description of the table, if any
+     *
      * @return string Table description or null
      */
-    function comment();
+    public function comment();
 
     /**
      * Returns read repair chance
+     *
      * @return float Read repair chance
      */
-    function readRepairChance();
+    public function readRepairChance();
 
     /**
      * Returns local read repair chance
+     *
      * @return float Local read repair chance
      */
-    function localReadRepairChance();
+    public function localReadRepairChance();
 
     /**
      * Returns GC grace seconds
+     *
      * @return int GC grace seconds
      */
-    function gcGraceSeconds();
+    public function gcGraceSeconds();
 
     /**
      * Returns caching options
+     *
      * @return string Caching options
      */
-    function caching();
+    public function caching();
 
     /**
      * Returns bloom filter FP chance
+     *
      * @return float Bloom filter FP chance
      */
-    function bloomFilterFPChance();
+    public function bloomFilterFPChance();
 
     /**
      * Returns memtable flush period in milliseconds
+     *
      * @return int Memtable flush period in milliseconds
      */
-    function memtableFlushPeriodMs();
+    public function memtableFlushPeriodMs();
 
     /**
      * Returns default TTL.
+     *
      * @return int Default TTL.
      */
-    function defaultTTL();
+    public function defaultTTL();
 
     /**
      * Returns speculative retry.
+     *
      * @return string Speculative retry.
      */
-    function speculativeRetry();
+    public function speculativeRetry();
 
     /**
      * Returns index interval
+     *
      * @return int Index interval
      */
-    function indexInterval();
+    public function indexInterval();
 
     /**
      * Returns compaction strategy class name
+     *
      * @return string Compaction strategy class name
      */
-    function compactionStrategyClassName();
+    public function compactionStrategyClassName();
 
     /**
      * Returns compaction strategy options
-     * @return Cassandra\Map Compaction strategy options
+     *
+     * @return Map Compaction strategy options
      */
-    function compactionStrategyOptions();
+    public function compactionStrategyOptions();
 
     /**
      * Returns compression parameters
-     * @return Cassandra\Map Compression parameters
+     *
+     * @return Map Compression parameters
      */
-    function compressionParameters();
+    public function compressionParameters();
 
     /**
      * Returns whether or not the `populate_io_cache_on_flush` is true
-     * @return boolean Value of `populate_io_cache_on_flush` or null
+     *
+     * @return bool Value of `populate_io_cache_on_flush` or null
      */
-    function populateIOCacheOnFlush();
+    public function populateIOCacheOnFlush();
 
     /**
      * Returns whether or not the `replicate_on_write` is true
-     * @return boolean Value of `replicate_on_write` or null
+     *
+     * @return bool Value of `replicate_on_write` or null
      */
-    function replicateOnWrite();
+    public function replicateOnWrite();
 
     /**
      * Returns the value of `max_index_interval`
+     *
      * @return int Value of `max_index_interval` or null
      */
-    function maxIndexInterval();
+    public function maxIndexInterval();
 
     /**
      * Returns the value of `min_index_interval`
+     *
      * @return int Value of `min_index_interval` or null
      */
-    function minIndexInterval();
+    public function minIndexInterval();
 
     /**
      * Returns column by name
-     * @param  string           $name Name of the column
-     * @return Cassandra\Column Column instance
+     *
+     * @param string $name Name of the column
+     *
+     * @return Column Column instance
      */
-    function column($name);
+    public function column($name);
 
     /**
      * Returns all columns in this table
-     * @return array A list of `Cassandra\Column` instances
+     *
+     * @return array A list of Column instances
      */
-    function columns();
+    public function columns();
 
     /**
      * Returns the partition key columns of the table
-     * @return array A list of of `Cassandra\Column` instances
+     *
+     * @return array A list of of Column instances
      */
-     function partitionKey();
+    public function partitionKey();
 
     /**
      * Returns both the partition and clustering key columns of the table
-     * @return array A list of of `Cassandra\Column` instances
+     *
+     * @return array A list of of Column instances
      */
-     function primaryKey();
+    public function primaryKey();
 
     /**
      * Returns the clustering key columns of the table
-     * @return array A list of of `Cassandra\Column` instances
+     *
+     * @return array A list of of Column instances
      */
-     function clusteringKey();
+    public function clusteringKey();
 
     /**
-     *
      * @return array A list of cluster column orders ('asc' and 'desc')
      */
-     function clusteringOrder();
+    public function clusteringOrder();
+
 }
diff --git a/Library/Cassandra/Time.php b/Library/Cassandra/Time.php
index 7cdea82..98c3b25 100644
--- a/Library/Cassandra/Time.php
+++ b/Library/Cassandra/Time.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,39 +21,36 @@
 /**
  * A PHP representation of the CQL `time` type.
  */
-final class Time implements Value
-{
+final class Time implements Value {
+
     /**
      * Creates a new Time object
      *
-     * @param int|string $nanoseconds  Number of nanoseconds since last microsecond
+     * @param int|string $nanoseconds Number of nanoseconds since last microsecond
      */
-    public function __construct($nanoseconds = 0) {}
-
+    public function __construct($nanoseconds) { }
 
     /**
-     * Creates a new Time object with the current time.
+     * The type of this date.
      *
-     * @return Time
+     * @return Type
      */
-    public static function now() {}
+    public function type() { }
 
     /**
-     * The type of this date.
-     *
-     * @return Type
+     * @return int
      */
-    public function type() {}
+    public function seconds() { }
 
     /**
-     * @return int number of nanoseconds since the last full microsecond since
-     *             the last full second since the last full minute since the
-     *             last full hour since midnight
+     * @param DateTime $datetime
+     * @return Time
      */
-    public function nanoseconds() {}
+    public static function fromDateTime($datetime) { }
 
     /**
-     * @return string this date in string format: Cassandra\Time(nanoseconds=$nanoseconds)
+     * @return string this date in string format: Time(nanoseconds=$nanoseconds)
      */
-    public function __toString() {}
+    public function __toString() { }
+
 }
diff --git a/Library/Cassandra/Timestamp.php b/Library/Cassandra/Timestamp.php
index 52fe7cd..1118722 100644
--- a/Library/Cassandra/Timestamp.php
+++ b/Library/Cassandra/Timestamp.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,31 +21,32 @@
 /**
  * A PHP representation of the CQL `timestamp` datatype
  */
-final class Timestamp implements Value
-{
+final class Timestamp implements Value {
+
     /**
      * Creates a new timestamp from either unix timestamp and microseconds or
      * from the current time by default.
      *
-     * @param int $time Unix timestamp
-     * @param int $usec Microseconds
+     * @param int $seconds The number of seconds
+     * @param int $microseconds The number of microseconds
      */
-    public function __construct($time = null, $usec = null) {}
+    public function __construct($seconds, $microseconds) { }
 
     /**
      * The type of this timestamp.
      *
      * @return Type
      */
-    public function type() {}
+    public function type() { }
 
     /**
      * Unix timestamp.
      *
      * @return int seconds
+     *
      * @see time
      */
-    public function time() {}
+    public function time() { }
 
     /**
      * Microtime from this timestamp
@@ -53,21 +54,23 @@ public function time() {}
      * @param bool $get_as_float Whether to get this value as float
      *
      * @return float|string Float or string representation
+     *
      * @see microtime
      */
-    public function microtime($get_as_float = false) {}
+    public function microtime($get_as_float) { }
 
     /**
      * Converts current timestamp to PHP DateTime.
      *
      * @return \DateTime PHP representation
      */
-    public function toDateTime() {}
+    public function toDateTime() { }
 
     /**
      * Returns a string representation of this timestamp.
      *
      * @return string timestamp
      */
-    public function __toString() {}
+    public function __toString() { }
+
 }
diff --git a/Library/Cassandra/TimestampGenerator.php b/Library/Cassandra/TimestampGenerator.php
index 26d1cfd..55d4524 100644
--- a/Library/Cassandra/TimestampGenerator.php
+++ b/Library/Cassandra/TimestampGenerator.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,6 @@
 /**
  * Interface for timestamp generators.
  */
-interface TimestampGenerator
-{
+interface TimestampGenerator {
+
 }
diff --git a/Library/Cassandra/TimestampGenerator/Monotonic.php b/Library/Cassandra/TimestampGenerator/Monotonic.php
index 160bcdc..9c72ce4 100644
--- a/Library/Cassandra/TimestampGenerator/Monotonic.php
+++ b/Library/Cassandra/TimestampGenerator/Monotonic.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,6 @@
 
 namespace Cassandra\TimestampGenerator;
 
-use Cassandra\TimestampGenerator;
-
 /**
  * A timestamp generator that generates monotonically increasing timestamps
  * client-side. The timestamps generated have a microsecond granularity with
@@ -29,6 +27,6 @@
  * exceeded then a warning is logged and timestamps stop incrementing until
  * the next clock tick.
  */
-final class Monotonic implements TimestampGenerator
-{
+final class Monotonic implements TimestampGenerator {
+
 }
diff --git a/Library/Cassandra/TimestampGenerator/ServerSide.php b/Library/Cassandra/TimestampGenerator/ServerSide.php
index 2a8ba03..ce12639 100644
--- a/Library/Cassandra/TimestampGenerator/ServerSide.php
+++ b/Library/Cassandra/TimestampGenerator/ServerSide.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,9 @@
 
 namespace Cassandra\TimestampGenerator;
 
-use Cassandra\TimestampGenerator;
-
 /**
- * A timestamp generator that allows Cassandra to assign timestamps
- * server-side.
+ * A timestamp generator that allows the server-side to assign timestamps.
  */
-final class ServerSide implements TimestampGenerator
-{
+final class ServerSide implements TimestampGenerator {
+
 }
diff --git a/Library/Cassandra/Timeuuid.php b/Library/Cassandra/Timeuuid.php
index 39f9d8e..d12b67c 100644
--- a/Library/Cassandra/Timeuuid.php
+++ b/Library/Cassandra/Timeuuid.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,55 +21,57 @@
 /**
  * A PHP representation of the CQL `timeuuid` datatype
  */
-final class Timeuuid implements Value, UuidInterface
-{
+final class Timeuuid implements Value, UuidInterface {
+
     /**
      * Creates a timeuuid from a given timestamp or current time.
      *
      * @param int $timestamp Unix timestamp
      */
-    public function __construct($timestamp = null) {}
+    public function __construct($timestamp) { }
 
     /**
-     * The type of this timeuuid.
+     * Returns this timeuuid as string.
      *
-     * @return Type
+     * @return string timeuuid
      */
-    public function type() {}
+    public function __toString() { }
 
     /**
-     * Returns this timeuuid as string.
+     * The type of this timeuuid.
      *
-     * @return string timeuuid
+     * @return Type
      */
-    public function __toString() {}
+    public function type() { }
 
     /**
      * Returns this timeuuid as string.
      *
      * @return string timeuuid
      */
-    public function uuid() {}
+    public function uuid() { }
 
     /**
      * Returns the version of this timeuuid.
      *
      * @return int version of this timeuuid
      */
-    public function version() {}
+    public function version() { }
 
     /**
      * Unix timestamp.
      *
      * @return int seconds
+     *
      * @see time
      */
-    public function time() {}
+    public function time() { }
 
     /**
      * Converts current timeuuid to PHP DateTime.
      *
      * @return \DateTime PHP representation
      */
-    public function toDateTime() {}
+    public function toDateTime() { }
+
 }
diff --git a/Library/Cassandra/Tinyint.php b/Library/Cassandra/Tinyint.php
index 6bfcb31..07bc11e 100644
--- a/Library/Cassandra/Tinyint.php
+++ b/Library/Cassandra/Tinyint.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,101 +18,104 @@
 
 namespace Cassandra;
 
+/**
+ * A PHP representation of the CQL `tinyint` datatype.
+ */
+final class Tinyint implements Value, Numeric {
 
-final class Tinyint implements Value, Numeric
-{
     /**
-     * Minimum possible Tinyint value
+     * Creates a new 8-bit signed integer.
      *
-     * @return Tinyint minimum value
+     * @param int|double|string $value The value as an integer, double or string
      */
-    public static function min() {}
+    public function __construct($value) { }
 
     /**
-     * Maximum possible Tinyint value
-     *
-     * @return Tinyint maximum value
+     * @return string
      */
-    public static function max() {}
+    public function __toString() { }
 
     /**
-     * Creates a new 8bit integer.
+     * The type of this value (tinyint).
      *
-     * @param string $value integer value as a string
+     * @return Type
      */
-    public function __construct($value) {}
+    public function type() { }
 
     /**
-     * @param Numeric $addend a number to add to this one
+     * Returns the integer value.
      *
+     * @return int integer value
+     */
+    public function value() { }
+
+    /**
+     * @param Numeric $num a number to add to this one
      * @return Numeric sum
      */
-    public function add(Numeric $addend) {}
+    public function add($num) { }
 
     /**
-     * @param Numeric $subtrahend a number to subtract from this one
-     *
+     * @param Numeric $num a number to subtract from this one
      * @return Numeric difference
      */
-    public function sub(Numeric $subtrahend) {}
+    public function sub($num) { }
 
     /**
-     * @param Numeric $multiplier a number to multiply this one by
-     *
+     * @param Numeric $num a number to multiply this one by
      * @return Numeric product
      */
-    public function mul(Numeric $multiplier) {}
+    public function mul($num) { }
 
     /**
-     * @param Numeric $divisor a number to divide this one by
-     *
+     * @param Numeric $num a number to divide this one by
      * @return Numeric quotient
      */
-    public function div(Numeric $divisor) {}
+    public function div($num) { }
 
     /**
-     * @param Numeric $divisor a number to divide this one by
-     *
+     * @param Numeric $num a number to divide this one by
      * @return Numeric remainder
      */
-    public function mod(Numeric $divisor) {}
+    public function mod($num) { }
 
     /**
      * @return Numeric absolute value
      */
-    public function abs() {}
+    public function abs() { }
 
     /**
      * @return Numeric negative value
      */
-    public function neg() {}
+    public function neg() { }
 
     /**
      * @return Numeric square root
      */
-    public function sqrt() {}
+    public function sqrt() { }
 
     /**
      * @return int this number as int
      */
-    public function toInt() {}
+    public function toInt() { }
 
     /**
      * @return float this number as float
      */
-    public function toDouble() {}
+    public function toDouble() { }
 
     /**
-     * The type of this value (tinyint).
+     * Minimum possible Tinyint value
      *
-     * @return Type
+     * @return Tinyint minimum value
      */
-    public function type() {}
+    public static function min() { }
 
     /**
-     * Returns the integer value.
+     * Maximum possible Tinyint value
      *
-     * @return int integer value
+     * @return Tinyint maximum value
      */
-    public function value() {}
+    public static function max() { }
+
 }
diff --git a/Library/Cassandra/Tuple.php b/Library/Cassandra/Tuple.php
index 6635586..b63ea15 100644
--- a/Library/Cassandra/Tuple.php
+++ b/Library/Cassandra/Tuple.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,86 +21,87 @@
 /**
  * A PHP representation of the CQL `tuple` datatype
  */
-final class Tuple implements Value, \Countable, \Iterator
-{
+final class Tuple implements Value, \Countable, \Iterator {
+
     /**
      * Creates a new tuple with the given types.
      *
      * @param array $types Array of types
      */
-    public function __construct($types) {}
+    public function __construct($types) { }
 
     /**
      * The type of this tuple.
      *
      * @return Type
      */
-    public function type() {}
+    public function type() { }
 
     /**
      * Array of values in this tuple.
      *
      * @return array values
      */
-    public function values() {}
+    public function values() { }
 
     /**
      * Sets the value at index in this tuple .
      *
-     * @param int   $index Index
-     * @param mixed $value Value or null
+     * @param mixed $value A value or null
      *
      * @return void
      */
-    public function set($index, $value) {}
+    public function set($value) { }
 
     /**
      * Retrieves the value at a given index.
      *
-     * @param   int   $index  Index
-     * @return  mixed         Value or null
+     * @param int $index Index
+     *
+     * @return mixed A value or null
      */
-    public function get($index) {}
+    public function get($index) { }
 
     /**
      * Total number of elements in this tuple
      *
      * @return int count
      */
-    public function count() {}
+    public function count() { }
 
     /**
      * Current element for iteration
      *
      * @return mixed current element
      */
-    public function current() {}
+    public function current() { }
 
     /**
      * Current key for iteration
      *
      * @return int current key
      */
-    public function key() {}
+    public function key() { }
 
     /**
      * Move internal iterator forward
      *
      * @return void
      */
-    public function next() {}
+    public function next() { }
 
     /**
      * Check whether a current value exists
      *
      * @return bool
      */
-    public function valid() {}
+    public function valid() { }
 
     /**
      * Rewind internal iterator
      *
      * @return void
      */
-    public function rewind() {}
+    public function rewind() { }
+
 }
diff --git a/Library/Cassandra/Type.php b/Library/Cassandra/Type.php
index 0393350..9b3af99 100644
--- a/Library/Cassandra/Type.php
+++ b/Library/Cassandra/Type.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,172 +21,258 @@
 /**
  * Cluster object is used to create Sessions.
  */
-abstract class Type
-{
-    /**
-     * Get representation of cassandra varchar type
-     * @return Cassandra\Type varchar type
-     */
-    final static function varchar() {}
-
-    /**
-     * Get representation of cassandra text type
-     * @return Cassandra\Type text type
-     */
-    final static function text() {}
-
-    /**
-     * Get representation of cassandra blob type
-     * @return Cassandra\Type blob type
-     */
-    final static function blob() {}
-
-      /**
-       * Get representation of cassandra ascii type
-       * @return Cassandra\Type ascii type
-       */
-    final static function ascii() {}
-
-      /**
-       * Get representation of cassandra bigint type
-       * @return Cassandra\Type bigint type
-       */
-    final static function bigint() {}
-
-      /**
-       * Get representation of cassandra counter type
-       * @return Cassandra\Type counter type
-       */
-    final static function counter() {}
-
-      /**
-       * Get representation of cassandra int type
-       * @return Cassandra\Type int type
-       */
-    final static function int() {}
-
-      /**
-       * Get representation of cassandra varint type
-       * @return Cassandra\Type varint type
-       */
-    final static function varint() {}
-
-      /**
-       * Get representation of cassandra boolean type
-       * @return Cassandra\Type boolean type
-       */
-    final static function boolean() {}
-
-      /**
-       * Get representation of cassandra decimal type
-       * @return Cassandra\Type decimal type
-       */
-    final static function decimal() {}
-
-      /**
-       * Get representation of cassandra double type
-       * @return Cassandra\Type double type
-       */
-    final static function double() {}
-
-      /**
-       * Get representation of cassandra float type
-       * @return Cassandra\Type float type
-       */
-    final static function float() {}
-
-      /**
-       * Get representation of cassandra inet type
-       * @return Cassandra\Type inet type
-       */
-    final static function inet() {}
-
-      /**
-       * Get representation of cassandra timestamp type
-       * @return Cassandra\Type timestamp type
-       */
-    final static function timestamp() {}
-
-      /**
-       * Get representation of cassandra uuid type
-       * @return Cassandra\Type uuid type
-       */
-    final static function uuid() {}
-
-      /**
-       * Get representation of cassandra timeuuid type
-       * @return Cassandra\Type timeuuid type
-       */
-    final static function timeuuid() {}
+abstract class Type {
+
+    /**
+     * Returns the name of this type as string.
+     *
+     * @return string Name of this type
+     */
+    public abstract function name();
+
+    /**
+     * Returns string representation of this type.
+     *
+     * @return string String representation of this type
+     */
+    public abstract function __toString();
+
+    /**
+     * Get representation of ascii type
+     *
+     * @return Type ascii type
+     */
+    public static final function ascii() { }
+
+    /**
+     * Get representation of bigint type
+     *
+     * @return Type bigint type
+     */
+    public static final function bigint() { }
+
+    /**
+     * Get representation of smallint type
+     *
+     * @return Type smallint type
+     */
+    public static final function smallint() { }
+
+    /**
+     * Get representation of tinyint type
+     *
+     * @return Type tinyint type
+     */
+    public static final function tinyint() { }
+
+    /**
+     * Get representation of blob type
+     *
+     * @return Type blob type
+     */
+    public static final function blob() { }
+
+    /**
+     * Get representation of boolean type
+     *
+     * @return Type boolean type
+     */
+    public static final function boolean() { }
+
+    /**
+     * Get representation of counter type
+     *
+     * @return Type counter type
+     */
+    public static final function counter() { }
+
+    /**
+     * Get representation of decimal type
+     *
+     * @return Type decimal type
+     */
+    public static final function decimal() { }
+
+    /**
+     * Get representation of double type
+     *
+     * @return Type double type
+     */
+    public static final function double() { }
+
+    /**
+     * Get representation of duration type
+     *
+     * @return Type duration type
+     */
+    public static final function duration() { }
+
+    /**
+     * Get representation of float type
+     *
+     * @return Type float type
+     */
+    public static final function float() { }
+
+    /**
+     * Get representation of int type
+     *
+     * @return Type int type
+     */
+    public static final function int() { }
+
+    /**
+     * Get representation of text type
+     *
+     * @return Type text type
+     */
+    public static final function text() { }
+
+    /**
+     * Get representation of timestamp type
+     *
+     * @return Type timestamp type
+     */
+    public static final function timestamp() { }
+
+    /**
+     * Get representation of date type
+     *
+     * @return Type date type
+     */
+    public static final function date() { }
+
+    /**
+     * Get representation of time type
+     *
+     * @return Type time type
+     */
+    public static final function time() { }
+
+    /**
+     * Get representation of uuid type
+     *
+     * @return Type uuid type
+     */
+    public static final function uuid() { }
+
+    /**
+     * Get representation of varchar type
+     *
+     * @return Type varchar type
+     */
+    public static final function varchar() { }
+
+    /**
+     * Get representation of varint type
+     *
+     * @return Type varint type
+     */
+    public static final function varint() { }
+
+    /**
+     * Get representation of timeuuid type
+     *
+     * @return Type timeuuid type
+     */
+    public static final function timeuuid() { }
+
+    /**
+     * Get representation of inet type
+     *
+     * @return Type inet type
+     */
+    public static final function inet() { }
 
     /**
      * Initialize a Collection type
      * @code{.php}
      * <?php
-     * use Cassandra\Type;
+     * use Type;
      *
      * $collection = Type::collection(Type::int())
      *                   ->create(1, 2, 3, 4, 5, 6, 7, 8, 9);
      *
      * var_dump($collection);
      * @endcode
-     * @param  Type $type The type of values
-     * @return Type       The collection type
+     *
+     * @param Type $type The type of values
+     *
+     * @return Type The collection type
      */
-    final static function collection(Type $type) {}
+    public static final function collection($type) { }
+
+    /**
+     * Initialize a set type
+     * @code{.php}
+     * <?php
+     * use Type;
+     *
+     * $set = Type::set(Type::varchar())
+     *            ->create("a", "b", "c", "d", "e", "f", "g", "h", "i", "j");
+     *
+     * var_dump($set);
+     * @endcode
+     *
+     * @param Type $type The types of values
+     *
+     * @return Type The set type
+     */
+    public static final function set($type) { }
 
     /**
      * Initialize a map type
      * @code{.php}
      * <?php
-     * use Cassandra\Type;
+     * use Type;
      *
      * $map = Type::map(Type::int(), Type::varchar())
      *            ->create(1, "a", 2, "b", 3, "c", 4, "d", 5, "e", 6, "f")
      *
      * var_dump($map);
      * @endcode
-     * @param  Type $key_type   The type of keys
-     * @param  Type $value_type The type of values
-     * @return Type             The map type
+     *
+     * @param Type $keyType The type of keys
+     * @param Type $valueType The type of values
+     *
+     * @return Type The map type
      */
-    final static function map(Type $key_type, Type $value_type) {}
+    public static final function map($keyType, $valueType) { }
 
     /**
-     * Initialize a set type
+     * Initialize a tuple type
      * @code{.php}
      * <?php
-     * use Cassandra\Type;
+     * use Type;
      *
-     * $set = Type::set(Type::varchar)
-     *            ->create("a", "b", "c", "d", "e", "f", "g", "h", "i", "j");
+     * $tuple = Type::tuple(Type::varchar(), Type::int())
+     *            ->create("a", 123);
      *
-     * var_dump($set);
+     * var_dump($tuple);
      * @endcode
-     * @param Type $type [description]
-     */
-    final static function set(Type $type) {}
-
-    /**
-     * Returns the name of this type as string.
-     * @return string Name of this type
-     */
-    function name() {}
-
-    /**
-     * Returns string representation of this type.
-     * @return string String representation of this type
+     *
+     * @param Type $types A variadic list of types
+     *
+     * @return Type The tuple type
      */
-    function __toString() {}
+    public static final function tuple($types) { }
 
     /**
-     * Instantiate a value of this type from provided value(s).
+     * Initialize a user type
+     * @code{.php}
+     * <?php
+     * use Type;
      *
-     * @throws Exception\InvalidArgumentException when values given cannot be
-     *                                            represented by this type.
+     * $userType = Type::userType("a", Type::varchar(), "b", Type::int())
+     *                 ->create("a", "abc", "b", 123);
      *
-     * @param  mixed $value,... one or more values to coerce into this type
-     * @return mixed            a value of this type
+     * var_dump($userType);
+     * @endcode
+     *
+     * @param Type $types A variadic list of name/type pairs
+     *
+     * @return Type The user type
      */
-    function create($value = null) {}
+    public static final function userType($types) { }
+
 }
diff --git a/Library/Cassandra/Type/Collection.php b/Library/Cassandra/Type/Collection.php
index 31c345a..4e13965 100644
--- a/Library/Cassandra/Type/Collection.php
+++ b/Library/Cassandra/Type/Collection.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,38 +18,47 @@
 
 namespace Cassandra\Type;
 
-use Cassandra\Type;
+/**
+ * A class that represents the list type. The list type contains the type of the
+ * elements contain in the list.
+ */
+final class Collection extends Type {
+
+    private function __construct() { }
 
-final class Collection extends Type
-{
     /**
      * Returns "list"
+     *
      * @return string "list"
      */
-    public function name() {}
+    public function name() { }
 
     /**
-     * Returns type representation in CQL, e.g. `list<varchar>`
-     * @return string Type representation in CQL
+     * Returns type of values
+     *
+     * @return Type Type of values
      */
-    public function __toString() {}
+    public function valueType() { }
 
     /**
-     * Returns type of values
-     * @return Type Type of values
+     * Returns type representation in CQL, e.g. `list<varchar>`
+     *
+     * @return string Type representation in CQL
      */
-    public function valueType() {}
+    public function __toString() { }
 
     /**
-     * Creates a new Cassandra\Collection from the given values.
+     * Creates a new Collection from the given values.  When no values
+     * given, creates an empty list.
+     *
+     * @param mixed $value ,...      One or more values to be added to the list.
      *
      * @throws Exception\InvalidArgumentException when values given are of a
      *                                            different type than what this
      *                                            list type expects.
      *
-     * @param  mixed $value,...      One or more values to be added to the list.
-     *                               When no values given, creates an empty list.
-     * @return Cassandra\Collection  A list with given values.
+     * @return Collection A list with given values.
      */
-    public function create($value = null) {}
+    public function create($value) { }
+
 }
diff --git a/Library/Cassandra/Type/Custom.php b/Library/Cassandra/Type/Custom.php
index a2b1206..e208a16 100644
--- a/Library/Cassandra/Type/Custom.php
+++ b/Library/Cassandra/Type/Custom.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,31 +18,31 @@
 
 namespace Cassandra\Type;
 
-use Cassandra\Type;
+/**
+ * A class that represents a custom type.
+ */
+final class Custom extends Type {
+
+    private function __construct() { }
 
-final class Custom extends Type
-{
     /**
      * {@inheritDoc}
      *
      * @return string The name of this type
      */
-    public function name() {}
+    public function name() { }
 
     /**
      * {@inheritDoc}
      *
      * @return string String representation of this type
      */
-    public function __toString() {}
+    public function __toString() { }
 
     /**
-     * Creation of custom type instances is not supported
-     *
-     * @throws Cassandra\Exception\LogicException
-     *
-     * @param  mixed $value the value
-     * @return null         nothing
+     * @param mixed $value
+     * @return mixed
      */
-    public function create($value = null) {}
+    public function create($value) { }
+
 }
diff --git a/Library/Cassandra/Type/Map.php b/Library/Cassandra/Type/Map.php
index 653fd71..bcc68cc 100644
--- a/Library/Cassandra/Type/Map.php
+++ b/Library/Cassandra/Type/Map.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,41 +18,49 @@
 
 namespace Cassandra\Type;
 
-use Cassandra\Type;
+/**
+ * A class that represents the map type. The map type contains two types that
+ * represents the types of the key and value contained in the map.
+ */
+final class Map extends Type {
+
+    private function __construct() { }
 
-final class Map extends Type
-{
     /**
      * Returns "map"
+     *
      * @return string "map"
      */
-    public function name() {}
-
-    /**
-     * Returns type representation in CQL, e.g. `map<varchar, int>`
-     * @return string Type representation in CQL
-     */
-    public function __toString() {}
+    public function name() { }
 
     /**
      * Returns type of keys
+     *
      * @return Type Type of keys
      */
-    public function keyType() {}
+    public function keyType() { }
 
     /**
      * Returns type of values
+     *
      * @return Type Type of values
      */
-    public function valueType() {}
+    public function valueType() { }
 
     /**
-     * Creates a new Cassandra\Map from the given values.
+     * Returns type representation in CQL, e.g. `map<varchar, int>`
+     *
+     * @return string Type representation in CQL
+     */
+    public function __toString() { }
+
+    /**
+     * Creates a new Map from the given values.
      *
      * @code{.php}
      * <?php
-     * use Cassandra\Type;
-     * use Cassandra\Uuid;
+     * use Type;
+     * use Uuid;
      *
      * $type = Type::map(Type::uuid(), Type::varchar());
      * $map = $type->create(new Uuid(), 'first uuid',
@@ -62,15 +70,19 @@ public function valueType() {}
      * var_dump($map);
      * @endcode
      *
-     * @throws Exception\InvalidArgumentException when keys or values given are
-     *                                            of a different type than what
-     *                                            this map type expects.
      *
-     * @param  mixed $value,... An even number of values, where each odd value
      *                          is a key and each even value is a value for the
      *                          map, e.g. `create(key, value, key, value)`.
      *                          When no values given, creates an empty map.
-     * @return Cassandra\Map    A set with given values.
+     *
+     * @param mixed $value ,... An even number of values, where each odd value
+     *
+     * @throws Exception\InvalidArgumentException when keys or values given are
+     *                                            of a different type than what
+     *                                            this map type expects.
+     *
+     * @return Map A set with given values.
      */
-    public function create($value = null) {}
+    public function create($value) { }
+
 }
diff --git a/Library/Cassandra/Type/Scalar.php b/Library/Cassandra/Type/Scalar.php
index d741f2c..21e262e 100644
--- a/Library/Cassandra/Type/Scalar.php
+++ b/Library/Cassandra/Type/Scalar.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,11 +18,31 @@
 
 namespace Cassandra\Type;
 
-use Cassandra\Type;
+/**
+ * A class that represents a primitive type (e.g. `varchar` or `bigint`)
+ */
+final class Scalar extends Type {
+
+    private function __construct() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return string {@inheritDoc}
+     */
+    public function name() { }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return string {@inheritDoc}
+     */
+    public function __toString() { }
+
+    /**
+     * @param mixed $value
+     * @return mixed
+     */
+    public function create($value) { }
 
-final class Scalar extends Type
-{
-    public function name() {}
-    public function __toString() {}
-    public function create($value = null) {}
 }
diff --git a/Library/Cassandra/Type/Set.php b/Library/Cassandra/Type/Set.php
index 054f02a..69755e7 100644
--- a/Library/Cassandra/Type/Set.php
+++ b/Library/Cassandra/Type/Set.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,38 +18,46 @@
 
 namespace Cassandra\Type;
 
-use Cassandra\Type;
+/**
+ * A class that represents the set type. The set type contains the type of the
+ * elements contain in the set.
+ */
+final class Set extends Type {
+
+    private function __construct() { }
 
-final class Set extends Type
-{
     /**
      * Returns "set"
+     *
      * @return string "set"
      */
-    public function name() {}
+    public function name() { }
 
     /**
-     * Returns type representation in CQL, e.g. `set<varchar>`
-     * @return string Type representation in CQL
+     * Returns type of values
+     *
+     * @return Type Type of values
      */
-    public function __toString() {}
+    public function valueType() { }
 
     /**
-     * Returns type of values
-     * @return Type Type of values
+     * Returns type representation in CQL, e.g. `set<varchar>`
+     *
+     * @return string Type representation in CQL
      */
-    public function valueType() {}
+    public function __toString() { }
 
     /**
-     * Creates a new Cassandra\Set from the given values.
+     * Creates a new Set from the given values.
+     *
+     * @param mixed $value ,... One or more values to be added to the set. When no values are given, creates an empty set.
      *
      * @throws Exception\InvalidArgumentException when values given are of a
      *                                            different type than what this
      *                                            set type expects.
      *
-     * @param  mixed $value,... One or more values to be added to the set. When
-     *                          no values are given, creates an empty set.
-     * @return Cassandra\Set    A set with given values.
+     * @return Set A set with given values.
      */
-    public function create($value = null) {}
+    public function create($value) { }
+
 }
diff --git a/Library/Cassandra/Type/Tuple.php b/Library/Cassandra/Type/Tuple.php
index 64d0359..1634653 100644
--- a/Library/Cassandra/Type/Tuple.php
+++ b/Library/Cassandra/Type/Tuple.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,39 +18,47 @@
 
 namespace Cassandra\Type;
 
-use Cassandra\Type;
+/**
+ * A class that represents the tuple type. The tuple type is able to represent
+ * a composite type of one or more types accessed by index.
+ */
+final class Tuple extends Type {
+
+    private function __construct() { }
 
-final class Tuple extends Type
-{
     /**
      * Returns "tuple"
+     *
      * @return string "tuple"
      */
-    public function name() {}
+    public function name() { }
 
     /**
      * Returns type representation in CQL, e.g. `tuple<varchar, int>`
+     *
      * @return string Type representation in CQL
      */
-    public function __toString() {}
+    public function __toString() { }
 
     /**
      * Returns types of values
+     *
      * @return array An array of types
      */
-    public function types() {}
+    public function types() { }
 
     /**
-     * Creates a new Cassandra\Tuple from the given values.
+     * Creates a new Tuple from the given values. When no values given,
+     * creates a tuple with null for the values.
+     *
+     * @param mixed $values {@inheritDoc}
      *
      * @throws Exception\InvalidArgumentException when values given are of a
      *                                            different type than what the
      *                                            tuple expects.
      *
-     * @param  mixed $value,...      One or more values to be added to the tuple.
-     *                               When no values given, creates a tuple with
-     *                               null for the values.
-     * @return Cassandra\Tuple  A tuple with given values.
+     * @return Tuple A tuple with given values.
      */
-    public function create($value = null) {}
+    public function create($values) { }
+
 }
diff --git a/Library/Cassandra/Type/UserType.php b/Library/Cassandra/Type/UserType.php
index e861693..731753f 100644
--- a/Library/Cassandra/Type/UserType.php
+++ b/Library/Cassandra/Type/UserType.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,46 +18,73 @@
 
 namespace Cassandra\Type;
 
-use Cassandra\Type;
+/**
+ * A class that represents a user type. The user type is able to represent a
+ * composite type of one or more types accessed by name.
+ */
+final class UserType extends Type {
+
+    private function __construct() { }
+
+    /**
+     * Associate the user type with a name.
+     *
+     * @param string $name Name of the user type.
+     *
+     * @return null Nothing.
+     */
+    public function withName($name) { }
 
-final class UserType extends Type
-{
     /**
      * Returns type name for the user type
+     *
      * @return string
      */
-    public function name() {}
+    public function name() { }
+
+    /**
+     * Associate the user type with a keyspace.
+     *
+     * @param string $keyspace Keyspace that contains the user type.
+     *
+     * @return null Nothing.
+     */
+    public function withKeyspace($keyspace) { }
 
     /**
      * Returns keyspace for the user type
+     *
      * @return string
      */
-    public function keyspace() {}
+    public function keyspace() { }
 
     /**
-     * Returns type representation in CQL, e.g. 1keyspace.type_name1 or
+     * Returns type representation in CQL, e.g. keyspace1.type_name1 or
      * `userType<name1:varchar, name2:int>`.
      *
      * @return string Type representation in CQL
      */
-    public function __toString() {}
+    public function __toString() { }
 
     /**
      * Returns types of values
+     *
      * @return array An array of types
      */
-    public function types() {}
+    public function types() { }
 
     /**
-     * Creates a new Cassandra\UserTypeValue from the given name/value pairs.
+     * Creates a new UserTypeValue from the given name/value pairs. When
+     * no values given, creates an empty user type.
+     *
+     * @param mixed $value ,...      One or more name/value pairs to be added to the user type.
      *
      * @throws Exception\InvalidArgumentException when values given are of a
      *                                            different types than what the
      *                                            user type expects.
      *
-     * @param  mixed $value,...      One or more name/value pairs to be added to the user type.
-     *                               When no values given, creates an empty user type.
-     * @return Cassandra\UserTypeValue  A user type value with given name/value pairs.
+     * @return UserTypeValue A user type value with given name/value pairs.
      */
-    public function create($value = null) {}
+    public function create($value) { }
+
 }
diff --git a/Library/Cassandra/UserTypeValue.php b/Library/Cassandra/UserTypeValue.php
index b4fcf16..62c2f14 100644
--- a/Library/Cassandra/UserTypeValue.php
+++ b/Library/Cassandra/UserTypeValue.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,87 +21,87 @@
 /**
  * A PHP representation of the CQL UDT datatype
  */
-final class UserTypeValue implements Value, \Countable, \Iterator
-{
+final class UserTypeValue implements Value, \Countable, \Iterator {
+
     /**
      * Creates a new user type value with the given name/type pairs.
      *
      * @param array $types Array of types
      */
-    public function __construct($types) {}
+    public function __construct($types) { }
 
     /**
      * The type of this user type value.
      *
      * @return Type
      */
-    public function type() {}
+    public function type() { }
 
     /**
      * Array of values in this user type value.
      *
      * @return array values
      */
-    public function values() {}
+    public function values() { }
 
     /**
      * Sets the value at name in this user type value.
      *
-     * @param sting $name  String of the field name
-     * @param mixed $value Value or null
+     * @param mixed $value A value or null
      *
      * @return void
      */
-    public function set($name, $value) {}
+    public function set($value) { }
 
     /**
      * Retrieves the value at a given name.
      *
-     * @param sting $name  String of the field name
+     * @param string $name String of the field name
      *
-     * @return  mixed         Value or null
+     * @return mixed A value or null
      */
-    public function get($name) {}
+    public function get($name) { }
 
     /**
      * Total number of elements in this user type value.
      *
      * @return int count
      */
-    public function count() {}
+    public function count() { }
 
     /**
      * Current element for iteration
      *
-     * @return mixed current element
+     * @return mixed The current element
      */
-    public function current() {}
+    public function current() { }
 
     /**
      * Current key for iteration
      *
      * @return int current key
      */
-    public function key() {}
+    public function key() { }
 
     /**
      * Move internal iterator forward
      *
      * @return void
      */
-    public function next() {}
+    public function next() { }
 
     /**
      * Check whether a current value exists
      *
      * @return bool
      */
-    public function valid() {}
+    public function valid() { }
 
     /**
      * Rewind internal iterator
      *
      * @return void
      */
-    public function rewind() {}
+    public function rewind() { }
+
 }
diff --git a/Library/Cassandra/Uuid.php b/Library/Cassandra/Uuid.php
index f145d7f..e4f2496 100644
--- a/Library/Cassandra/Uuid.php
+++ b/Library/Cassandra/Uuid.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,40 +21,41 @@
 /**
  * A PHP representation of the CQL `uuid` datatype
  */
-final class Uuid implements Value, UuidInterface
-{
+final class Uuid implements Value, UuidInterface {
+
     /**
      * Creates a uuid from a given uuid string or a random one.
      *
      * @param string $uuid A uuid string
      */
-    public function __construct($uuid = null) {}
+    public function __construct($uuid) { }
 
     /**
      * Returns this uuid as string.
      *
      * @return string uuid
      */
-    public function __toString() {}
+    public function __toString() { }
 
     /**
      * The type of this uuid.
      *
      * @return Type
      */
-    public function type() {}
+    public function type() { }
 
     /**
      * Returns this uuid as string.
      *
      * @return string uuid
      */
-    public function uuid() {}
+    public function uuid() { }
 
     /**
      * Returns the version of this uuid.
      *
      * @return int version of this uuid
      */
-    public function version() {}
+    public function version() { }
+
 }
diff --git a/Library/Cassandra/UuidInterface.php b/Library/Cassandra/UuidInterface.php
index c28e63d..0edab70 100644
--- a/Library/Cassandra/UuidInterface.php
+++ b/Library/Cassandra/UuidInterface.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@
 /**
  * A PHP representation of the CQL `uuid` datatype
  */
-interface UuidInterface
-{
+interface UuidInterface {
+
     /**
      * Returns this uuid as string.
      *
@@ -36,4 +36,5 @@ public function uuid();
      * @return int version of this uuid
      */
     public function version();
+
 }
diff --git a/Library/Cassandra/Value.php b/Library/Cassandra/Value.php
index c37d8c4..d9d0fe3 100644
--- a/Library/Cassandra/Value.php
+++ b/Library/Cassandra/Value.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,12 +40,13 @@
  * @see Numeric
  * @see UuidInterface
  */
-interface Value
-{
+interface Value {
+
     /**
      * The type of represented by the value.
      *
      * @return Type
      */
-    function type();
+    public function type();
+
 }
diff --git a/Library/Cassandra/Varint.php b/Library/Cassandra/Varint.php
index 2fac49d..77feba2 100644
--- a/Library/Cassandra/Varint.php
+++ b/Library/Cassandra/Varint.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2015-2016 DataStax, Inc.
+ * Copyright 2017 DataStax, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,93 +21,89 @@
 /**
  * A PHP representation of the CQL `varint` datatype
  */
-final class Varint implements Value, Numeric
-{
+final class Varint implements Value, Numeric {
+
     /**
      * Creates a new variable length integer.
      *
      * @param string $value integer value as a string
      */
-    public function __construct($value) {}
+    public function __construct($value) { }
 
     /**
      * Returns the integer value.
      *
      * @return string integer value
      */
-    public function __toString() {}
+    public function __toString() { }
 
     /**
      * The type of this varint.
      *
      * @return Type
      */
-    public function type() {}
+    public function type() { }
 
     /**
      * Returns the integer value.
      *
      * @return string integer value
      */
-    public function value() {}
+    public function value() { }
 
     /**
-     * @param Numeric $addend a number to add to this one
-     *
+     * @param Numeric $num a number to add to this one
      * @return Numeric sum
      */
-    public function add(Numeric $addend) {}
+    public function add($num) { }
 
     /**
-     * @param Numeric $subtrahend a number to subtract from this one
-     *
+     * @param Numeric $num a number to subtract from this one
      * @return Numeric difference
      */
-    public function sub(Numeric $subtrahend) {}
+    public function sub($num) { }
 
     /**
-     * @param Numeric $multiplier a number to multiply this one by
-     *
+     * @param Numeric $num a number to multiply this one by
      * @return Numeric product
      */
-    public function mul(Numeric $multiplier) {}
+    public function mul($num) { }
 
     /**
-     * @param Numeric $divisor a number to divide this one by
-     *
+     * @param Numeric $num a number to divide this one by
      * @return Numeric quotient
      */
-    public function div(Numeric $divisor) {}
+    public function div($num) { }
 
     /**
-     * @param Numeric $divisor a number to divide this one by
-     *
+     * @param Numeric $num a number to divide this one by
      * @return Numeric remainder
      */
-    public function mod(Numeric $divisor) {}
+    public function mod($num) { }
 
     /**
      * @return Numeric absolute value
      */
-    public function abs() {}
+    public function abs() { }
 
     /**
      * @return Numeric negative value
      */
-    public function neg() {}
+    public function neg() { }
 
     /**
      * @return Numeric square root
      */
-    public function sqrt() {}
+    public function sqrt() { }
 
     /**
      * @return int this number as int
      */
-    public function toInt() {}
+    public function toInt() { }
 
     /**
      * @return float this number as float
      */
-    public function toDouble() {}
+    public function toDouble() { }
+
 }