Adding base for listing classes
Changing place of criteria formula
Adding changes to traslation files