Update to work with shooter-common