Additions to variable parsing, entities incomplete
Update parser (variable parsing)