Better endpoint management, avoiding using global settings