Added interface names to Endpoints