Refactoring definition items
1 - Corrections of parameters names and utils classes
2 - New custom tags
Refactoring for unification of custom tags