Changed to class const