Add var reference
Work on validator