Improve access to class