WIP: Adapt Mediador to new arch