Switching from @classmethod to Singleton DP.