Add Registry and Singleton