diff --git a/node/name/name_test.go b/node/name/name_test.go
index 918103b..b76fb1b 100644
--- a/node/name/name_test.go
+++ b/node/name/name_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/kylelemons/godebug/pretty"
 	"github.com/z7zmey/php-parser/node"
 	"github.com/z7zmey/php-parser/node/stmt"
-	"github.com/z7zmey/php-parser/parser"
+	"github.com/z7zmey/php-parser/php7"
 )
 
 func assertEqual(t *testing.T, expected interface{}, actual interface{}) {
@@ -44,7 +44,7 @@ func TestName(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	assertEqual(t, expected, actual)
 }
@@ -65,7 +65,7 @@ func TestFullyQualified(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	assertEqual(t, expected, actual)
 }
@@ -86,7 +86,7 @@ func TestRelative(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	assertEqual(t, expected, actual)
 }
diff --git a/node/node_test.go b/node/node_test.go
index 5733db5..c992956 100644
--- a/node/node_test.go
+++ b/node/node_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/kylelemons/godebug/pretty"
 	"github.com/z7zmey/php-parser/node"
 	"github.com/z7zmey/php-parser/node/stmt"
-	"github.com/z7zmey/php-parser/parser"
+	"github.com/z7zmey/php-parser/php7"
 )
 
 func assertEqual(t *testing.T, expected interface{}, actual interface{}) {
@@ -41,7 +41,7 @@ func TestIdentifier(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	assertEqual(t, expected, actual)
 }
@@ -132,7 +132,7 @@ func TestArgumentNode(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	assertEqual(t, expected, actual)
 }
@@ -198,7 +198,7 @@ func TestParameterNode(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	assertEqual(t, expected, actual)
 }
diff --git a/node/scalar/encapsed_test.go b/node/scalar/encapsed_test.go
index 5b38718..19ceac7 100644
--- a/node/scalar/encapsed_test.go
+++ b/node/scalar/encapsed_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/z7zmey/php-parser/node"
 	"github.com/z7zmey/php-parser/node/scalar"
 	"github.com/z7zmey/php-parser/node/stmt"
-	"github.com/z7zmey/php-parser/parser"
+	"github.com/z7zmey/php-parser/php7"
 )
 
 func TestSimpleVar(t *testing.T) {
@@ -29,7 +29,7 @@ func TestSimpleVar(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	if diff := pretty.Compare(expected, actual); diff != "" {
 		t.Errorf("diff: (-expected +actual)\n%s", diff)
@@ -56,7 +56,7 @@ func TestSimpleVarPropertyFetch(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	if diff := pretty.Compare(expected, actual); diff != "" {
 		t.Errorf("diff: (-expected +actual)\n%s", diff)
@@ -79,7 +79,7 @@ func TestDollarOpenCurlyBraces(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	if diff := pretty.Compare(expected, actual); diff != "" {
 		t.Errorf("diff: (-expected +actual)\n%s", diff)
@@ -105,7 +105,7 @@ func TestDollarOpenCurlyBracesDimNumber(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	if diff := pretty.Compare(expected, actual); diff != "" {
 		t.Errorf("diff: (-expected +actual)\n%s", diff)
@@ -131,7 +131,7 @@ func TestCurlyOpenMethodCall(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	if diff := pretty.Compare(expected, actual); diff != "" {
 		t.Errorf("diff: (-expected +actual)\n%s", diff)
diff --git a/node/scalar/magic_constant_test.go b/node/scalar/magic_constant_test.go
index f466e32..e6b9b82 100644
--- a/node/scalar/magic_constant_test.go
+++ b/node/scalar/magic_constant_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/z7zmey/php-parser/node"
 	"github.com/z7zmey/php-parser/node/scalar"
 	"github.com/z7zmey/php-parser/node/stmt"
-	"github.com/z7zmey/php-parser/parser"
+	"github.com/z7zmey/php-parser/php7"
 )
 
 func TestMagicConstant(t *testing.T) {
@@ -22,7 +22,7 @@ func TestMagicConstant(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	if diff := pretty.Compare(expected, actual); diff != "" {
 		t.Errorf("diff: (-expected +actual)\n%s", diff)
diff --git a/node/scalar/numbers_test.go b/node/scalar/numbers_test.go
index e74e41e..27b0cb7 100644
--- a/node/scalar/numbers_test.go
+++ b/node/scalar/numbers_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/z7zmey/php-parser/node"
 	"github.com/z7zmey/php-parser/node/scalar"
 	"github.com/z7zmey/php-parser/node/stmt"
-	"github.com/z7zmey/php-parser/parser"
+	"github.com/z7zmey/php-parser/php7"
 )
 
 func assertEqual(t *testing.T, expected interface{}, actual interface{}) {
@@ -36,7 +36,7 @@ func TestLNumber(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	assertEqual(t, expected, actual)
 }
@@ -52,7 +52,7 @@ func TestDNumber(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	assertEqual(t, expected, actual)
 }
@@ -68,7 +68,7 @@ func TestFloat(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	assertEqual(t, expected, actual)
 }
@@ -84,7 +84,7 @@ func TestBinaryLNumber(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	assertEqual(t, expected, actual)
 }
@@ -100,7 +100,7 @@ func TestBinaryDNumber(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	assertEqual(t, expected, actual)
 }
@@ -116,7 +116,7 @@ func TestHLNumber(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	assertEqual(t, expected, actual)
 }
@@ -132,7 +132,7 @@ func TestHDNumber(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	assertEqual(t, expected, actual)
 }
diff --git a/node/scalar/string_test.go b/node/scalar/string_test.go
index 0470a8a..42a3449 100644
--- a/node/scalar/string_test.go
+++ b/node/scalar/string_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/z7zmey/php-parser/node"
 	"github.com/z7zmey/php-parser/node/scalar"
 	"github.com/z7zmey/php-parser/node/stmt"
-	"github.com/z7zmey/php-parser/parser"
+	"github.com/z7zmey/php-parser/php7"
 )
 
 func TestDoubleQuotedScalarString(t *testing.T) {
@@ -22,7 +22,7 @@ func TestDoubleQuotedScalarString(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	if diff := pretty.Compare(expected, actual); diff != "" {
 		t.Errorf("diff: (-expected +actual)\n%s", diff)
@@ -39,7 +39,7 @@ func TestDoubleQuotedScalarStringWithEscapedVar(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	if diff := pretty.Compare(expected, actual); diff != "" {
 		t.Errorf("diff: (-expected +actual)\n%s", diff)
@@ -59,7 +59,7 @@ func TestMultilineDoubleQuotedScalarString(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	if diff := pretty.Compare(expected, actual); diff != "" {
 		t.Errorf("diff: (-expected +actual)\n%s", diff)
@@ -77,7 +77,7 @@ func TestSingleQuotedScalarString(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	if diff := pretty.Compare(expected, actual); diff != "" {
 		t.Errorf("diff: (-expected +actual)\n%s", diff)
@@ -97,7 +97,7 @@ func TestMultilineSingleQuotedScalarString(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	if diff := pretty.Compare(expected, actual); diff != "" {
 		t.Errorf("diff: (-expected +actual)\n%s", diff)
@@ -118,7 +118,7 @@ CAD;
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	if diff := pretty.Compare(expected, actual); diff != "" {
 		t.Errorf("diff: (-expected +actual)\n%s", diff)
@@ -139,7 +139,7 @@ CAD;
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	if diff := pretty.Compare(expected, actual); diff != "" {
 		t.Errorf("diff: (-expected +actual)\n%s", diff)
@@ -160,7 +160,7 @@ CAD;
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	if diff := pretty.Compare(expected, actual); diff != "" {
 		t.Errorf("diff: (-expected +actual)\n%s", diff)
diff --git a/node/stmt/alt_if_test.go b/node/stmt/alt_if_test.go
index d494548..e967b95 100644
--- a/node/stmt/alt_if_test.go
+++ b/node/stmt/alt_if_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/kylelemons/godebug/pretty"
 	"github.com/z7zmey/php-parser/node"
 	"github.com/z7zmey/php-parser/node/stmt"
-	"github.com/z7zmey/php-parser/parser"
+	"github.com/z7zmey/php-parser/php7"
 )
 
 func assertEqual(t *testing.T, expected interface{}, actual interface{}) {
@@ -41,7 +41,7 @@ func TestAltIf(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	assertEqual(t, expected, actual)
 }
@@ -68,7 +68,7 @@ func TestAltElseIf(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	assertEqual(t, expected, actual)
 }
@@ -92,7 +92,7 @@ func TestAltElse(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	assertEqual(t, expected, actual)
 }
@@ -128,7 +128,7 @@ func TestAltElseElseIf(t *testing.T) {
 		},
 	}
 
-	actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php")
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
 
 	assertEqual(t, expected, actual)
 }
diff --git a/node/visitor_test.go b/node/visitor_test.go
index b7f38a7..a8c3ac4 100644
--- a/node/visitor_test.go
+++ b/node/visitor_test.go
@@ -31,7 +31,7 @@ var nodesToTest = []struct {
 	{
 		&node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}},
 		[]string{"Expr"},
-		map[string]interface{}{"Variadic": true},
+		map[string]interface{}{"IsReference": false, "Variadic": true},
 	},
 	{
 		&node.Parameter{