Added MARs, Weapon Types and generators