updates for mediator and model rename
updated Model and Mediator API