GTNPORTAL-3315: Enhance code