Moving responsibility away from Endpoint