PLA-1305 refactoring