refactoring needed because of ARQGRA-170