Added trig and logs to parser