Minor architectural changes with mediator and engines