Changed instance getter to class getter