Changing version + update to generator infrastructure