improved endpoint performance