Further implementation of weapon manager