Updated some generation