ENDPOINT settings gets reinvented