More API evolution, documentation
Singleton-related documentation