Including singletons also