Changed CD to Singleton