Merge pull request #114 from olga-jane/O_Morozova

O Morozova add 3 classes into Entity