BZ-1060821: adapted to new UF modules config