[TIMOB-15609] Added important missing functionality