@@ -10,7 +10,7 @@ This is a GraphQL Java implementation based on the [specification](https://githu
 and the JavaScript [reference implementation](https://github.com/graphql/graphql-js).
 
 
-**Status**: Version `2.2.0` is released. 
+**Status**: Version `2.3.0` is released.
 
 The versioning follows [Semantic Versioning](http://semver.org) since `2.0.0`. 
 
@@ -94,9 +94,7 @@ public class HelloWorld {
         GraphQLSchema schema = GraphQLSchema.newSchema()
                         .query(queryType)
                         .build();
-        
-        GraphQL graphQL = GraphQL.newObject(schema).build();
-        Map<String, Object> result = (Map<String, Object>) graphQL.execute("{hello}").getData();
+        Map<String, Object> result = new GraphQL(schema).execute("{hello}").getData();
 
         System.out.println(result);
         // Prints: {hello=world}
@@ -120,7 +118,7 @@ Dependency:
 
 ```groovy
 dependencies {
-  compile 'com.graphql-java:graphql-java:2.2.0'
+  compile 'com.graphql-java:graphql-java:2.3.0'
 }
 
 ```
@@ -133,7 +131,7 @@ Dependency:
 <dependency>
     <groupId>com.graphql-java</groupId>
     <artifactId>graphql-java</artifactId>
-    <version>2.2.0</version>
+    <version>2.3.0</version>
 </dependency>
 
 ```
@@ -307,22 +305,22 @@ the property name of the source Object, no `DataFetcher` is needed.
 Example of configuring a custom `DataFetcher`:
 ```java
 
-DataFetcher calculateComplicatedValue = new DataFetcher() {
+DataFetcher<Foo> fooDataFetcher = new DataFetcher<Foo>() {
     @Override
-    Object get(DataFetchingEnvironment environment) {
+    Foo get(DataFetchingEnvironment environment) {
         // environment.getSource() is the value of the surrounding
         // object. In this case described by objectType
-        Object value = ... // Perhaps getting from a DB or whatever 
+        Foo value = ... // Perhaps getting from a DB or whatever 
         return value;
     }
 };
 
 GraphQLObjectType objectType = newObject()
     .name("ObjectType")
     .field(newFieldDefinition()
-            .name("someComplicatedValue")
+            .name("foo")
             .type(GraphQLString)
-            .dataFetcher(calculateComplicatedValue))
+            .dataFetcher(fooDataFetcher))
     .build();
 
 ```
 
@@ -39,4 +39,19 @@ public String toString() {
                 "exception=" + exception +
                 '}';
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        ExceptionWhileDataFetching that = (ExceptionWhileDataFetching) o;
+
+        return Helper.equals(this, that);
+    }
+
+    @Override
+    public int hashCode() {
+        return Helper.hashCode(this);
+    }
 }
@@ -2,10 +2,14 @@
 
 
 import java.util.List;
+import java.util.Map;
 
 public interface ExecutionResult {
 
-    Object getData();
+    <T> T getData();
 
     List<GraphQLError> getErrors();
+
+    Map<Object,Object> getExtensions();
+
 }
@@ -2,32 +2,49 @@
 
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class ExecutionResultImpl implements ExecutionResult {
 
     private final List<GraphQLError> errors = new ArrayList<GraphQLError>();
     private Object data;
+    private Map<Object,Object> extensions = null;
 
     public ExecutionResultImpl(List<? extends GraphQLError> errors) {
-        this.errors.addAll(errors);
+        this(null,errors,null);
     }
 
     public ExecutionResultImpl(Object data, List<? extends GraphQLError> errors) {
+        this(data,errors,null);
+    }
+
+    public ExecutionResultImpl(Object data, List<? extends GraphQLError> errors, Map<Object,Object> extensions) {
         this.data = data;
 
-        if (errors != null) {
+        if (errors != null && !errors.isEmpty()) {
             this.errors.addAll(errors);
         }
+
+        if (extensions != null && !extensions.isEmpty()) {
+            this.extensions = new HashMap<Object,Object>(extensions);
+        }
     }
 
     public void addErrors(List<? extends GraphQLError> errors) {
         this.errors.addAll(errors);
     }
 
+    public void addExtensions(Map<Object, Object> extensions) {
+        this.extensions.putAll(extensions);
+    }
+
+
     @Override
-    public Object getData() {
-        return data;
+    public <T> T getData() {
+        //noinspection unchecked
+        return (T) data;
     }
 
     public void setData(Object result) {
@@ -39,5 +56,8 @@ public List<GraphQLError> getErrors() {
         return new ArrayList<GraphQLError>(errors);
     }
 
-
+    @Override
+    public Map<Object, Object> getExtensions() {
+        return extensions == null ? null : new HashMap<Object,Object>(extensions);
+    }
 }
@@ -25,7 +25,8 @@ public class GraphQL {
 
 
     private final GraphQLSchema graphQLSchema;
-    private final ExecutionStrategy executionStrategy;
+    private final ExecutionStrategy queryStrategy;
+    private final ExecutionStrategy mutationStrategy;
 
     private static final Logger log = LoggerFactory.getLogger(GraphQL.class);
 
@@ -38,22 +39,35 @@ public class GraphQL {
      */
     public GraphQL(GraphQLSchema graphQLSchema) {
         //noinspection deprecation
-        this(graphQLSchema, null);
+        this(graphQLSchema, null, null);
     }
 
 
     /**
      * A GraphQL object ready to execute queries
      *
      * @param graphQLSchema     the schema to use
-     * @param executionStrategy the execution strategy to use
+     * @param queryStrategy the execution strategy to use
      *
      * @deprecated use the {@link #newObject(GraphQLSchema)} builder instead.  This will be removed in a future version.
      */
-    @SuppressWarnings("DeprecatedIsStillUsed")
-    public GraphQL(GraphQLSchema graphQLSchema, ExecutionStrategy executionStrategy) {
+    public GraphQL(GraphQLSchema graphQLSchema, ExecutionStrategy queryStrategy) {
+        //noinspection deprecation
+        this(graphQLSchema, queryStrategy, null);
+    }
+
+    /**
+     * A GraphQL object ready to execute queries
+     *
+     * @param graphQLSchema     the schema to use
+     * @param queryStrategy the execution strategy to use
+     *
+     * @deprecated use the {@link #newObject(GraphQLSchema)} builder instead.  This will be removed in a future version.
+     */
+    public GraphQL(GraphQLSchema graphQLSchema, ExecutionStrategy queryStrategy, ExecutionStrategy mutationStrategy) {
         this.graphQLSchema = graphQLSchema;
-        this.executionStrategy = executionStrategy;
+        this.queryStrategy = queryStrategy;
+        this.mutationStrategy = mutationStrategy;
     }
 
     /**
@@ -127,7 +141,7 @@ public ExecutionResult execute(String requestString, String operationName, Objec
         if (validationErrors.size() > 0) {
             return new ExecutionResultImpl(validationErrors);
         }
-        Execution execution = new Execution(executionStrategy);
+        Execution execution = new Execution(queryStrategy, mutationStrategy);
         return execution.execute(graphQLSchema, context, document, operationName, arguments);
     }
 
 
@@ -13,4 +13,31 @@ public interface GraphQLError {
 
     ErrorType getErrorType();
 
+
+    /**
+     * This little helper allows GraphQlErrors to implement
+     * common things (hashcode/ equals) more easily
+     */
+    @SuppressWarnings("SimplifiableIfStatement")
+    class Helper {
+
+        public static int hashCode(GraphQLError dis) {
+            int result = dis.getMessage() != null ? dis.getMessage().hashCode() : 0;
+            result = 31 * result + (dis.getLocations() != null ? dis.getLocations().hashCode() : 0);
+            result = 31 * result + dis.getErrorType().hashCode();
+            return result;
+        }
+
+        public static boolean equals(GraphQLError dis, GraphQLError dat) {
+            if (dis == dat) {
+                return true;
+            }
+            if (dis.getMessage() != null ? !dis.getMessage().equals(dat.getMessage()) : dat.getMessage() != null)
+                return false;
+            if (dis.getLocations() != null ? !dis.getLocations().equals(dat.getLocations()) : dat.getLocations() != null)
+                return false;
+            return dis.getErrorType() == dat.getErrorType();
+        }
+    }
+
 }
@@ -44,4 +44,18 @@ public String toString() {
                 '}';
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        InvalidSyntaxError that = (InvalidSyntaxError) o;
+
+        return Helper.equals(this,that);
+    }
+
+    @Override
+    public int hashCode() {
+        return Helper.hashCode(this);
+    }
 }