Replace Endpoints service with Model service