Change to class static variables