Continuing the backport of ZEAM widget factory factory