Support endpoint and added security.