Generation update for generics (partial solution)