PLA-1354 service refactoring