Adding ThreadSafe/NotThreadSafe annotations.
Removing singletonFactories in favor of simple factories