Added new classes and modified existing ones.