Add more macros
Start to implement math engine functions