Added more generation stuffs.