Changed Singleton Type to match POs example code