Add more useful singletons and categories.