Personally, they could be tied to camp but like just being in camp, instead of always being a nighttime resting thing. And make it that they are not always one at a time, only when it makes sense or that other companions will be properly reacting.