Yes indeed. I always look for ways to decouple things for this reason even if that decoupling creates a bit more work.