Add Singleton and Timmer