PLA-1354 refactor