Mediators draft refactoring