DEVEN-175: refactoring