Add Singleton and Stateful