JC-1421 refactoring