Change data structure for Equipment & implement Unequip