Advanced Mediation with Endpoints