Add reordered endpoints to have global inheritance chaining