Changing class variable access to use class_variable_get/set