Some modernisation for Beta 3 + properly workaround lack of class variable by using struct static variable.