Updated to Mediator design

Updated to Mediator design