update expressions
There is no needs for class, just functions under namespace