We have put all our fasteners (bolts, nuts, plugs, rings, pins, etc.) in an Interchange Assembly (IA).
Each fastener has a Component Interface (axis and plane) to make it easier to (re)place them.
And the IA gives us the huge benefit that we can swap any component for any other component. Place a bolt, swap it for a pin...place a ring, swap it for a plug...go nuts! ;-)