Added Armors, added some more types