[0.7.36.276] Rewrite all getters to the singleton classes as Instance property.