Changed the parser such that it understands all defined functions