The changes related to generator