Some decoupling using message bus