Added detachment for within the mediator itself