classes were refactored to be more 'symfony way'