CDEC-46: refactoring