Added more generators