Changed all access to class variables to use class_variable_get/set method