Minor update to class members