BS-10195, refactor