DEP-45 refactoring