Add gen16/exp19 from gen objets