AI-438 : refactoring