Fixed violations of the Open-Closed principle.