GTNPORTAL-2918 - more refactoring