EZP-20905 : refactoring