More hardcoded endpoints broken out.