Add variable support and var nodes