Added Ioxx, Ioyy, Iozz, and made equipment list contain dictionary