Changes to support Singleton Blueprint