Added new classes. Finetuning.