Updated model's structure, added some classes for it