BPMSPL-84 - related refactoring