PLA-1790 replacing logic extracted to hepler class