IDEA-80056 refactoring