Add match in term
Add templateAtom in instance
Add calculate arith term in functional term