Added fetching service name if missing