Refactor endpoint strategies
Refactor endpoint strategy more