Added Armor parsing