TISTUD-2843 Refactoring util methods