Apply some changes in structure of Actor , Game and Singleton