Changing equipment structure a bit. Adding support for equipment storage.