[TIMOB-14617] Code refactor to remove undeclared class warning