All classes updated with correct visibility