Added more metals and generator options