added math expressions and set extension