@@ -2,4 +2,41 @@
 
 
 public class BooleanValue implements Value{
+
+    private boolean value;
+
+    public BooleanValue(boolean value) {
+        this.value = value;
+    }
+
+    public boolean isValue() {
+        return value;
+    }
+
+    public void setValue(boolean value) {
+        this.value = value;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        BooleanValue that = (BooleanValue) o;
+
+        return value == that.value;
+
+    }
+
+    @Override
+    public int hashCode() {
+        return (value ? 1 : 0);
+    }
+
+    @Override
+    public String toString() {
+        return "BooleanValue{" +
+                "value=" + value +
+                '}';
+    }
 }
@@ -0,0 +1,44 @@
+package graphql.language;
+
+
+import java.math.BigDecimal;
+
+public class FloatValue implements Value{
+
+    private BigDecimal value;
+
+    public FloatValue(BigDecimal value) {
+        this.value = value;
+    }
+
+    public BigDecimal getValue() {
+        return value;
+    }
+
+    public void setValue(BigDecimal value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return "FloatValue{" +
+                "value=" + value +
+                '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        FloatValue that = (FloatValue) o;
+
+        return !(value != null ? !value.equals(that.value) : that.value != null);
+
+    }
+
+    @Override
+    public int hashCode() {
+        return value != null ? value.hashCode() : 0;
+    }
+}
@@ -0,0 +1,42 @@
+package graphql.language;
+
+
+public class StringValue implements Value{
+
+    private String value;
+
+    public StringValue(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return "StringValue{" +
+                "value='" + value + '\'' +
+                '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        StringValue that = (StringValue) o;
+
+        return !(value != null ? !value.equals(that.value) : that.value != null);
+
+    }
+
+    @Override
+    public int hashCode() {
+        return value != null ? value.hashCode() : 0;
+    }
+}
@@ -7,6 +7,7 @@
 import graphql.parser.antlr.GraphqlParser;
 import org.antlr.v4.runtime.misc.NotNull;
 
+import java.math.BigDecimal;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -152,18 +153,31 @@ public Void visitTypeName(@NotNull GraphqlParser.TypeNameContext ctx) {
 
     @Override
     public Void visitArgument(@NotNull GraphqlParser.ArgumentContext ctx) {
-        Argument argument = new Argument(ctx.NAME().getText(),getValue(ctx.value()));
+        Argument argument = new Argument(ctx.NAME().getText(), getValue(ctx.value()));
         Field field = (Field) context.get(ContextProperty.Field);
         field.getArguments().add(argument);
         return super.visitArgument(ctx);
     }
 
-    private Value getValue(GraphqlParser.ValueContext ctx){
+    private Value getValue(GraphqlParser.ValueContext ctx) {
         if (ctx.IntValue() != null) {
             IntValue intValue = new IntValue(Integer.parseInt(ctx.IntValue().getText()));
             return intValue;
+        } else if (ctx.FloatValue() != null) {
+            FloatValue floatValue = new FloatValue(new BigDecimal(ctx.FloatValue().getText()));
+            return floatValue;
+        } else if (ctx.BooleanValue() != null) {
+            BooleanValue booleanValue = new BooleanValue(Boolean.parseBoolean(ctx.BooleanValue().getText()));
+            return booleanValue;
+        } else if (ctx.StringValue() != null) {
+            StringValue booleanValue = new StringValue(trimQuotes(ctx.StringValue().getText()));
+            return booleanValue;
         }
         return null;
     }
 
+    private String trimQuotes(String string) {
+        return string.substring(1, string.length() - 1);
+    }
+
 }
@@ -1,14 +1,17 @@
 package graphql.parser
 
 import graphql.language.Argument
+import graphql.language.BooleanValue
 import graphql.language.Document
 import graphql.language.Field
+import graphql.language.FloatValue
 import graphql.language.GraphQLType
 import graphql.language.IntValue
 import graphql.language.NamedType
 import graphql.language.OperationDefinition
 import graphql.language.Selection
 import graphql.language.SelectionSet
+import graphql.language.StringValue
 import graphql.language.VariableDefinition
 import spock.lang.Specification
 
@@ -78,7 +81,7 @@ class ParserTest extends Specification {
 
     }
 
-    def "parse mutation"(){
+    def "parse mutation"() {
         given:
         def input = 'mutation setName { setName(name: "Homer") { newName } }'
 
@@ -89,12 +92,15 @@ class ParserTest extends Specification {
         getOperationDefinition(document).operation == OperationDefinition.Operation.MUTATION
     }
 
-    def "parse field argument"(){
+    def "parse field arguments"() {
         given:
-        def input = '{ user(id: 10) }'
+        def input = '{ user(id: 10 name: "homer" admin:true floatValue: 3.04) }'
 
-        def argument = new Argument("id",new IntValue(10))
-        def field = new Field("user",[argument])
+        def argument = new Argument("id", new IntValue(10))
+        def argument2 = new Argument("name", new StringValue("homer"))
+        def argument3 = new Argument("admin", new BooleanValue(true))
+        def argument4 = new Argument("floatValue", new FloatValue(3.04))
+        def field = new Field("user", [argument,argument2,argument3,argument4])
         def selectionSet = new SelectionSet([field])
         def operationDefinition = new OperationDefinition()
         operationDefinition.operation = OperationDefinition.Operation.QUERY
@@ -109,7 +115,6 @@ class ParserTest extends Specification {
     }
 
 
-
     Field getInnerField(SelectionSet selectionSet) {
         def field = (Field) selectionSet.selections[0]
         (Field) field.selectionSet.selections[0]