Resolve #17 - Mediator