refactoring to add support for TISTUD-4785