Improve calculated attributes evaluation
Use latest OF commons version