Fix a glaring hole in the init procedures
Refactor endpoint/version mapping