* code optimization
* restored critical class
* role property added