Use C3 for linearization
Changed some methods' visibility