added math expressions support