PLA-701 refactoring