added new generator types