Changed class visibilities