PLA-833 refactoring