Implementations for master endpoints moved one package up