adding singletons and simplifying bootstrapping apidocs