BUGFIX: Wrong operator order in macro
Removed structure validation in evaluate function