Add Singleton in library