[Update]: Adding entities for project. Small refactoring. [ArtyomRusak]