Corrected classes visibility.
TODO