Add Function variable and parsing support