Refactors quiver management

[Finishes #19730492235179 #19184364948481]