Modified entiies, manager classes and refactored generaly. @ZuraGventsadze @miriankapanadze #9, #8