Updated documentable and singletons.