Improve measurement post endpoint performance