Added character controller and weapon manager