Added variable transformations to parser