Added visibilities to classes